[cvxopt] 41/64: Imported Upstream version 1.1.8+dfsg
Andreas Tille
tille at debian.org
Wed Jul 20 11:23:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository cvxopt.
commit 23f162c9d2c064ae0133baa142c80f3200fdbdae
Author: Andreas Tille <tille at debian.org>
Date: Wed Jul 20 08:56:17 2016 +0200
Imported Upstream version 1.1.8+dfsg
---
INSTALL | 115 +-
LICENSE | 28 +-
README.md | 6 +
doc/html/.buildinfo | 4 +
doc/html/_images/floorplan.png | Bin 0 -> 9062 bytes
.../0001d02b63ede2fe3219e05a7cd09c82ae6298b6.png | Bin 0 -> 229 bytes
.../00d82d538c7fa6c6c3059574dec22d3e7692feb1.png | Bin 0 -> 1740 bytes
.../016add6975e83d6df1ea24466c468d0f712c4da5.png | Bin 0 -> 1029 bytes
.../0246a989dbd0daa3dc3c6fecbf683b226a79b7f1.png | Bin 0 -> 1075 bytes
.../0260007688027eacd5a07f14d9365f85f5c8ee95.png | Bin 0 -> 1804 bytes
.../03eca013c1b38e9a3853974caeab3eea439da0d9.png | Bin 0 -> 1764 bytes
.../040c9de764a1b5fbfc60b7b41e4d2901e5e5dd40.png | Bin 0 -> 1700 bytes
.../047937fc5e1e2e82914d671ed65b71adb4401eb7.png | Bin 0 -> 320 bytes
.../04f87626ae5b9c318a229434e01daa158140d18c.png | Bin 0 -> 532 bytes
.../05b154e50ec84f68ecf21e2ed17bf6f5935f1dd2.png | Bin 0 -> 1279 bytes
.../05b96f8b501e969ecd99e2b84f7892fa2a8e203b.png | Bin 0 -> 511 bytes
.../063b83ec3e5c8ab1cd493011e9e45ef6465f84d7.png | Bin 0 -> 1594 bytes
.../0672fed1fee7fb053d48c4f52b9a0adbb8e28419.png | Bin 0 -> 286 bytes
.../06b423cebfb90c3d0a63b7f3df78c09d995cfeaa.png | Bin 0 -> 258 bytes
.../073f6167ac0531843edee20f5f81d9a0c7cf4671.png | Bin 0 -> 3826 bytes
.../084599ed05bd45d2433207ae99842473f3cdd567.png | Bin 0 -> 850 bytes
.../094605c7610159f1037e4198872755402bd03b31.png | Bin 0 -> 1632 bytes
.../0999de156f97ffbe09679a57d21b84dd9f9b35e4.png | Bin 0 -> 437 bytes
.../09ed43a26043678d5a76939140100bbae8c9dd16.png | Bin 0 -> 233 bytes
.../0a5711c7a37994043b2bc3bb374adca232491762.png | Bin 0 -> 236 bytes
.../0ac7d0604f94ddf588a784d17ccf161dd03809c7.png | Bin 0 -> 2392 bytes
.../0acafa529182e79b4f56165ec677554fba7fcf98.png | Bin 0 -> 238 bytes
.../0bc936c22de06c6b0ea722218217731a24b30f6e.png | Bin 0 -> 302 bytes
.../0e154998003cfc278f08dc96371848b75ea42fd9.png | Bin 0 -> 272 bytes
.../0f0d15b45680abd34a23c216c53b71d07d672589.png | Bin 0 -> 1557 bytes
.../0f86ac5d8da289ce93680172fb5d39fba1f78a77.png | Bin 0 -> 1657 bytes
.../0fc275b425cf69c4703c19ecbc7723811ba670cf.png | Bin 0 -> 257 bytes
.../10258285048b087b264bdafb31b19b457ce6d82b.png | Bin 0 -> 1263 bytes
.../10d982174e5e28e1a59619b7cfa9c3e0c25b4a6b.png | Bin 0 -> 1840 bytes
.../114653593889a8ebfb445e7026fce81d450033de.png | Bin 0 -> 995 bytes
.../11a85f3c69ae6702cb1d99d3de451913b8f84c04.png | Bin 0 -> 245 bytes
.../11afd70b9a3fac8d7ed4ec2c7fa5a51eedb8cc6c.png | Bin 0 -> 1552 bytes
.../11eff273e1963ba445d6d5ec611f02eb7fc4a694.png | Bin 0 -> 941 bytes
.../1259a43ca7fc336c314fd9e818f723369d738d9a.png | Bin 0 -> 1306 bytes
.../126e84ba38f7dece5f0ad64e929b9588b20f6440.png | Bin 0 -> 234 bytes
.../1303f291f9f1bb1b13ce614a71db9ac06982675d.png | Bin 0 -> 1386 bytes
.../1326e652fceec639bac58f329d8b397f2fe251d2.png | Bin 0 -> 805 bytes
.../135e55b6f4cddbbf41397f28329812f7abd7c9b7.png | Bin 0 -> 327 bytes
.../140c896568502ceb7c765a977e35eaf507e45ab1.png | Bin 0 -> 1156 bytes
.../148494def4743e19b6ace5db936a26f5bf2a66ad.png | Bin 0 -> 1760 bytes
.../15cc63ee73ef52c69c9de3b3349cd0c5e7b7fd49.png | Bin 0 -> 715 bytes
.../162e6fffc996b6d4f1c2861cbc608ff103b166e4.png | Bin 0 -> 2510 bytes
.../17e7c9a88fff44f20b2b7d58caa082246c177d64.png | Bin 0 -> 285 bytes
.../1843694724c1e6709cb3bdb81bc4f0c40d5e02e5.png | Bin 0 -> 847 bytes
.../188c175aac0a8a9c22499336711b5d7256407254.png | Bin 0 -> 201 bytes
.../18ae0cad4f637a940f0867ed9ca4b9339e97ac4a.png | Bin 0 -> 258 bytes
.../198ab32e382c82002570f58df80b131d525f6bfd.png | Bin 0 -> 2244 bytes
.../19d5e95284caffb6f2733b629de62c45786b2764.png | Bin 0 -> 1064 bytes
.../1a6d47f6a30b97355a4f98e1d0a9b292e6d6caf8.png | Bin 0 -> 1103 bytes
.../1b8a3c06cc528168dac3a025fa7dc1c70e528a1e.png | Bin 0 -> 2342 bytes
.../1babc743714fba131456bbe2234d595634fb5812.png | Bin 0 -> 542 bytes
.../1beb2d429fd60d4494135aa7af1b4fe324dc8d3d.png | Bin 0 -> 398 bytes
.../1c14caa1473d005003d6d7a8cf2f5260735eede2.png | Bin 0 -> 345 bytes
.../1c2c566872b99f46e83caa352f7645417b861cec.png | Bin 0 -> 2158 bytes
.../1ce727dbb34aac3cac16a081fdd1bca4be4c0662.png | Bin 0 -> 1317 bytes
.../1e14a62291a70962b57d6b268d20d00056346d3c.png | Bin 0 -> 1361 bytes
.../1f00e3f9a85af83df8dbb9267e41d53b18be6801.png | Bin 0 -> 1317 bytes
.../20f03cf3a222b762a907e9172086fa7aa9e283b3.png | Bin 0 -> 1404 bytes
.../21e56698fba40d0ef90a50ff5eac3239f56c6dc6.png | Bin 0 -> 279 bytes
.../224ac4b02649eeb43b4743cc553d4d9f6651a86d.png | Bin 0 -> 1322 bytes
.../233b2765b8b21be343e63f23226320d0738d9706.png | Bin 0 -> 1894 bytes
.../26f49cfedfe23893d865d6299ceca29dc390c53b.png | Bin 0 -> 1424 bytes
.../28daf2d9ef7d6fc3efb953a00602ff92f0c50e8c.png | Bin 0 -> 1351 bytes
.../28e003020d0ae96250b302d7d779c791f183f707.png | Bin 0 -> 258 bytes
.../29100cf129a9537d4dfef53eafcfd467ee7056b1.png | Bin 0 -> 9577 bytes
.../29c80fb76aef86553d6995b91b53d323a778d299.png | Bin 0 -> 1222 bytes
.../2b2364029e2c1a65dfb62512e8f0c3ab11beb083.png | Bin 0 -> 2653 bytes
.../2bcc65482aa8e15cd4c9e9f2542451fb4e971a91.png | Bin 0 -> 241 bytes
.../2c1eb4bcd966e568a1e947d8e1b29f2c87770b90.png | Bin 0 -> 1415 bytes
.../2cdbe3f9815dc9f57e9c461fd893d70c59432ea0.png | Bin 0 -> 1339 bytes
.../2d2ea095bd0ec381d83e7a65423f81bb8caeba6e.png | Bin 0 -> 1427 bytes
.../2d951060c95bb45762fdb5e3de91f646ee0fe08b.png | Bin 0 -> 2150 bytes
.../2de38926392ba23abeac75effc66c37a5f5be5fd.png | Bin 0 -> 280 bytes
.../305efdce8b67069139cfdce108379dd0f9c13e14.png | Bin 0 -> 1540 bytes
.../30d55b93201cf02f91a4da14845291a7bc5f2fae.png | Bin 0 -> 1124 bytes
.../310ff53034c8c54d1df11297464404d37dae8616.png | Bin 0 -> 264 bytes
.../31f8cf9a37fad96d43492022e560df7d32ef2026.png | Bin 0 -> 1802 bytes
.../321775dc9a96e932341dc2b5efc498827c162856.png | Bin 0 -> 1241 bytes
.../33ffc60872c5747b1dd8cd93ddcf05362f0d2333.png | Bin 0 -> 1744 bytes
.../3494d6c050dcba63488def5cd4e3c183f1234306.png | Bin 0 -> 271 bytes
.../3544933a920a8ff595213b8ce5a7c34454e8c95b.png | Bin 0 -> 259 bytes
.../35a8e2ecd7dcf9d4782ba19863364e13dd621356.png | Bin 0 -> 2181 bytes
.../361979f771f1b6ebc76432f1e72dc4463deab580.png | Bin 0 -> 846 bytes
.../3639c816d82c4273a598c5d5a8040c7290c9444f.png | Bin 0 -> 1402 bytes
.../36aca10ddac71d0dfa118b71798b39f02f0a9726.png | Bin 0 -> 1410 bytes
.../375dade287d6d8a7f17747b4bbf7b248b1df901d.png | Bin 0 -> 5118 bytes
.../398c3d618b009a88e125501c25cb69118705dd92.png | Bin 0 -> 2549 bytes
.../3b344fee0435b4b969e4fefb5ccb44f50efa14f8.png | Bin 0 -> 1176 bytes
.../3c8db3ccd634c824b36b6a922439b35ed2e0c84e.png | Bin 0 -> 1647 bytes
.../3eb1b11cbb2adbb474beb16112fc1cc0446baade.png | Bin 0 -> 1321 bytes
.../3eca8557203e86160952e1c0f735f7417f3285b1.png | Bin 0 -> 239 bytes
.../3edfaee3e2a41aade18b71a49c852209260e87c2.png | Bin 0 -> 3027 bytes
.../3fe72eac326113d25ef1eb961213c508f763c92a.png | Bin 0 -> 293 bytes
.../40136bd3592e339b6af5c8514cf2a19d64befce6.png | Bin 0 -> 633 bytes
.../40927c2139d8e7ce9f9746651d5f28351835e658.png | Bin 0 -> 1446 bytes
.../413f8a8e40062a9090d9d50b88bc7b551b314c26.png | Bin 0 -> 228 bytes
.../417cf98ea074fe2be69f48ae0235eb405c1d0282.png | Bin 0 -> 1665 bytes
.../4183ccded09d4e9db5fc8ffc56d52408488b005d.png | Bin 0 -> 3062 bytes
.../4204a71d348a21dafe10f112f5c8e7c436d34957.png | Bin 0 -> 747 bytes
.../425d86ba2f2979d75b7535c2bcf92c33ed6b285a.png | Bin 0 -> 241 bytes
.../42c237a9ee94ebc91e1cbec07638f3d32626b9c8.png | Bin 0 -> 1493 bytes
.../449cc2343a5592f974e22266e8c12d6a008c8a5e.png | Bin 0 -> 2880 bytes
.../4558d1a86459cbf3f41c913dbfeb39b4d3e4c00e.png | Bin 0 -> 273 bytes
.../4597d4c954c896f007283312ad9225476a27cbe6.png | Bin 0 -> 2510 bytes
.../4686c6013ea687f6a5b2fb37cd87d9298c5fe5d8.png | Bin 0 -> 602 bytes
.../47b3ae0420c52db79daf3c6b84a01b2bcc5de5a3.png | Bin 0 -> 391 bytes
.../48cec103218010fa067eea0252f644c77d7dcffd.png | Bin 0 -> 1282 bytes
.../48f75e0b463f2fdb7fca9566cffdc439cae6967f.png | Bin 0 -> 252 bytes
.../48fc33825c4a21511eb640baa57e792ccb79a0d7.png | Bin 0 -> 1112 bytes
.../49e9bad6f3f8925a19802b447eb5f47a1351aaf3.png | Bin 0 -> 1671 bytes
.../4a5a1bbcc3881a422d50385a7b28ba2f8b138058.png | Bin 0 -> 418 bytes
.../4a82b599d0a030a9cabfc00f731fbc8471d90e9a.png | Bin 0 -> 1014 bytes
.../4b78615a721358c983b51554b59f51f691a9494e.png | Bin 0 -> 423 bytes
.../4bcc5345587505a3531e55592670a69b99256846.png | Bin 0 -> 248 bytes
.../4bd01d9da8529d13bb84945da2a23c92fefc4103.png | Bin 0 -> 316 bytes
.../4cde26b9ef3ee30a688192516abb5c07ab89cbaa.png | Bin 0 -> 1514 bytes
.../4d6932bf96d15f8796e6c888eebd5315e29bc092.png | Bin 0 -> 704 bytes
.../4e08ab76044c33b5ec9ded78921ddc90d3385668.png | Bin 0 -> 2767 bytes
.../4e16b64d140d24f2c624f3ecea15c6b54e963888.png | Bin 0 -> 1298 bytes
.../4ecc882685570bb0542e7bedddfdf46f42d162c6.png | Bin 0 -> 1250 bytes
.../50793b5b6c2d777f66cf1b8e1671fba966b2fb3c.png | Bin 0 -> 465 bytes
.../508fc704035c2701c87f20328fc1dc5fb2b339cf.png | Bin 0 -> 1172 bytes
.../50cf04b9d1b2e43389af7efacd08a059a35a8766.png | Bin 0 -> 1237 bytes
.../50e0b32054a553f10d8a402909d4bfd04ff51197.png | Bin 0 -> 364 bytes
.../51740ecb092f1303e28a2ef073ffe22771df6fde.png | Bin 0 -> 1300 bytes
.../51cdd82f300c6154550f86854c3834537fdec1e8.png | Bin 0 -> 3626 bytes
.../52031bf68ee42296146e8a3e4f5033b6173dcf51.png | Bin 0 -> 595 bytes
.../5308e7e88533ca4ea02a94c0429e96337438173c.png | Bin 0 -> 5481 bytes
.../55826404e30a9012f804c4eac5d19b0598af8d30.png | Bin 0 -> 390 bytes
.../562b5099bcca7182c340b5c730982e24aca78314.png | Bin 0 -> 457 bytes
.../567d706970f5fafe73762cfb27d1c51c65bd49e2.png | Bin 0 -> 298 bytes
.../573f1dbd55f7a60f53088d2ebc1c19b6d9d20e29.png | Bin 0 -> 288 bytes
.../57b5c2817ccca5f67197e2d35ede3a4bb0aeeee7.png | Bin 0 -> 2261 bytes
.../57e1fde7720d12084876914987a2765e33c23e13.png | Bin 0 -> 2129 bytes
.../57f23d18fa879e51e776968c9e8ed86e6856b728.png | Bin 0 -> 1702 bytes
.../59bb1e408af7fa4b18883af769320f0f79abd8b0.png | Bin 0 -> 1087 bytes
.../59c706ea5c074f4fd2d3fc9f17d7ac3d276dc84f.png | Bin 0 -> 296 bytes
.../5d07fc103b7ffd76b1fef90c4c130dae17dcb379.png | Bin 0 -> 5476 bytes
.../5e8d847f99a6188e8c177b540a963731cc8c4932.png | Bin 0 -> 1396 bytes
.../60111a617c52fd240dc8ecbe5ba3c92f721041f2.png | Bin 0 -> 1433 bytes
.../60230b9d07628d38e7e9695d7b938de174d52a3d.png | Bin 0 -> 1311 bytes
.../61b1d49d589b4261653044f5426a95e3841cc3db.png | Bin 0 -> 1813 bytes
.../62427a6fca421a1163a5acdd2a4358db51fe648d.png | Bin 0 -> 504 bytes
.../63c066dc8bf940c63186bcaf5d0bdf30a7956df9.png | Bin 0 -> 1631 bytes
.../64f647808deab7ef08f8e07fa9bd7fd0591e0ab5.png | Bin 0 -> 532 bytes
.../6769835c6d47790785cdad70118ca039d3b360a1.png | Bin 0 -> 599 bytes
.../6859317dd1b439cef34131bcd4bafee8393444e0.png | Bin 0 -> 204 bytes
.../685ed7a61bc090b05dc270e1096aaf697907640d.png | Bin 0 -> 1365 bytes
.../693faad2f042b0565c90df7cfced16cb9413c166.png | Bin 0 -> 241 bytes
.../699d472974095e5eb4fe313c1f43831127eaaf3b.png | Bin 0 -> 516 bytes
.../6d30c08912d4ce82399fcafc9e108b39746be281.png | Bin 0 -> 1357 bytes
.../6d42c88506b8da39a2a23653aecbfb7c29728063.png | Bin 0 -> 239 bytes
.../6dc95523d22428403e9ec3e7f37e26ea270bf4dc.png | Bin 0 -> 271 bytes
.../6e98fc286854081ea2b9adf373df551256afff7c.png | Bin 0 -> 398 bytes
.../6fdc9fd7f741378b1513fd6a50d2beb900c205fe.png | Bin 0 -> 1595 bytes
.../71fb275b87fc895a155092b9c7726b05dce93eab.png | Bin 0 -> 307 bytes
.../72c56dc5b07da4f7d7c4d5534c1a532b8882393e.png | Bin 0 -> 480 bytes
.../73f5e249c88b2b3068263480f576b051cb5c4f6e.png | Bin 0 -> 247 bytes
.../75c046897f0096f476a55496317bd0ef6dd1fda8.png | Bin 0 -> 1840 bytes
.../75e27f04188974063be3230dca208cd495b77ce1.png | Bin 0 -> 256 bytes
.../76bacccf4cec63f756095d309f1d0625a5c79952.png | Bin 0 -> 527 bytes
.../779452dac0b743460f8ed93ee0b34d1d42657bbb.png | Bin 0 -> 815 bytes
.../77aec2862da28625ff641e3f560e157fbd895a2b.png | Bin 0 -> 1325 bytes
.../77eb5b629a0ce4f734ad13638babf1ececb73c70.png | Bin 0 -> 1598 bytes
.../787db56b15092dd4d749cdf10fe3d67ddd0fc985.png | Bin 0 -> 288 bytes
.../78b84981125b77d5fbccd78772d46452501d159a.png | Bin 0 -> 398 bytes
.../7949c78c45dd5977a07f55aab72d3f7d7b991f19.png | Bin 0 -> 427 bytes
.../7aa3098b904c11d68c01bd6694f9d3e363d53b88.png | Bin 0 -> 1855 bytes
.../7b1816c51f7d31275cd3ad400208fb7b3ce136a0.png | Bin 0 -> 274 bytes
.../7ccc306d0b1a362ea794e28e35f620ae8f3da1e5.png | Bin 0 -> 7016 bytes
.../7da70b3b7d88430e05c47da4f78f6da83ee974b9.png | Bin 0 -> 353 bytes
.../7dc222c37caf762ab8bae6587603cc12a151bb17.png | Bin 0 -> 1649 bytes
.../7decdbe004c7b85da96241226ca9f150731c9365.png | Bin 0 -> 989 bytes
.../7fb876996f317119f4a67c585344c9d153432a9b.png | Bin 0 -> 272 bytes
.../80027ab1c7a3a805fc9f6de9c84d42a3e5fa0073.png | Bin 0 -> 921 bytes
.../8005301c57dbcd3f8754173aaa142f457c62467a.png | Bin 0 -> 493 bytes
.../80bee4e7ca18b9e178cbe36de0a963d928f0dd7a.png | Bin 0 -> 3027 bytes
.../80f4968bb0812d8fd7b7d0d6168a86820b0a7ec7.png | Bin 0 -> 955 bytes
.../80f8ee73e5a62640aeb2442e3f5c66a1de7a5518.png | Bin 0 -> 399 bytes
.../81724a45ae0ea76d9390da91f126e17e9ddf2cc7.png | Bin 0 -> 2319 bytes
.../830aa83ce734c51e198b4204591c7e5c58d40fcc.png | Bin 0 -> 1017 bytes
.../83956e92fcc80dee17fce864543216939a3c9da7.png | Bin 0 -> 255 bytes
.../84d7271dd9e78c1e05d6c3c6ecb60309ef7dfc73.png | Bin 0 -> 200 bytes
.../852a6f372bdee813bd247643f7c2c114cfcce21a.png | Bin 0 -> 749 bytes
.../8659700e6646cd91bc02c32affaa5ec046ee9935.png | Bin 0 -> 232 bytes
.../8695ed280e712cc4490c3e60810b4c6b6881cd1e.png | Bin 0 -> 225 bytes
.../87202d921ebebf9a42f0d17a9823a59ee3f5c83c.png | Bin 0 -> 2051 bytes
.../878c3440b3937563378692ea68e4a8915a548704.png | Bin 0 -> 564 bytes
.../87c716e048b6466c0459d609f9ca1d12c92df084.png | Bin 0 -> 911 bytes
.../87da707293d2f36ee9c5e0026ac69dfbe0722a1f.png | Bin 0 -> 292 bytes
.../8823f1b861429c99f6495d784260f4b06544df26.png | Bin 0 -> 4610 bytes
.../8867a6f23bdc90d9850c212da3b1f6c85da9cfa9.png | Bin 0 -> 459 bytes
.../8ae3de0b7f36ecd8ce55762fd04636f2d562ec4a.png | Bin 0 -> 760 bytes
.../8c805be7cd7c66579717675a5f59630263eb7b0e.png | Bin 0 -> 1031 bytes
.../8ccf00431f4274015c9bc2048bc21b7d8b01a1d6.png | Bin 0 -> 1162 bytes
.../8ced9967cf5ac8a7dfe5907f92559a67567f9fd1.png | Bin 0 -> 2408 bytes
.../8cf728804c10fea4c1a4a50e39ae56823d3117fd.png | Bin 0 -> 946 bytes
.../8dd73eec3308cda7fab4013f76bc74e4ead2be0d.png | Bin 0 -> 3702 bytes
.../8e474a33274085c7c884dba1c98a91ef2c13ebfa.png | Bin 0 -> 613 bytes
.../8eda42f47290c234d1bff18ec887dcf1078a45ba.png | Bin 0 -> 589 bytes
.../8f2359ded4ff57243e264242d0f12aa98be5666b.png | Bin 0 -> 334 bytes
.../9169b2404d0208a7b57d7957672810ac001b0ead.png | Bin 0 -> 427 bytes
.../92c25fa25f006cdfe8ef28f3d3141e558aaac740.png | Bin 0 -> 222 bytes
.../92d23ba3d0cf03e961e3c70407948e15a3239435.png | Bin 0 -> 253 bytes
.../93876b6d08a3f850d1f4aba28cd41ca97d66880a.png | Bin 0 -> 1345 bytes
.../939a9dbe9eed7a3842b6d7eacd5621587127ef00.png | Bin 0 -> 1090 bytes
.../95b533418f20fc19e5a7c52bd3e324ce5cd4a652.png | Bin 0 -> 1328 bytes
.../95c816a6adaedb425dfaa2baa4162ad150db679d.png | Bin 0 -> 1522 bytes
.../95eb42a74083f3034ef47412f7b8b9c91f4292b5.png | Bin 0 -> 1352 bytes
.../9812a102ddba49461ec38204d13a46cc35d13ec5.png | Bin 0 -> 289 bytes
.../9933c894ca1816b4c192bb1e05f3ca0235b700cc.png | Bin 0 -> 513 bytes
.../9d86170e7de539c0ff999de09621ee0c7b6c8ed0.png | Bin 0 -> 257 bytes
.../9db05ed7f916830e24071ea1ac13f9200438f256.png | Bin 0 -> 6853 bytes
.../9dfa31437b58c0473299320aa638151cd88cf61b.png | Bin 0 -> 246 bytes
.../9e3f7a73ad343d876522dc29fa778c661cd0bc73.png | Bin 0 -> 2021 bytes
.../9e64d39bc789763f5e7b0226e4e577d6701be82d.png | Bin 0 -> 1331 bytes
.../9f7ae16df27305a288220a25c67fec281582a178.png | Bin 0 -> 1755 bytes
.../a0386a36f70af7ebf114810dc9670c273b60092e.png | Bin 0 -> 259 bytes
.../a185258fa2bb48f87e585228395f07c3864a5ee7.png | Bin 0 -> 1617 bytes
.../a18a2efee809525e5d5e2b90234d90492605910b.png | Bin 0 -> 259 bytes
.../a1bc13b30be9e9dfe869a53a7765a333f0a7d3b5.png | Bin 0 -> 398 bytes
.../a263cf4c66f239a6fc0fb13bdd3c5233766186ae.png | Bin 0 -> 807 bytes
.../a47ccc33ac0f8662ee27020d71ec5bca4b6218bc.png | Bin 0 -> 908 bytes
.../a54708fe7e95067497dd42cdf40c2b0c8023b956.png | Bin 0 -> 400 bytes
.../a561f265b36883ab4d6de8f9669351888a2373ed.png | Bin 0 -> 1100 bytes
.../a5d6a9ffacc01b68b780618818cbd90474466cc9.png | Bin 0 -> 846 bytes
.../a6a7e011236d9329c082e3494416f1d23d431080.png | Bin 0 -> 1230 bytes
.../a716012e7386039e71ab4fed061d9ae7bb567ab8.png | Bin 0 -> 240 bytes
.../a7e20a9e22ab40126649b8601c14c0c53625c1a5.png | Bin 0 -> 397 bytes
.../a8f6a1645b0da6b1a3e4d25495e7f11d48508cf8.png | Bin 0 -> 364 bytes
.../aa47517e24a51fb89da8cd0899238d4758406d33.png | Bin 0 -> 490 bytes
.../aa6d78ef03e72bc807167e84142a6f9cf0e6860d.png | Bin 0 -> 1241 bytes
.../aad007aad36276e84b88349a62e466b615cc30e4.png | Bin 0 -> 459 bytes
.../abf754938d86994e8b9cd5ed7c22814cdd8265a3.png | Bin 0 -> 273 bytes
.../b018f9153661cd702305aecc28713fd9705e7cb3.png | Bin 0 -> 236 bytes
.../b124ff74afb0914bb434e8fb849eb56d734412f8.png | Bin 0 -> 236 bytes
.../b3263c15725476b4815cfd68a2a0fa73286d58de.png | Bin 0 -> 1871 bytes
.../b4185883f66070faa34444043851101bf3e4e072.png | Bin 0 -> 608 bytes
.../b4b77eb87eaf7b5cec38b838667240420953bf95.png | Bin 0 -> 1167 bytes
.../b57b6b6bf761902ccdea737725a89486be6e32d0.png | Bin 0 -> 1553 bytes
.../b5ddd66f365b65ac1d67353904f48cd161730514.png | Bin 0 -> 1578 bytes
.../b6afb9cb106e21d5944296c61fa1e7161e2f6c69.png | Bin 0 -> 448 bytes
.../b810258d7f5a5470ef5ee8adda6b7a3957875e70.png | Bin 0 -> 1126 bytes
.../b828151fe9afd4446b89b49af5391342a5012fa7.png | Bin 0 -> 1363 bytes
.../b8652b0e047832222474a1e2a4ed998e75b698af.png | Bin 0 -> 1290 bytes
.../b9237e06a8e6e906a69ec6acdc633603ba50084b.png | Bin 0 -> 506 bytes
.../b92c09a649305a0aef3239729d93cdf941e0e5cf.png | Bin 0 -> 254 bytes
.../b94be0ad0fc90fa2e4e61c0c2c094ebc202d7729.png | Bin 0 -> 1619 bytes
.../b9cc307099bb9947c8a56f892a3ea6e731d1cac5.png | Bin 0 -> 999 bytes
.../ba1be82ee324edf53ae6c1811f327002883c18ee.png | Bin 0 -> 562 bytes
.../ba6b90460b73c045bb825f6609b3415e301bb2b8.png | Bin 0 -> 783 bytes
.../bb47877556480ddd060e47647cade1b212b9cde5.png | Bin 0 -> 295 bytes
.../bbe3c7674803b8326dfc8b4b1ba88c675de5721d.png | Bin 0 -> 437 bytes
.../bbeb45fdc8ef73286444f7323c922bf638e059c1.png | Bin 0 -> 1374 bytes
.../c02c277280c0b3f1615a4f191b963a70fb36ecd8.png | Bin 0 -> 739 bytes
.../c13187825263b2dc8bae4e30d0d15cf8670b6956.png | Bin 0 -> 406 bytes
.../c138ee6943c33ad686fbcc19f6b8987bca18788c.png | Bin 0 -> 1422 bytes
.../c3bb2dbfdf9313d0d369ef7ac0c4c2b58f310d92.png | Bin 0 -> 516 bytes
.../c3c08496f07567285212e468b173bea9ca153fab.png | Bin 0 -> 250 bytes
.../c4bb40dd65eae6c11b325989b14e0b8d35e4e3ef.png | Bin 0 -> 242 bytes
.../c59f33685835e497f8b4d66cbff87e46afa6e30d.png | Bin 0 -> 553 bytes
.../c7c0674ced05ddaa94bd705d1a836882a49c5b85.png | Bin 0 -> 720 bytes
.../c861d27ab46dcf1be207f024a0ce2fbb9d9d4ec1.png | Bin 0 -> 1513 bytes
.../c86b80d3cf8c7319c3652e5a4453e29840e97a9c.png | Bin 0 -> 959 bytes
.../c888fcb025bde0ed335be8d5f932ac56d5950d45.png | Bin 0 -> 7455 bytes
.../c96f101392de9d4e76dd0dba40750bb61a49e9a2.png | Bin 0 -> 1307 bytes
.../c983ed273b9536c28bbff3ab1a32c2458c70fe22.png | Bin 0 -> 303 bytes
.../c99df7a209495334da442b1ec998abaabfa320d8.png | Bin 0 -> 231 bytes
.../ca01cc7f3857720f5dc4b843e209e0c95830807c.png | Bin 0 -> 887 bytes
.../cba0afcbfd537186714602299bfdbeb8006cebd6.png | Bin 0 -> 1081 bytes
.../cbb80ad77aa7a5e227d5a46bc44d235284106cfc.png | Bin 0 -> 236 bytes
.../cd01aaaa1674ff77afb5f645d5eacd0f2ec1b573.png | Bin 0 -> 440 bytes
.../cd586484e994863e4dce4dec3e742ab3a1232bc2.png | Bin 0 -> 997 bytes
.../cd7041cd0a90f7d24f6f5c2a40216706d95858ec.png | Bin 0 -> 302 bytes
.../cd963d5c6113215ea256c383c90369f9e79d0b05.png | Bin 0 -> 4551 bytes
.../cdb26bb9819bf8adb395cdada207cbb0e095ec3f.png | Bin 0 -> 407 bytes
.../cfb14204c91bf302a59f79887bd459ca0ca3565a.png | Bin 0 -> 1451 bytes
.../d07b4c16d04b6739df29c10f32dfc4b946061922.png | Bin 0 -> 264 bytes
.../d1b0f996b995464353b9222ef666f5b6f63580c9.png | Bin 0 -> 1246 bytes
.../d2ac2e45e520f9ba6c24cc8087486cf69552fcff.png | Bin 0 -> 1132 bytes
.../d3de882a6e7d634336449ea13442b526c815a7af.png | Bin 0 -> 697 bytes
.../d555fc582c6ae0fbb92f32567d87578eafa2be7a.png | Bin 0 -> 1142 bytes
.../d5657b2f0822ec6051e030822e03d104dbb946d2.png | Bin 0 -> 314 bytes
.../d6882108988b75f2c185ff66d8ca996834b46260.png | Bin 0 -> 874 bytes
.../d758b8f7ecd9593ebd41b06fde3fa0bbb1dd86f6.png | Bin 0 -> 1114 bytes
.../d76965f1a033d354c739074571c898e2d6d90094.png | Bin 0 -> 1660 bytes
.../d8001236f7a0a1c28d770b1f7bf892316f2aad57.png | Bin 0 -> 1599 bytes
.../d99efde75c84ef402a92cd4497530d2366fb112f.png | Bin 0 -> 205 bytes
.../da6c2abaedd5a781e19aa98607eca6a3d15288f5.png | Bin 0 -> 2480 bytes
.../dad488d02bdf01d0de39f3dcd6fed9fd66d9d8e6.png | Bin 0 -> 1983 bytes
.../db2ffb8640c25ef093a0a63051e7bacec0b05d97.png | Bin 0 -> 1586 bytes
.../dc587b1b1e755bddb49ec6d1eab6cf0e169cefec.png | Bin 0 -> 1274 bytes
.../de8abededa5bdbf7dd749842436f6456587dc3b6.png | Bin 0 -> 356 bytes
.../dee8ae46a5b8057f8d7d48bb39deae1fbf9bfeb3.png | Bin 0 -> 285 bytes
.../dfdb481523b4f08cc85ceaa14507fd7419bd1f14.png | Bin 0 -> 4636 bytes
.../e0ea47f3b1a636373372f1d3fdc4d49842592724.png | Bin 0 -> 1414 bytes
.../e19bbf7b0589a31564d0f2b5183804851cb8846e.png | Bin 0 -> 909 bytes
.../e1c7f0c9b12f842d6225770277576547e13dce69.png | Bin 0 -> 1454 bytes
.../e2faf4578b5333a790f89cf2c080a9e297bde7d4.png | Bin 0 -> 1260 bytes
.../e3be8b9772729b304adf47f411e4ac8d7e4ab48a.png | Bin 0 -> 2029 bytes
.../e3e1b8a98590631e4c5dc9df782ebe2cd9822722.png | Bin 0 -> 149 bytes
.../e46a26135e0ceb7bf8a11ec2c0b76d0692cb242d.png | Bin 0 -> 322 bytes
.../e480d25b49f5eab31ed34e936f2e0103e01a819e.png | Bin 0 -> 240 bytes
.../e558b0b209fc138468737f6695fef0795f8c8336.png | Bin 0 -> 454 bytes
.../e5fc41b391867da81606413e3389c7efc73abaf0.png | Bin 0 -> 215 bytes
.../e685fdf1ecd460e241aacbbd6d1accbc12cc5829.png | Bin 0 -> 1601 bytes
.../e7239335d875a754186e9932b8906570a49cbefe.png | Bin 0 -> 541 bytes
.../e72a184be24a21b39b31cc95d26e6608c73484b0.png | Bin 0 -> 454 bytes
.../e7d8829a559936a233a47cc7b6b40b8d04c5bd41.png | Bin 0 -> 1520 bytes
.../e88d7235397bfea3fbb0fb4e7680407acdb79f87.png | Bin 0 -> 430 bytes
.../e9203da50e1059455123460d4e716c9c7f440cc3.png | Bin 0 -> 230 bytes
.../e9424ef951bc888bb64400220e3db2751194bf8e.png | Bin 0 -> 1900 bytes
.../e9f7483f134d4b791c23663683f97a82ba62b056.png | Bin 0 -> 1660 bytes
.../eaf624467206a87efe3bd482abed3cc36875d59f.png | Bin 0 -> 303 bytes
.../eb00f840427485fbf0601b84d2126406edc0f392.png | Bin 0 -> 11203 bytes
.../eb3d9f0698c7f5c1906c4d26b8fcf1f315e74318.png | Bin 0 -> 1241 bytes
.../eb46511dbb028c937d098a05e091ad298f313e5b.png | Bin 0 -> 915 bytes
.../ec0606574b5c69317afdafe1c02bce1ce201f7a7.png | Bin 0 -> 739 bytes
.../ec45b525199e9ca199573bf72bbebde0a0aaf8f2.png | Bin 0 -> 1017 bytes
.../ec9a814a8db8511dd6afe998d946e72bb79ae20c.png | Bin 0 -> 258 bytes
.../edcbd6cd73ef9909f576e6dc918b5defd822ea7d.png | Bin 0 -> 1294 bytes
.../ee5608e78ca5349deca6cf03fdbdf3e278f797e0.png | Bin 0 -> 1293 bytes
.../ef03e779d72e2e413d309e114a6b43cb0aa0a79d.png | Bin 0 -> 333 bytes
.../ef12b38f8dd041b3da4503cfb9e2c1c3d38a0486.png | Bin 0 -> 261 bytes
.../ef2b551c8cc9515c28c7517d5620b634b3b7beb6.png | Bin 0 -> 490 bytes
.../f026aecf11ec7f6141ab863f260d395f94b10f51.png | Bin 0 -> 243 bytes
.../f0c84551b5a2d13213791afff102b42d3416c913.png | Bin 0 -> 1031 bytes
.../f2cfc079aca0e287101d38af0c5399937658a911.png | Bin 0 -> 2098 bytes
.../f4136218c7316891923eb92e8e53da9c884ba7da.png | Bin 0 -> 1061 bytes
.../f48b617185733d8dd6712643f1ab17c736661a06.png | Bin 0 -> 243 bytes
.../f4f7b1326f5012dac838e6664ea24caa73c10742.png | Bin 0 -> 745 bytes
.../f50d3a495c7268eacf7f28116e0737ea5744d856.png | Bin 0 -> 3013 bytes
.../f550d35baced9ff07145881ea1b76d6167735056.png | Bin 0 -> 1552 bytes
.../f56f7bbc4271cd2930fb8434a6b1f448f806677c.png | Bin 0 -> 3545 bytes
.../f653e38f1855f52cb4db07a7a9fcf43d99337b25.png | Bin 0 -> 410 bytes
.../f737c57f30b69731860640f7b2408b8103df0cd8.png | Bin 0 -> 1545 bytes
.../f760f3b11939823c9b02bad5db429093145730a6.png | Bin 0 -> 1233 bytes
.../f8a049b96970ce863efb8a9f7b40c855f0422d56.png | Bin 0 -> 1648 bytes
.../fa34489cf430b7630b30f28b2eb050e2489e3523.png | Bin 0 -> 280 bytes
.../fa72eb1a540cebc3dd7afb49700e6c0f08745b5c.png | Bin 0 -> 1736 bytes
.../fa936b47d91813a2d099353200d65b79527bab6b.png | Bin 0 -> 403 bytes
.../faba65ef70827bc1839211eafd2d9573b6aa64b0.png | Bin 0 -> 373 bytes
.../fb5edeffaf21bca5d920ea2fb9ed088cb574281f.png | Bin 0 -> 391 bytes
.../fcc3930195947f4188f6a6042495d139c80e173f.png | Bin 0 -> 1520 bytes
.../fcd1cfebe325cf88db061ad2327f0db3a8aba939.png | Bin 0 -> 3027 bytes
.../fd4a8900a7d32aa765cff143ac4c964935bc071d.png | Bin 0 -> 497 bytes
.../fda7c606710a3011192999c39b6c862d9db414d6.png | Bin 0 -> 274 bytes
.../fee01d5bc4ab0ae7122cf4cc3ce5fd16e75b82c4.png | Bin 0 -> 1616 bytes
doc/html/_images/normappr.png | Bin 0 -> 24912 bytes
doc/html/_images/portfolio1.png | Bin 0 -> 46408 bytes
doc/html/_images/portfolio2.png | Bin 0 -> 28141 bytes
doc/html/_static/basic.css | 599 ++
doc/html/_static/comment-bright.png | Bin 0 -> 3500 bytes
doc/html/_static/comment-close.png | Bin 0 -> 3578 bytes
doc/html/_static/comment.png | Bin 0 -> 3445 bytes
doc/html/_static/css/badge_only.css | 1 +
doc/html/_static/css/theme.css | 4 +
doc/html/_static/cvxopt.css | 630 ++
doc/html/_static/doctools.js | 263 +
doc/html/_static/down-pressed.png | Bin 0 -> 347 bytes
doc/html/_static/down.png | Bin 0 -> 347 bytes
doc/html/_static/file.png | Bin 0 -> 358 bytes
doc/html/_static/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes
doc/html/_static/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes
doc/html/_static/fonts/fontawesome-webfont.svg | 414 +
doc/html/_static/fonts/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes
doc/html/_static/fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes
doc/html/_static/jquery-1.11.1.js | 10308 +++++++++++++++++++
doc/html/_static/jquery.js | 4 +
doc/html/_static/js/theme.js | 47 +
doc/html/_static/minus.png | Bin 0 -> 173 bytes
doc/html/_static/plus.png | Bin 0 -> 173 bytes
doc/html/_static/pygments.css | 63 +
doc/html/_static/searchtools.js | 622 ++
doc/html/_static/underscore-1.3.1.js | 999 ++
doc/html/_static/underscore.js | 31 +
doc/html/_static/up-pressed.png | Bin 0 -> 345 bytes
doc/html/_static/up.png | Bin 0 -> 345 bytes
doc/html/_static/websupport.js | 808 ++
doc/html/objects.inv | Bin 0 -> 1616 bytes
doc/html/searchindex.js | 1 +
doc/source/.themes/sphinx_rtd_theme/LICENSE | 20 +
doc/source/.themes/sphinx_rtd_theme/__init__.py | 17 +
.../sphinx_rtd_theme/static/css/badge_only.css | 1 +
.../.themes/sphinx_rtd_theme/static/css/theme.css | 4 +
.../sphinx_rtd_theme/static/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes
.../static/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes
.../static/fonts/fontawesome-webfont.svg | 414 +
.../static/fonts/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes
.../static/fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes
.../.themes/sphinx_rtd_theme/static/js/theme.js | 47 +
doc/source/.themes/sphinx_rtd_theme/theme.conf | 8 +
doc/source/c-api.rst | 62 +-
doc/source/coneprog.rst | 8 +-
doc/source/conf.py | 12 +-
doc/source/copyright.rst | 24 +-
doc/source/index.rst | 14 +-
doc/source/matrices.rst | 54 +-
doc/source/modeling.rst | 8 +-
doc/source/spsolvers.rst | 56 +-
examples/book/chap4/portfolio.py | 0
examples/book/chap4/rls.py | 0
examples/book/chap6/basispursuit.py | 0
examples/book/chap6/consumerpref.py | 0
examples/book/chap6/cvxfit.py | 0
examples/book/chap6/huber.py | 0
examples/book/chap6/inputdesign.py | 0
examples/book/chap6/penalties.py | 0
examples/book/chap6/polapprox.py | 0
examples/book/chap6/regsel.py | 0
examples/book/chap6/robls.py | 0
examples/book/chap6/smoothrec.py | 0
examples/book/chap6/tv.py | 0
examples/book/chap7/chernoff.py | 0
examples/book/chap7/expdesign.py | 0
examples/book/chap7/logreg.py | 0
examples/book/chap7/maxent.py | 0
examples/book/chap7/probbounds.py | 0
examples/book/chap8/centers.py | 4 +-
examples/book/chap8/ellipsoids.py | 0
examples/book/chap8/floorplan.py | 0
examples/book/chap8/linsep.py | 0
examples/book/chap8/placement.py | 0
examples/doc/chap10/l1svc.py | 0
examples/doc/chap10/lp.py | 0
examples/doc/chap10/normappr.py | 0
examples/doc/chap10/roblp.py | 0
examples/doc/chap4/acent.py | 0
examples/doc/chap7/covsel.py | 0
examples/doc/chap8/conelp.py | 0
examples/doc/chap8/coneqp.py | 0
examples/doc/chap8/l1.py | 0
examples/doc/chap8/l1regls.py | 0
examples/doc/chap8/lp.py | 0
examples/doc/chap8/mcsdp.py | 0
examples/doc/chap8/portfolio.py | 0
examples/doc/chap8/qcl1.py | 0
examples/doc/chap8/sdp.py | 0
examples/doc/chap8/socp.py | 0
examples/doc/chap9/acent.py | 0
examples/doc/chap9/acent2.py | 0
examples/doc/chap9/floorplan.py | 0
examples/doc/chap9/gp.py | 0
examples/doc/chap9/l2ac.py | 0
examples/doc/chap9/robls.py | 0
setup.py | 259 +
src/C/SuiteSparse/AMD/Doc/AMD_UserGuide.tex | 449 +-
src/C/SuiteSparse/AMD/Doc/ChangeLog | 32 +
src/C/SuiteSparse/AMD/Doc/License | 39 -
src/C/SuiteSparse/AMD/Doc/License.txt | 91 +
src/C/SuiteSparse/AMD/Doc/Makefile | 9 +-
src/C/SuiteSparse/AMD/Include/amd.h | 366 +-
src/C/SuiteSparse/AMD/Include/amd_internal.h | 58 +-
src/C/SuiteSparse/AMD/Lib/GNUmakefile | 29 +-
src/C/SuiteSparse/AMD/Lib/Makefile | 14 +-
src/C/SuiteSparse/AMD/Makefile | 40 +-
src/C/SuiteSparse/AMD/README.txt | 32 +-
src/C/SuiteSparse/AMD/Source/amd_1.c | 3 +-
src/C/SuiteSparse/AMD/Source/amd_2.c | 14 +-
src/C/SuiteSparse/AMD/Source/amd_aat.c | 3 +-
src/C/SuiteSparse/AMD/Source/amd_control.c | 16 +-
src/C/SuiteSparse/AMD/Source/amd_defaults.c | 3 +-
src/C/SuiteSparse/AMD/Source/amd_dump.c | 3 +-
src/C/SuiteSparse/AMD/Source/amd_global.c | 78 +-
src/C/SuiteSparse/AMD/Source/amd_info.c | 23 +-
src/C/SuiteSparse/AMD/Source/amd_order.c | 43 +-
src/C/SuiteSparse/AMD/Source/amd_post_tree.c | 3 +-
src/C/SuiteSparse/AMD/Source/amd_postorder.c | 3 +-
src/C/SuiteSparse/AMD/Source/amd_preprocess.c | 3 +-
src/C/SuiteSparse/AMD/Source/amd_valid.c | 3 +-
src/C/SuiteSparse/CHOLMOD/Check/License.txt | 2 +-
src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c | 148 +-
src/C/SuiteSparse/CHOLMOD/Check/cholmod_read.c | 1 -
src/C/SuiteSparse/CHOLMOD/Cholesky/License.txt | 2 +-
src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_amd.c | 12 -
.../SuiteSparse/CHOLMOD/Cholesky/cholmod_analyze.c | 30 +-
.../SuiteSparse/CHOLMOD/Cholesky/cholmod_colamd.c | 4 -
src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_etree.c | 1 -
.../CHOLMOD/Cholesky/cholmod_factorize.c | 1 -
.../CHOLMOD/Cholesky/cholmod_postorder.c | 3 +-
src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rcond.c | 1 -
.../CHOLMOD/Cholesky/cholmod_resymbol.c | 1 -
.../CHOLMOD/Cholesky/cholmod_rowcolcounts.c | 1 -
.../SuiteSparse/CHOLMOD/Cholesky/cholmod_rowfac.c | 142 +-
src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_solve.c | 647 +-
.../SuiteSparse/CHOLMOD/Cholesky/cholmod_spsolve.c | 1 -
.../CHOLMOD/Cholesky/t_cholmod_lsolve.c | 95 +-
.../CHOLMOD/Cholesky/t_cholmod_ltsolve.c | 100 +-
.../CHOLMOD/Cholesky/t_cholmod_rowfac.c | 7 +-
.../SuiteSparse/CHOLMOD/Cholesky/t_cholmod_solve.c | 51 +-
src/C/SuiteSparse/CHOLMOD/Core/License.txt | 2 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_aat.c | 1 -
src/C/SuiteSparse/CHOLMOD/Core/cholmod_add.c | 1 -
src/C/SuiteSparse/CHOLMOD/Core/cholmod_band.c | 13 +-
.../CHOLMOD/Core/cholmod_change_factor.c | 1 -
src/C/SuiteSparse/CHOLMOD/Core/cholmod_common.c | 131 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_complex.c | 68 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_copy.c | 1 -
src/C/SuiteSparse/CHOLMOD/Core/cholmod_dense.c | 50 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_error.c | 9 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_factor.c | 6 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_memory.c | 153 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_sparse.c | 3 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_transpose.c | 1 -
src/C/SuiteSparse/CHOLMOD/Core/cholmod_triplet.c | 1 -
src/C/SuiteSparse/CHOLMOD/Core/cholmod_version.c | 37 +
.../CHOLMOD/Core/t_cholmod_change_factor.c | 1 -
src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_dense.c | 1 -
.../SuiteSparse/CHOLMOD/Core/t_cholmod_transpose.c | 1 -
src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_triplet.c | 1 -
src/C/SuiteSparse/CHOLMOD/Doc/ChangeLog | 109 +
src/C/SuiteSparse/CHOLMOD/Doc/Makefile | 16 +-
src/C/SuiteSparse/CHOLMOD/Doc/UserGuide.tex | 450 +-
src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu.c | 479 +
.../SuiteSparse/CHOLMOD/GPU/cholmod_gpu_kernels.c | 6 +
.../SuiteSparse/CHOLMOD/GPU/cholmod_gpu_kernels.cu | 196 +
src/C/SuiteSparse/CHOLMOD/GPU/t_cholmod_gpu.c | 1397 +++
src/C/SuiteSparse/CHOLMOD/Include/License.txt | 1 -
src/C/SuiteSparse/CHOLMOD/Include/README.txt | 2 +-
src/C/SuiteSparse/CHOLMOD/Include/cholmod.h | 22 +-
src/C/SuiteSparse/CHOLMOD/Include/cholmod_blas.h | 88 +-
src/C/SuiteSparse/CHOLMOD/Include/cholmod_camd.h | 102 +
src/C/SuiteSparse/CHOLMOD/Include/cholmod_check.h | 29 +-
.../SuiteSparse/CHOLMOD/Include/cholmod_cholesky.h | 128 +-
.../CHOLMOD/Include/cholmod_complexity.h | 7 +-
src/C/SuiteSparse/CHOLMOD/Include/cholmod_config.h | 6 +-
src/C/SuiteSparse/CHOLMOD/Include/cholmod_core.h | 406 +-
.../SuiteSparse/CHOLMOD/Include/cholmod_function.h | 155 +
src/C/SuiteSparse/CHOLMOD/Include/cholmod_gpu.h | 80 +
.../CHOLMOD/Include/cholmod_gpu_kernels.h | 50 +
.../SuiteSparse/CHOLMOD/Include/cholmod_internal.h | 120 +-
src/C/SuiteSparse/CHOLMOD/Include/cholmod_io64.h | 3 +-
.../CHOLMOD/Include/cholmod_matrixops.h | 16 +-
src/C/SuiteSparse/CHOLMOD/Include/cholmod_modify.h | 41 +-
.../CHOLMOD/Include/cholmod_partition.h | 117 +-
.../CHOLMOD/Include/cholmod_supernodal.h | 16 +-
.../SuiteSparse/CHOLMOD/Include/cholmod_template.h | 7 +
src/C/SuiteSparse/CHOLMOD/Lib/Makefile | 98 +-
src/C/SuiteSparse/CHOLMOD/Makefile | 38 +-
src/C/SuiteSparse/CHOLMOD/MatrixOps/License.txt | 25 +
src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_drop.c | 185 +
.../CHOLMOD/MatrixOps/cholmod_horzcat.c | 205 +
src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_norm.c | 454 +
.../SuiteSparse/CHOLMOD/MatrixOps/cholmod_scale.c | 219 +
.../SuiteSparse/CHOLMOD/MatrixOps/cholmod_sdmult.c | 151 +
.../SuiteSparse/CHOLMOD/MatrixOps/cholmod_ssmult.c | 489 +
.../CHOLMOD/MatrixOps/cholmod_submatrix.c | 427 +
.../CHOLMOD/MatrixOps/cholmod_symmetry.c | 490 +
.../CHOLMOD/MatrixOps/cholmod_vertcat.c | 203 +
src/C/SuiteSparse/CHOLMOD/MatrixOps/gpl.txt | 340 +
.../CHOLMOD/MatrixOps/t_cholmod_sdmult.c | 726 ++
src/C/SuiteSparse/CHOLMOD/README.txt | 29 +-
src/C/SuiteSparse/CHOLMOD/Supernodal/License.txt | 2 +-
.../CHOLMOD/Supernodal/cholmod_super_numeric.c | 27 +-
.../CHOLMOD/Supernodal/cholmod_super_solve.c | 4 +-
.../CHOLMOD/Supernodal/cholmod_super_symbolic.c | 166 +-
.../CHOLMOD/Supernodal/t_cholmod_super_numeric.c | 1472 ++-
.../CHOLMOD/Supernodal/t_cholmod_super_solve.c | 2 +-
src/C/SuiteSparse/COLAMD/Demo/Makefile | 16 +-
src/C/SuiteSparse/COLAMD/Demo/colamd_example.c | 3 +-
src/C/SuiteSparse/COLAMD/Demo/colamd_example.out | 4 +-
src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.c | 21 +-
src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.out | 4 +-
src/C/SuiteSparse/COLAMD/Doc/ChangeLog | 24 +
src/C/SuiteSparse/COLAMD/Include/colamd.h | 60 +-
src/C/SuiteSparse/COLAMD/Lib/Makefile | 16 +-
src/C/SuiteSparse/COLAMD/Makefile | 37 +-
src/C/SuiteSparse/COLAMD/README.txt | 23 +-
src/C/SuiteSparse/COLAMD/Source/colamd.c | 148 +-
src/C/SuiteSparse/COLAMD/Source/colamd_global.c | 18 +-
src/C/SuiteSparse/ChangeLog | 505 +
src/C/SuiteSparse/Contents.m | 25 +-
src/C/SuiteSparse/Makefile | 235 +-
src/C/SuiteSparse/README.txt | 135 +-
src/C/SuiteSparse/README_cvxopt | 15 +-
src/C/SuiteSparse/SuiteSparse_config/Makefile | 48 +
src/C/SuiteSparse/SuiteSparse_config/README.txt | 71 +
.../SuiteSparse_config/SuiteSparse_config.c | 531 +
.../SuiteSparse_config/SuiteSparse_config.h | 247 +
.../SuiteSparse_config/SuiteSparse_config.mk | 452 +
.../SuiteSparse_config_GPU_debug.mk | 452 +
.../SuiteSparse_config_GPU_gcc.mk | 452 +
.../SuiteSparse_config_GPU_icc.mk | 452 +
.../SuiteSparse_config_GPU_icc10.mk | 453 +
.../SuiteSparse_config/SuiteSparse_config_Mac.mk | 452 +
.../SuiteSparse_config_backslash.mk | 452 +
.../SuiteSparse_config/SuiteSparse_config_linux.mk | 452 +
.../SuiteSparse/SuiteSparse_config/xerbla/Makefile | 33 +
.../xerbla/xerbla.c | 0
.../xerbla/xerbla.f | 0
.../xerbla/xerbla.h | 0
src/C/SuiteSparse/UFconfig/README.txt | 35 -
src/C/SuiteSparse/UFconfig/UFconfig.h | 118 -
src/C/SuiteSparse/UFconfig/UFconfig.mk | 354 -
src/C/SuiteSparse/UFconfig/xerbla/Makefile | 31 -
src/C/SuiteSparse/UMFPACK/Doc/ChangeLog | 47 +
src/C/SuiteSparse/UMFPACK/Doc/License | 4 +-
src/C/SuiteSparse/UMFPACK/Doc/Makefile | 2 +-
src/C/SuiteSparse/UMFPACK/Doc/QuickStart.tex | 77 +-
src/C/SuiteSparse/UMFPACK/Doc/UserGuide.bib | 39 -
src/C/SuiteSparse/UMFPACK/Doc/UserGuide.stex | 318 +-
src/C/SuiteSparse/UMFPACK/Include/umfpack.h | 70 +-
.../UMFPACK/Include/umfpack_col_to_triplet.h | 29 +-
.../SuiteSparse/UMFPACK/Include/umfpack_defaults.h | 9 +-
.../UMFPACK/Include/umfpack_free_numeric.h | 9 +-
.../UMFPACK/Include/umfpack_free_symbolic.h | 9 +-
.../UMFPACK/Include/umfpack_get_determinant.h | 16 +-
.../SuiteSparse/UMFPACK/Include/umfpack_get_lunz.h | 37 +-
.../UMFPACK/Include/umfpack_get_numeric.h | 47 +-
.../UMFPACK/Include/umfpack_get_symbolic.h | 87 +-
src/C/SuiteSparse/UMFPACK/Include/umfpack_global.h | 18 +-
.../UMFPACK/Include/umfpack_load_numeric.h | 17 +-
.../UMFPACK/Include/umfpack_load_symbolic.h | 17 +-
.../SuiteSparse/UMFPACK/Include/umfpack_numeric.h | 31 +-
.../UMFPACK/Include/umfpack_qsymbolic.h | 129 +-
.../UMFPACK/Include/umfpack_report_control.h | 9 +-
.../UMFPACK/Include/umfpack_report_info.h | 9 +-
.../UMFPACK/Include/umfpack_report_matrix.h | 37 +-
.../UMFPACK/Include/umfpack_report_numeric.h | 17 +-
.../UMFPACK/Include/umfpack_report_perm.h | 25 +-
.../UMFPACK/Include/umfpack_report_status.h | 17 +-
.../UMFPACK/Include/umfpack_report_symbolic.h | 17 +-
.../UMFPACK/Include/umfpack_report_triplet.h | 37 +-
.../UMFPACK/Include/umfpack_report_vector.h | 21 +-
.../UMFPACK/Include/umfpack_save_numeric.h | 17 +-
.../UMFPACK/Include/umfpack_save_symbolic.h | 17 +-
src/C/SuiteSparse/UMFPACK/Include/umfpack_scale.h | 13 +-
src/C/SuiteSparse/UMFPACK/Include/umfpack_solve.h | 29 +-
.../SuiteSparse/UMFPACK/Include/umfpack_symbolic.h | 87 +-
src/C/SuiteSparse/UMFPACK/Include/umfpack_tictoc.h | 29 +-
src/C/SuiteSparse/UMFPACK/Include/umfpack_timer.h | 19 +-
.../UMFPACK/Include/umfpack_transpose.h | 51 +-
.../UMFPACK/Include/umfpack_triplet_to_col.h | 49 +-
src/C/SuiteSparse/UMFPACK/Include/umfpack_wsolve.h | 33 +-
src/C/SuiteSparse/UMFPACK/Lib/GNUmakefile | 50 +-
src/C/SuiteSparse/UMFPACK/Lib/Makefile | 31 +-
src/C/SuiteSparse/UMFPACK/Lib/libumfpack.def | 4 +
src/C/SuiteSparse/UMFPACK/Makefile | 51 +-
src/C/SuiteSparse/UMFPACK/README.txt | 64 +-
src/C/SuiteSparse/UMFPACK/Source/cholmod_blas.h | 150 +-
src/C/SuiteSparse/UMFPACK/Source/umf_2by2.c | 866 --
src/C/SuiteSparse/UMFPACK/Source/umf_2by2.h | 36 -
src/C/SuiteSparse/UMFPACK/Source/umf_analyze.c | 13 +-
src/C/SuiteSparse/UMFPACK/Source/umf_analyze.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_assemble.c | 9 +-
src/C/SuiteSparse/UMFPACK/Source/umf_assemble.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_blas3_update.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_blas3_update.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_build_tuples.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_build_tuples.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_cholmod.c | 233 +
src/C/SuiteSparse/UMFPACK/Source/umf_cholmod.h | 37 +
src/C/SuiteSparse/UMFPACK/Source/umf_colamd.c | 15 +-
src/C/SuiteSparse/UMFPACK/Source/umf_colamd.h | 9 +-
src/C/SuiteSparse/UMFPACK/Source/umf_config.h | 63 +-
.../UMFPACK/Source/umf_create_element.c | 5 +-
.../UMFPACK/Source/umf_create_element.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_dump.c | 35 +-
src/C/SuiteSparse/UMFPACK/Source/umf_dump.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_extend_front.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_extend_front.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_free.c | 8 +-
src/C/SuiteSparse/UMFPACK/Source/umf_free.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_fsize.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_fsize.h | 5 +-
.../UMFPACK/Source/umf_garbage_collection.c | 5 +-
.../UMFPACK/Source/umf_garbage_collection.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_init_front.c | 7 +-
src/C/SuiteSparse/UMFPACK/Source/umf_init_front.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_internal.h | 25 +-
.../UMFPACK/Source/umf_is_permutation.c | 5 +-
.../UMFPACK/Source/umf_is_permutation.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_kernel.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_kernel.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.c | 8 +-
src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_local_search.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_local_search.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_malloc.c | 20 +-
src/C/SuiteSparse/UMFPACK/Source/umf_malloc.h | 5 +-
.../UMFPACK/Source/umf_mem_alloc_element.c | 5 +-
.../UMFPACK/Source/umf_mem_alloc_element.h | 5 +-
.../UMFPACK/Source/umf_mem_alloc_head_block.c | 5 +-
.../UMFPACK/Source/umf_mem_alloc_head_block.h | 5 +-
.../UMFPACK/Source/umf_mem_alloc_tail_block.c | 5 +-
.../UMFPACK/Source/umf_mem_alloc_tail_block.h | 5 +-
.../UMFPACK/Source/umf_mem_free_tail_block.c | 5 +-
.../UMFPACK/Source/umf_mem_free_tail_block.h | 5 +-
.../UMFPACK/Source/umf_mem_init_memoryspace.c | 5 +-
.../UMFPACK/Source/umf_mem_init_memoryspace.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_multicompile.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_realloc.c | 8 +-
src/C/SuiteSparse/UMFPACK/Source/umf_realloc.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_report_vector.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_report_vector.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_row_search.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_row_search.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_scale.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_scale.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_scale_column.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_scale_column.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_singletons.c | 15 +-
src/C/SuiteSparse/UMFPACK/Source/umf_singletons.h | 6 +-
src/C/SuiteSparse/UMFPACK/Source/umf_solve.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_solve.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_start_front.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_start_front.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.h | 5 +-
.../UMFPACK/Source/umf_symbolic_usage.c | 5 +-
.../UMFPACK/Source/umf_symbolic_usage.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_transpose.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_transpose.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_triplet.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_triplet.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_tuple_lengths.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_tuple_lengths.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_usolve.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_usolve.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.h | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_valid_numeric.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umf_valid_numeric.h | 5 +-
.../UMFPACK/Source/umf_valid_symbolic.c | 5 +-
.../UMFPACK/Source/umf_valid_symbolic.h | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umf_version.h | 35 +-
.../UMFPACK/Source/umfpack_col_to_triplet.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umfpack_defaults.c | 52 +-
.../UMFPACK/Source/umfpack_free_numeric.c | 5 +-
.../UMFPACK/Source/umfpack_free_symbolic.c | 5 +-
.../UMFPACK/Source/umfpack_get_determinant.c | 8 +-
.../SuiteSparse/UMFPACK/Source/umfpack_get_lunz.c | 5 +-
.../UMFPACK/Source/umfpack_get_numeric.c | 5 +-
.../UMFPACK/Source/umfpack_get_symbolic.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c | 126 +-
.../UMFPACK/Source/umfpack_load_numeric.c | 5 +-
.../UMFPACK/Source/umfpack_load_symbolic.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umfpack_numeric.c | 10 +-
.../SuiteSparse/UMFPACK/Source/umfpack_qsymbolic.c | 1126 +-
.../UMFPACK/Source/umfpack_report_control.c | 129 +-
.../UMFPACK/Source/umfpack_report_info.c | 183 +-
.../UMFPACK/Source/umfpack_report_matrix.c | 31 +-
.../UMFPACK/Source/umfpack_report_numeric.c | 5 +-
.../UMFPACK/Source/umfpack_report_perm.c | 5 +-
.../UMFPACK/Source/umfpack_report_status.c | 12 +-
.../UMFPACK/Source/umfpack_report_symbolic.c | 64 +-
.../UMFPACK/Source/umfpack_report_triplet.c | 5 +-
.../UMFPACK/Source/umfpack_report_vector.c | 5 +-
.../UMFPACK/Source/umfpack_save_numeric.c | 9 +-
.../UMFPACK/Source/umfpack_save_symbolic.c | 6 +-
src/C/SuiteSparse/UMFPACK/Source/umfpack_scale.c | 5 +-
src/C/SuiteSparse/UMFPACK/Source/umfpack_solve.c | 5 +-
.../SuiteSparse/UMFPACK/Source/umfpack_symbolic.c | 10 +-
src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c | 109 +-
src/C/SuiteSparse/UMFPACK/Source/umfpack_timer.c | 85 +-
.../SuiteSparse/UMFPACK/Source/umfpack_transpose.c | 5 +-
.../UMFPACK/Source/umfpack_triplet_to_col.c | 5 +-
.../SuiteSparse_cvxopt_extra/umfpack/umf_di_2by2.c | 2 -
.../SuiteSparse_cvxopt_extra/umfpack/umf_dl_2by2.c | 3 -
.../umfpack/umf_i_cholmod.c | 2 +
.../umfpack/umf_l_cholmod.c | 3 +
.../SuiteSparse_cvxopt_extra/umfpack/umf_zi_2by2.c | 2 -
.../SuiteSparse_cvxopt_extra/umfpack/umf_zl_2by2.c | 3 -
src/C/amd.c | 7 +-
src/C/base.c | 60 +-
src/C/blas.c | 93 +-
src/C/cholmod.c | 36 +-
src/C/cvxopt.h | 19 +-
src/C/dense.c | 476 +-
src/C/dsdp.c | 3 +-
src/C/fftw.c | 5 +-
src/C/glpk.c | 1024 +-
src/C/gsl.c | 3 +-
src/C/lapack.c | 641 +-
src/C/misc.h | 5 +-
src/C/misc_solvers.c | 3 +-
src/C/sparse.c | 335 +-
src/C/umfpack.c | 7 +-
src/python/__init__.py | 10 +-
src/python/coneprog.py | 323 +-
src/python/cvxprog.py | 98 +-
src/python/info.py | 32 +-
src/python/misc.py | 12 +-
src/python/modeling.py | 3 +-
src/python/msk.py | 39 +-
src/python/printing.py | 7 +-
src/python/solvers.py | 3 +-
src/setup.py | 168 -
809 files changed, 36025 insertions(+), 8423 deletions(-)
diff --git a/INSTALL b/INSTALL
index 638e2e2..991b109 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,13 @@
-Installation instructions for CVXOPT Version 1.1.4.
-The package requires version 2.7 or newer of Python, and is built from
+This document describes the standard CVXOPT installation procedure on
+Linux systems. For other platforms, please consult the CVXOPT website
+<abel.ee.ucla.edu/cvxopt>.
+
+
+Required and optional software
+------------------------------
+
+The package requires version 2.7 or 3.x of Python, and is built from
source, so the header files and libraries for Python must be installed,
as well as the core binaries.
@@ -11,76 +18,80 @@ header files and libraries must be installed.
The following software libraries are optional.
-1) The GNU Scientific Library GSL (www.gnu.org/software/gsl).
+* The GNU Scientific Library GSL <www.gnu.org/software/gsl>.
-2) FFTW (www.fftw.org) is a C library for discrete Fourier transforms.
+* FFTW <www.fftw.org> is a C library for discrete Fourier transforms.
-3) GLPK (www.gnu.org/software/glpk/glpk.html) is a linear programming
-package.
+* GLPK <www.gnu.org/software/glpk/glpk.html> is a linear programming
+ package.
-4) MOSEK version 6 (www.mosek.com) is a commercial library of convex
-optimization solvers.
+* MOSEK version 7 <www.mosek.com> is a commercial library of convex
+ optimization solvers.
-5) DSDP5.8 (www-unix.mcs.anl.gov/DSDP) is a semidefinite programming
-solver.
+* DSDP5.8 <www-unix.mcs.anl.gov/DSDP> is a semidefinite programming solver.
-Configuration script:
----------------------
-Edit src/setup.py and update the following variables:
+Installation
+------------
-- ATLAS_LIB_DIR: the directory containing the LAPACK and BLAS libraries.
+CVXOPT can be installed globally (for all users on a UNIX system) by
+writing:
-- BUILD_GSL: set this variable to 1 if you would like to use the GSL
- random number generators for constructing random matrices in CVXOPT.
- If BULD_GSL is 0, the Python random number generators will be used
- instead.
-- GSL_LIB_DIR: the directory containing libgsl.
-- GSL_iNC_DIR: the directory containing the GSL header files.
+ python setup.py install
-- BUILD_FFTW: set this variable to 1 to install the cvxopt.fftw module,
- which is an interface to FFTW.
-- FFTW_LIB_DIR: the directory containing libfftw3.
-- FFTW_INC_DIR: the directory containing fftw.h.
+It can also be installed locally (for a single user) by typing::
-- BUILD_GLPK: set this variable to 1 to enable support for the linear
- programming solver GLPK.
-- GLPK_LIB_DIR: the directory containing libglpk.
-- GLPK_INC_DIR: the directory containing glpk.h.
+ python setup.py install --user
-- BUILD_DSDP: set this variable to 1 to enable support for the semidefinite
- programming solver DSDP.
-- DSDP_LIB_DIR: the directory containing libdsdp.
-- DSDP_INC_DIR: the directory containing dsdp5.h.
+To test that the installation was successful, go to the examples directory
+and try one of the examples, for example,
-Support for the linear, second-order cone, and quadratic programming
-solvers in MOSEK is automatically enabled if the MOSEK Python interface
-pymosek.so is found in the user's PYTHONPATH.
+ cd examples/doc/chap8
+ python lp.py
+If Python does not issue an error message, installation was successful.
-Compilation:
-------------
-CVXOPT can be installed globally (for all users on a UNIX system) by
-writing:
+Additional information can be found in the
+Python documentation <http://docs.python.org/install/index.html>.
- python setup.py install
-It can also be installed locally in the home directory by typing:
+Customized setup script
+-----------------------
- python setup.py install --home=~
+If needed, the default compilation can be customized by edting src/setup.py.
+The following variables in the setup script can be modified.
-This will install the libraries in /home/username/lib/python. In this
-case PYTHONPATH must be updated, e.g., under Bash write
+* BLAS_LIB_DIR: the directory containing the LAPACK and BLAS libraries.
- export PYTHONPATH = $PYTHONPATH:/home/username/lib/python
+* BUILD_GSL: set this variable to 1 if you would like to use the GSL
+ random number generators for constructing random matrices in CVXOPT.
+ If BULD_GSL is 0, the Python random number generators will be used
+ instead.
+* GSL_LIB_DIR: the directory containing libgsl.
+* GSL_INC_DIR: the directory containing the GSL header files.
+* BUILD_FFTW: set this variable to 1 to install the cvxopt.fftw module,
+ which is an interface to FFTW.
+* FFTW_LIB_DIR: the directory containing libfftw3.
+* FFTW_INC_DIR: the directory containing fftw.h.
-Test it:
---------
-To test that the installation was successful, go to the examples directory
-and try one of the examples, for example,
+* BUILD_GLPK: set this variable to 1 to enable support for the linear
+ programming solver GLPK.
+* GLPK_LIB_DIR: the directory containing libglpk.
+* GLPK_INC_DIR: the directory containing glpk.h.
+
+* BUILD_DSDP: set this variable to 1 to enable support for the semidefinite
+ programming solver DSDP.
+* DSDP_LIB_DIR: the directory containing libdsdp.
+* DSDP_INC_DIR: the directory containing dsdp5.h.
+
+Each of the variables can be overridden by specifying an environment variable
+with the prefix "CVXOPT_". For example, the following command installs CVXOPT
+locally with BUILD_FFTW=1:
- $ cd examples/doc/chap8
- $ python lp.py
+ CVXOPT_BUILD_FFTW=1 python setup.py install --user
+
+Support for the linear, second-order cone, and quadratic programming
+solvers in MOSEK is automatically enabled if the MOSEK Python interface
+pymosek.so is found in the user's PYTHONPATH.
-If Python does not issue an error message installation was successful.
diff --git a/LICENSE b/LICENSE
index 883e140..d356c5d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,6 @@
-CVXOPT version 1.1.4.
+CVXOPT version 1.1.8.
+Copyright (c) 2012-2015 M. Andersen and L. Vandenberghe.
Copyright (c) 2010-2011 L. Vandenberghe.
Copyright (c) 2004-2009 J. Dahl and L. Vandenberghe.
@@ -18,21 +19,22 @@ For further information, see <http://www.gnu.org/licenses/>.
---------------------------------------------------------------------------
The CVXOPT distribution includes source code for a subset of the
-SuiteSparse suite of sparse matrix algorithms, including:
+SuiteSparse suite of sparse matrix algorithms (version 4.1.0).
+This includes:
-- AMD Version 2.2. Copyright (c) 2007 by Timothy A. Davis, Patrick R.
- Amestoy, and Iain S. Duff.
-- CHOLMOD Version 1.7.1 Copyright (c) 2005-2009 by University of Florida,
- Timothy A. Davis and W. Hager.
-- COLAMD version 2.7. Copyright (c) 1998-2007 by Timothy A. Davis.
-- UMFPACK Version 5.4.0. Copyright (c) 1994-2009 by Timothy A. Davis.
+- AMD Version 2.3.1. Copyright (c) 2009-2012 by Timothy A. Davis,
+ Patrick R. Amestoy, and Iain S. Duff.
+- CHOLMOD Version 2.1.0 Copyright (c) 2005-2013 by University of Florida,
+ Timothy A. Davis, and W. Hager.
+- COLAMD version 2.8.0. Copyright (c) 1998-2012 by Timothy A. Davis.
+- UMFPACK Version 5.6.1. Copyright (c) 1995-2012 by Timothy A. Davis.
These packages are licensed under the terms of the GNU General Public
-License, version 2 or higher (UMFPACK, the Supernodal module of CHOLMOD)
-and the GNU Lesser General Public License, version 2.1 or higher
-(the other CHOLMOD modules, AMD, COLAMD). For copyright and license
-details, consult the README files in the source directories or the website
-listed below.
+License, version 2 or higher (UMFPACK, the Supernodal and MatrixOPs
+modules of CHOLMOD) and the GNU Lesser General Public License,
+version 2.1 or higher (the other CHOLMOD modules, AMD, COLAMD).
+For copyright and license details, consult the README files in the source
+directories or the website listed below.
Availability: www.cise.ufl.edu/research/sparse.
----------------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..af994bb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+cvxopt
+======
+
+CVXOPT -- Python Software for Convex Optimization
+
+Documentation available at http://cvxopt.org
diff --git a/doc/html/.buildinfo b/doc/html/.buildinfo
new file mode 100644
index 0000000..7d6ffb5
--- /dev/null
+++ b/doc/html/.buildinfo
@@ -0,0 +1,4 @@
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: 49b4b5937ab33a701c37f4721c65a038
+tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/doc/html/_images/floorplan.png b/doc/html/_images/floorplan.png
new file mode 100644
index 0000000..e712437
Binary files /dev/null and b/doc/html/_images/floorplan.png differ
diff --git a/doc/html/_images/math/0001d02b63ede2fe3219e05a7cd09c82ae6298b6.png b/doc/html/_images/math/0001d02b63ede2fe3219e05a7cd09c82ae6298b6.png
new file mode 100644
index 0000000..9686a08
Binary files /dev/null and b/doc/html/_images/math/0001d02b63ede2fe3219e05a7cd09c82ae6298b6.png differ
diff --git a/doc/html/_images/math/00d82d538c7fa6c6c3059574dec22d3e7692feb1.png b/doc/html/_images/math/00d82d538c7fa6c6c3059574dec22d3e7692feb1.png
new file mode 100644
index 0000000..575293c
Binary files /dev/null and b/doc/html/_images/math/00d82d538c7fa6c6c3059574dec22d3e7692feb1.png differ
diff --git a/doc/html/_images/math/016add6975e83d6df1ea24466c468d0f712c4da5.png b/doc/html/_images/math/016add6975e83d6df1ea24466c468d0f712c4da5.png
new file mode 100644
index 0000000..bc13689
Binary files /dev/null and b/doc/html/_images/math/016add6975e83d6df1ea24466c468d0f712c4da5.png differ
diff --git a/doc/html/_images/math/0246a989dbd0daa3dc3c6fecbf683b226a79b7f1.png b/doc/html/_images/math/0246a989dbd0daa3dc3c6fecbf683b226a79b7f1.png
new file mode 100644
index 0000000..0b90203
Binary files /dev/null and b/doc/html/_images/math/0246a989dbd0daa3dc3c6fecbf683b226a79b7f1.png differ
diff --git a/doc/html/_images/math/0260007688027eacd5a07f14d9365f85f5c8ee95.png b/doc/html/_images/math/0260007688027eacd5a07f14d9365f85f5c8ee95.png
new file mode 100644
index 0000000..08fb393
Binary files /dev/null and b/doc/html/_images/math/0260007688027eacd5a07f14d9365f85f5c8ee95.png differ
diff --git a/doc/html/_images/math/03eca013c1b38e9a3853974caeab3eea439da0d9.png b/doc/html/_images/math/03eca013c1b38e9a3853974caeab3eea439da0d9.png
new file mode 100644
index 0000000..ed96e74
Binary files /dev/null and b/doc/html/_images/math/03eca013c1b38e9a3853974caeab3eea439da0d9.png differ
diff --git a/doc/html/_images/math/040c9de764a1b5fbfc60b7b41e4d2901e5e5dd40.png b/doc/html/_images/math/040c9de764a1b5fbfc60b7b41e4d2901e5e5dd40.png
new file mode 100644
index 0000000..2802d04
Binary files /dev/null and b/doc/html/_images/math/040c9de764a1b5fbfc60b7b41e4d2901e5e5dd40.png differ
diff --git a/doc/html/_images/math/047937fc5e1e2e82914d671ed65b71adb4401eb7.png b/doc/html/_images/math/047937fc5e1e2e82914d671ed65b71adb4401eb7.png
new file mode 100644
index 0000000..4c28b7b
Binary files /dev/null and b/doc/html/_images/math/047937fc5e1e2e82914d671ed65b71adb4401eb7.png differ
diff --git a/doc/html/_images/math/04f87626ae5b9c318a229434e01daa158140d18c.png b/doc/html/_images/math/04f87626ae5b9c318a229434e01daa158140d18c.png
new file mode 100644
index 0000000..19b5a64
Binary files /dev/null and b/doc/html/_images/math/04f87626ae5b9c318a229434e01daa158140d18c.png differ
diff --git a/doc/html/_images/math/05b154e50ec84f68ecf21e2ed17bf6f5935f1dd2.png b/doc/html/_images/math/05b154e50ec84f68ecf21e2ed17bf6f5935f1dd2.png
new file mode 100644
index 0000000..750fc09
Binary files /dev/null and b/doc/html/_images/math/05b154e50ec84f68ecf21e2ed17bf6f5935f1dd2.png differ
diff --git a/doc/html/_images/math/05b96f8b501e969ecd99e2b84f7892fa2a8e203b.png b/doc/html/_images/math/05b96f8b501e969ecd99e2b84f7892fa2a8e203b.png
new file mode 100644
index 0000000..74875d6
Binary files /dev/null and b/doc/html/_images/math/05b96f8b501e969ecd99e2b84f7892fa2a8e203b.png differ
diff --git a/doc/html/_images/math/063b83ec3e5c8ab1cd493011e9e45ef6465f84d7.png b/doc/html/_images/math/063b83ec3e5c8ab1cd493011e9e45ef6465f84d7.png
new file mode 100644
index 0000000..bfe8441
Binary files /dev/null and b/doc/html/_images/math/063b83ec3e5c8ab1cd493011e9e45ef6465f84d7.png differ
diff --git a/doc/html/_images/math/0672fed1fee7fb053d48c4f52b9a0adbb8e28419.png b/doc/html/_images/math/0672fed1fee7fb053d48c4f52b9a0adbb8e28419.png
new file mode 100644
index 0000000..a1bed05
Binary files /dev/null and b/doc/html/_images/math/0672fed1fee7fb053d48c4f52b9a0adbb8e28419.png differ
diff --git a/doc/html/_images/math/06b423cebfb90c3d0a63b7f3df78c09d995cfeaa.png b/doc/html/_images/math/06b423cebfb90c3d0a63b7f3df78c09d995cfeaa.png
new file mode 100644
index 0000000..e25677f
Binary files /dev/null and b/doc/html/_images/math/06b423cebfb90c3d0a63b7f3df78c09d995cfeaa.png differ
diff --git a/doc/html/_images/math/073f6167ac0531843edee20f5f81d9a0c7cf4671.png b/doc/html/_images/math/073f6167ac0531843edee20f5f81d9a0c7cf4671.png
new file mode 100644
index 0000000..98d7b43
Binary files /dev/null and b/doc/html/_images/math/073f6167ac0531843edee20f5f81d9a0c7cf4671.png differ
diff --git a/doc/html/_images/math/084599ed05bd45d2433207ae99842473f3cdd567.png b/doc/html/_images/math/084599ed05bd45d2433207ae99842473f3cdd567.png
new file mode 100644
index 0000000..e136e15
Binary files /dev/null and b/doc/html/_images/math/084599ed05bd45d2433207ae99842473f3cdd567.png differ
diff --git a/doc/html/_images/math/094605c7610159f1037e4198872755402bd03b31.png b/doc/html/_images/math/094605c7610159f1037e4198872755402bd03b31.png
new file mode 100644
index 0000000..32b9422
Binary files /dev/null and b/doc/html/_images/math/094605c7610159f1037e4198872755402bd03b31.png differ
diff --git a/doc/html/_images/math/0999de156f97ffbe09679a57d21b84dd9f9b35e4.png b/doc/html/_images/math/0999de156f97ffbe09679a57d21b84dd9f9b35e4.png
new file mode 100644
index 0000000..e2c7427
Binary files /dev/null and b/doc/html/_images/math/0999de156f97ffbe09679a57d21b84dd9f9b35e4.png differ
diff --git a/doc/html/_images/math/09ed43a26043678d5a76939140100bbae8c9dd16.png b/doc/html/_images/math/09ed43a26043678d5a76939140100bbae8c9dd16.png
new file mode 100644
index 0000000..c79060b
Binary files /dev/null and b/doc/html/_images/math/09ed43a26043678d5a76939140100bbae8c9dd16.png differ
diff --git a/doc/html/_images/math/0a5711c7a37994043b2bc3bb374adca232491762.png b/doc/html/_images/math/0a5711c7a37994043b2bc3bb374adca232491762.png
new file mode 100644
index 0000000..cf74218
Binary files /dev/null and b/doc/html/_images/math/0a5711c7a37994043b2bc3bb374adca232491762.png differ
diff --git a/doc/html/_images/math/0ac7d0604f94ddf588a784d17ccf161dd03809c7.png b/doc/html/_images/math/0ac7d0604f94ddf588a784d17ccf161dd03809c7.png
new file mode 100644
index 0000000..b5510c3
Binary files /dev/null and b/doc/html/_images/math/0ac7d0604f94ddf588a784d17ccf161dd03809c7.png differ
diff --git a/doc/html/_images/math/0acafa529182e79b4f56165ec677554fba7fcf98.png b/doc/html/_images/math/0acafa529182e79b4f56165ec677554fba7fcf98.png
new file mode 100644
index 0000000..0af1ede
Binary files /dev/null and b/doc/html/_images/math/0acafa529182e79b4f56165ec677554fba7fcf98.png differ
diff --git a/doc/html/_images/math/0bc936c22de06c6b0ea722218217731a24b30f6e.png b/doc/html/_images/math/0bc936c22de06c6b0ea722218217731a24b30f6e.png
new file mode 100644
index 0000000..ca8beb9
Binary files /dev/null and b/doc/html/_images/math/0bc936c22de06c6b0ea722218217731a24b30f6e.png differ
diff --git a/doc/html/_images/math/0e154998003cfc278f08dc96371848b75ea42fd9.png b/doc/html/_images/math/0e154998003cfc278f08dc96371848b75ea42fd9.png
new file mode 100644
index 0000000..cc5400c
Binary files /dev/null and b/doc/html/_images/math/0e154998003cfc278f08dc96371848b75ea42fd9.png differ
diff --git a/doc/html/_images/math/0f0d15b45680abd34a23c216c53b71d07d672589.png b/doc/html/_images/math/0f0d15b45680abd34a23c216c53b71d07d672589.png
new file mode 100644
index 0000000..c0bb967
Binary files /dev/null and b/doc/html/_images/math/0f0d15b45680abd34a23c216c53b71d07d672589.png differ
diff --git a/doc/html/_images/math/0f86ac5d8da289ce93680172fb5d39fba1f78a77.png b/doc/html/_images/math/0f86ac5d8da289ce93680172fb5d39fba1f78a77.png
new file mode 100644
index 0000000..9833209
Binary files /dev/null and b/doc/html/_images/math/0f86ac5d8da289ce93680172fb5d39fba1f78a77.png differ
diff --git a/doc/html/_images/math/0fc275b425cf69c4703c19ecbc7723811ba670cf.png b/doc/html/_images/math/0fc275b425cf69c4703c19ecbc7723811ba670cf.png
new file mode 100644
index 0000000..d02d732
Binary files /dev/null and b/doc/html/_images/math/0fc275b425cf69c4703c19ecbc7723811ba670cf.png differ
diff --git a/doc/html/_images/math/10258285048b087b264bdafb31b19b457ce6d82b.png b/doc/html/_images/math/10258285048b087b264bdafb31b19b457ce6d82b.png
new file mode 100644
index 0000000..5781e0e
Binary files /dev/null and b/doc/html/_images/math/10258285048b087b264bdafb31b19b457ce6d82b.png differ
diff --git a/doc/html/_images/math/10d982174e5e28e1a59619b7cfa9c3e0c25b4a6b.png b/doc/html/_images/math/10d982174e5e28e1a59619b7cfa9c3e0c25b4a6b.png
new file mode 100644
index 0000000..334e1fc
Binary files /dev/null and b/doc/html/_images/math/10d982174e5e28e1a59619b7cfa9c3e0c25b4a6b.png differ
diff --git a/doc/html/_images/math/114653593889a8ebfb445e7026fce81d450033de.png b/doc/html/_images/math/114653593889a8ebfb445e7026fce81d450033de.png
new file mode 100644
index 0000000..54d2220
Binary files /dev/null and b/doc/html/_images/math/114653593889a8ebfb445e7026fce81d450033de.png differ
diff --git a/doc/html/_images/math/11a85f3c69ae6702cb1d99d3de451913b8f84c04.png b/doc/html/_images/math/11a85f3c69ae6702cb1d99d3de451913b8f84c04.png
new file mode 100644
index 0000000..6ea8b05
Binary files /dev/null and b/doc/html/_images/math/11a85f3c69ae6702cb1d99d3de451913b8f84c04.png differ
diff --git a/doc/html/_images/math/11afd70b9a3fac8d7ed4ec2c7fa5a51eedb8cc6c.png b/doc/html/_images/math/11afd70b9a3fac8d7ed4ec2c7fa5a51eedb8cc6c.png
new file mode 100644
index 0000000..499af63
Binary files /dev/null and b/doc/html/_images/math/11afd70b9a3fac8d7ed4ec2c7fa5a51eedb8cc6c.png differ
diff --git a/doc/html/_images/math/11eff273e1963ba445d6d5ec611f02eb7fc4a694.png b/doc/html/_images/math/11eff273e1963ba445d6d5ec611f02eb7fc4a694.png
new file mode 100644
index 0000000..02ef9ae
Binary files /dev/null and b/doc/html/_images/math/11eff273e1963ba445d6d5ec611f02eb7fc4a694.png differ
diff --git a/doc/html/_images/math/1259a43ca7fc336c314fd9e818f723369d738d9a.png b/doc/html/_images/math/1259a43ca7fc336c314fd9e818f723369d738d9a.png
new file mode 100644
index 0000000..ec65904
Binary files /dev/null and b/doc/html/_images/math/1259a43ca7fc336c314fd9e818f723369d738d9a.png differ
diff --git a/doc/html/_images/math/126e84ba38f7dece5f0ad64e929b9588b20f6440.png b/doc/html/_images/math/126e84ba38f7dece5f0ad64e929b9588b20f6440.png
new file mode 100644
index 0000000..40aaaeb
Binary files /dev/null and b/doc/html/_images/math/126e84ba38f7dece5f0ad64e929b9588b20f6440.png differ
diff --git a/doc/html/_images/math/1303f291f9f1bb1b13ce614a71db9ac06982675d.png b/doc/html/_images/math/1303f291f9f1bb1b13ce614a71db9ac06982675d.png
new file mode 100644
index 0000000..b09b38a
Binary files /dev/null and b/doc/html/_images/math/1303f291f9f1bb1b13ce614a71db9ac06982675d.png differ
diff --git a/doc/html/_images/math/1326e652fceec639bac58f329d8b397f2fe251d2.png b/doc/html/_images/math/1326e652fceec639bac58f329d8b397f2fe251d2.png
new file mode 100644
index 0000000..a7dabd2
Binary files /dev/null and b/doc/html/_images/math/1326e652fceec639bac58f329d8b397f2fe251d2.png differ
diff --git a/doc/html/_images/math/135e55b6f4cddbbf41397f28329812f7abd7c9b7.png b/doc/html/_images/math/135e55b6f4cddbbf41397f28329812f7abd7c9b7.png
new file mode 100644
index 0000000..76dcfe0
Binary files /dev/null and b/doc/html/_images/math/135e55b6f4cddbbf41397f28329812f7abd7c9b7.png differ
diff --git a/doc/html/_images/math/140c896568502ceb7c765a977e35eaf507e45ab1.png b/doc/html/_images/math/140c896568502ceb7c765a977e35eaf507e45ab1.png
new file mode 100644
index 0000000..4fc7f3c
Binary files /dev/null and b/doc/html/_images/math/140c896568502ceb7c765a977e35eaf507e45ab1.png differ
diff --git a/doc/html/_images/math/148494def4743e19b6ace5db936a26f5bf2a66ad.png b/doc/html/_images/math/148494def4743e19b6ace5db936a26f5bf2a66ad.png
new file mode 100644
index 0000000..c05c212
Binary files /dev/null and b/doc/html/_images/math/148494def4743e19b6ace5db936a26f5bf2a66ad.png differ
diff --git a/doc/html/_images/math/15cc63ee73ef52c69c9de3b3349cd0c5e7b7fd49.png b/doc/html/_images/math/15cc63ee73ef52c69c9de3b3349cd0c5e7b7fd49.png
new file mode 100644
index 0000000..96a19f9
Binary files /dev/null and b/doc/html/_images/math/15cc63ee73ef52c69c9de3b3349cd0c5e7b7fd49.png differ
diff --git a/doc/html/_images/math/162e6fffc996b6d4f1c2861cbc608ff103b166e4.png b/doc/html/_images/math/162e6fffc996b6d4f1c2861cbc608ff103b166e4.png
new file mode 100644
index 0000000..59625d3
Binary files /dev/null and b/doc/html/_images/math/162e6fffc996b6d4f1c2861cbc608ff103b166e4.png differ
diff --git a/doc/html/_images/math/17e7c9a88fff44f20b2b7d58caa082246c177d64.png b/doc/html/_images/math/17e7c9a88fff44f20b2b7d58caa082246c177d64.png
new file mode 100644
index 0000000..d237ba9
Binary files /dev/null and b/doc/html/_images/math/17e7c9a88fff44f20b2b7d58caa082246c177d64.png differ
diff --git a/doc/html/_images/math/1843694724c1e6709cb3bdb81bc4f0c40d5e02e5.png b/doc/html/_images/math/1843694724c1e6709cb3bdb81bc4f0c40d5e02e5.png
new file mode 100644
index 0000000..9fc0ec9
Binary files /dev/null and b/doc/html/_images/math/1843694724c1e6709cb3bdb81bc4f0c40d5e02e5.png differ
diff --git a/doc/html/_images/math/188c175aac0a8a9c22499336711b5d7256407254.png b/doc/html/_images/math/188c175aac0a8a9c22499336711b5d7256407254.png
new file mode 100644
index 0000000..2776aa5
Binary files /dev/null and b/doc/html/_images/math/188c175aac0a8a9c22499336711b5d7256407254.png differ
diff --git a/doc/html/_images/math/18ae0cad4f637a940f0867ed9ca4b9339e97ac4a.png b/doc/html/_images/math/18ae0cad4f637a940f0867ed9ca4b9339e97ac4a.png
new file mode 100644
index 0000000..3fadb89
Binary files /dev/null and b/doc/html/_images/math/18ae0cad4f637a940f0867ed9ca4b9339e97ac4a.png differ
diff --git a/doc/html/_images/math/198ab32e382c82002570f58df80b131d525f6bfd.png b/doc/html/_images/math/198ab32e382c82002570f58df80b131d525f6bfd.png
new file mode 100644
index 0000000..043e86c
Binary files /dev/null and b/doc/html/_images/math/198ab32e382c82002570f58df80b131d525f6bfd.png differ
diff --git a/doc/html/_images/math/19d5e95284caffb6f2733b629de62c45786b2764.png b/doc/html/_images/math/19d5e95284caffb6f2733b629de62c45786b2764.png
new file mode 100644
index 0000000..8147d6d
Binary files /dev/null and b/doc/html/_images/math/19d5e95284caffb6f2733b629de62c45786b2764.png differ
diff --git a/doc/html/_images/math/1a6d47f6a30b97355a4f98e1d0a9b292e6d6caf8.png b/doc/html/_images/math/1a6d47f6a30b97355a4f98e1d0a9b292e6d6caf8.png
new file mode 100644
index 0000000..16613bc
Binary files /dev/null and b/doc/html/_images/math/1a6d47f6a30b97355a4f98e1d0a9b292e6d6caf8.png differ
diff --git a/doc/html/_images/math/1b8a3c06cc528168dac3a025fa7dc1c70e528a1e.png b/doc/html/_images/math/1b8a3c06cc528168dac3a025fa7dc1c70e528a1e.png
new file mode 100644
index 0000000..622fe3d
Binary files /dev/null and b/doc/html/_images/math/1b8a3c06cc528168dac3a025fa7dc1c70e528a1e.png differ
diff --git a/doc/html/_images/math/1babc743714fba131456bbe2234d595634fb5812.png b/doc/html/_images/math/1babc743714fba131456bbe2234d595634fb5812.png
new file mode 100644
index 0000000..9b702fa
Binary files /dev/null and b/doc/html/_images/math/1babc743714fba131456bbe2234d595634fb5812.png differ
diff --git a/doc/html/_images/math/1beb2d429fd60d4494135aa7af1b4fe324dc8d3d.png b/doc/html/_images/math/1beb2d429fd60d4494135aa7af1b4fe324dc8d3d.png
new file mode 100644
index 0000000..4bd8e6d
Binary files /dev/null and b/doc/html/_images/math/1beb2d429fd60d4494135aa7af1b4fe324dc8d3d.png differ
diff --git a/doc/html/_images/math/1c14caa1473d005003d6d7a8cf2f5260735eede2.png b/doc/html/_images/math/1c14caa1473d005003d6d7a8cf2f5260735eede2.png
new file mode 100644
index 0000000..5016fa0
Binary files /dev/null and b/doc/html/_images/math/1c14caa1473d005003d6d7a8cf2f5260735eede2.png differ
diff --git a/doc/html/_images/math/1c2c566872b99f46e83caa352f7645417b861cec.png b/doc/html/_images/math/1c2c566872b99f46e83caa352f7645417b861cec.png
new file mode 100644
index 0000000..7f1b096
Binary files /dev/null and b/doc/html/_images/math/1c2c566872b99f46e83caa352f7645417b861cec.png differ
diff --git a/doc/html/_images/math/1ce727dbb34aac3cac16a081fdd1bca4be4c0662.png b/doc/html/_images/math/1ce727dbb34aac3cac16a081fdd1bca4be4c0662.png
new file mode 100644
index 0000000..5eeda22
Binary files /dev/null and b/doc/html/_images/math/1ce727dbb34aac3cac16a081fdd1bca4be4c0662.png differ
diff --git a/doc/html/_images/math/1e14a62291a70962b57d6b268d20d00056346d3c.png b/doc/html/_images/math/1e14a62291a70962b57d6b268d20d00056346d3c.png
new file mode 100644
index 0000000..0efb32e
Binary files /dev/null and b/doc/html/_images/math/1e14a62291a70962b57d6b268d20d00056346d3c.png differ
diff --git a/doc/html/_images/math/1f00e3f9a85af83df8dbb9267e41d53b18be6801.png b/doc/html/_images/math/1f00e3f9a85af83df8dbb9267e41d53b18be6801.png
new file mode 100644
index 0000000..0989a3a
Binary files /dev/null and b/doc/html/_images/math/1f00e3f9a85af83df8dbb9267e41d53b18be6801.png differ
diff --git a/doc/html/_images/math/20f03cf3a222b762a907e9172086fa7aa9e283b3.png b/doc/html/_images/math/20f03cf3a222b762a907e9172086fa7aa9e283b3.png
new file mode 100644
index 0000000..e43f378
Binary files /dev/null and b/doc/html/_images/math/20f03cf3a222b762a907e9172086fa7aa9e283b3.png differ
diff --git a/doc/html/_images/math/21e56698fba40d0ef90a50ff5eac3239f56c6dc6.png b/doc/html/_images/math/21e56698fba40d0ef90a50ff5eac3239f56c6dc6.png
new file mode 100644
index 0000000..6e534e8
Binary files /dev/null and b/doc/html/_images/math/21e56698fba40d0ef90a50ff5eac3239f56c6dc6.png differ
diff --git a/doc/html/_images/math/224ac4b02649eeb43b4743cc553d4d9f6651a86d.png b/doc/html/_images/math/224ac4b02649eeb43b4743cc553d4d9f6651a86d.png
new file mode 100644
index 0000000..890fe88
Binary files /dev/null and b/doc/html/_images/math/224ac4b02649eeb43b4743cc553d4d9f6651a86d.png differ
diff --git a/doc/html/_images/math/233b2765b8b21be343e63f23226320d0738d9706.png b/doc/html/_images/math/233b2765b8b21be343e63f23226320d0738d9706.png
new file mode 100644
index 0000000..5a84ace
Binary files /dev/null and b/doc/html/_images/math/233b2765b8b21be343e63f23226320d0738d9706.png differ
diff --git a/doc/html/_images/math/26f49cfedfe23893d865d6299ceca29dc390c53b.png b/doc/html/_images/math/26f49cfedfe23893d865d6299ceca29dc390c53b.png
new file mode 100644
index 0000000..ea98d14
Binary files /dev/null and b/doc/html/_images/math/26f49cfedfe23893d865d6299ceca29dc390c53b.png differ
diff --git a/doc/html/_images/math/28daf2d9ef7d6fc3efb953a00602ff92f0c50e8c.png b/doc/html/_images/math/28daf2d9ef7d6fc3efb953a00602ff92f0c50e8c.png
new file mode 100644
index 0000000..c72a126
Binary files /dev/null and b/doc/html/_images/math/28daf2d9ef7d6fc3efb953a00602ff92f0c50e8c.png differ
diff --git a/doc/html/_images/math/28e003020d0ae96250b302d7d779c791f183f707.png b/doc/html/_images/math/28e003020d0ae96250b302d7d779c791f183f707.png
new file mode 100644
index 0000000..aa57866
Binary files /dev/null and b/doc/html/_images/math/28e003020d0ae96250b302d7d779c791f183f707.png differ
diff --git a/doc/html/_images/math/29100cf129a9537d4dfef53eafcfd467ee7056b1.png b/doc/html/_images/math/29100cf129a9537d4dfef53eafcfd467ee7056b1.png
new file mode 100644
index 0000000..52c747d
Binary files /dev/null and b/doc/html/_images/math/29100cf129a9537d4dfef53eafcfd467ee7056b1.png differ
diff --git a/doc/html/_images/math/29c80fb76aef86553d6995b91b53d323a778d299.png b/doc/html/_images/math/29c80fb76aef86553d6995b91b53d323a778d299.png
new file mode 100644
index 0000000..b432242
Binary files /dev/null and b/doc/html/_images/math/29c80fb76aef86553d6995b91b53d323a778d299.png differ
diff --git a/doc/html/_images/math/2b2364029e2c1a65dfb62512e8f0c3ab11beb083.png b/doc/html/_images/math/2b2364029e2c1a65dfb62512e8f0c3ab11beb083.png
new file mode 100644
index 0000000..df1ad28
Binary files /dev/null and b/doc/html/_images/math/2b2364029e2c1a65dfb62512e8f0c3ab11beb083.png differ
diff --git a/doc/html/_images/math/2bcc65482aa8e15cd4c9e9f2542451fb4e971a91.png b/doc/html/_images/math/2bcc65482aa8e15cd4c9e9f2542451fb4e971a91.png
new file mode 100644
index 0000000..19123ba
Binary files /dev/null and b/doc/html/_images/math/2bcc65482aa8e15cd4c9e9f2542451fb4e971a91.png differ
diff --git a/doc/html/_images/math/2c1eb4bcd966e568a1e947d8e1b29f2c87770b90.png b/doc/html/_images/math/2c1eb4bcd966e568a1e947d8e1b29f2c87770b90.png
new file mode 100644
index 0000000..937aafe
Binary files /dev/null and b/doc/html/_images/math/2c1eb4bcd966e568a1e947d8e1b29f2c87770b90.png differ
diff --git a/doc/html/_images/math/2cdbe3f9815dc9f57e9c461fd893d70c59432ea0.png b/doc/html/_images/math/2cdbe3f9815dc9f57e9c461fd893d70c59432ea0.png
new file mode 100644
index 0000000..8c191f3
Binary files /dev/null and b/doc/html/_images/math/2cdbe3f9815dc9f57e9c461fd893d70c59432ea0.png differ
diff --git a/doc/html/_images/math/2d2ea095bd0ec381d83e7a65423f81bb8caeba6e.png b/doc/html/_images/math/2d2ea095bd0ec381d83e7a65423f81bb8caeba6e.png
new file mode 100644
index 0000000..f2efc24
Binary files /dev/null and b/doc/html/_images/math/2d2ea095bd0ec381d83e7a65423f81bb8caeba6e.png differ
diff --git a/doc/html/_images/math/2d951060c95bb45762fdb5e3de91f646ee0fe08b.png b/doc/html/_images/math/2d951060c95bb45762fdb5e3de91f646ee0fe08b.png
new file mode 100644
index 0000000..a4a2cef
Binary files /dev/null and b/doc/html/_images/math/2d951060c95bb45762fdb5e3de91f646ee0fe08b.png differ
diff --git a/doc/html/_images/math/2de38926392ba23abeac75effc66c37a5f5be5fd.png b/doc/html/_images/math/2de38926392ba23abeac75effc66c37a5f5be5fd.png
new file mode 100644
index 0000000..045b860
Binary files /dev/null and b/doc/html/_images/math/2de38926392ba23abeac75effc66c37a5f5be5fd.png differ
diff --git a/doc/html/_images/math/305efdce8b67069139cfdce108379dd0f9c13e14.png b/doc/html/_images/math/305efdce8b67069139cfdce108379dd0f9c13e14.png
new file mode 100644
index 0000000..451817f
Binary files /dev/null and b/doc/html/_images/math/305efdce8b67069139cfdce108379dd0f9c13e14.png differ
diff --git a/doc/html/_images/math/30d55b93201cf02f91a4da14845291a7bc5f2fae.png b/doc/html/_images/math/30d55b93201cf02f91a4da14845291a7bc5f2fae.png
new file mode 100644
index 0000000..ff5a171
Binary files /dev/null and b/doc/html/_images/math/30d55b93201cf02f91a4da14845291a7bc5f2fae.png differ
diff --git a/doc/html/_images/math/310ff53034c8c54d1df11297464404d37dae8616.png b/doc/html/_images/math/310ff53034c8c54d1df11297464404d37dae8616.png
new file mode 100644
index 0000000..0a2035f
Binary files /dev/null and b/doc/html/_images/math/310ff53034c8c54d1df11297464404d37dae8616.png differ
diff --git a/doc/html/_images/math/31f8cf9a37fad96d43492022e560df7d32ef2026.png b/doc/html/_images/math/31f8cf9a37fad96d43492022e560df7d32ef2026.png
new file mode 100644
index 0000000..3490596
Binary files /dev/null and b/doc/html/_images/math/31f8cf9a37fad96d43492022e560df7d32ef2026.png differ
diff --git a/doc/html/_images/math/321775dc9a96e932341dc2b5efc498827c162856.png b/doc/html/_images/math/321775dc9a96e932341dc2b5efc498827c162856.png
new file mode 100644
index 0000000..a717ba2
Binary files /dev/null and b/doc/html/_images/math/321775dc9a96e932341dc2b5efc498827c162856.png differ
diff --git a/doc/html/_images/math/33ffc60872c5747b1dd8cd93ddcf05362f0d2333.png b/doc/html/_images/math/33ffc60872c5747b1dd8cd93ddcf05362f0d2333.png
new file mode 100644
index 0000000..62c6691
Binary files /dev/null and b/doc/html/_images/math/33ffc60872c5747b1dd8cd93ddcf05362f0d2333.png differ
diff --git a/doc/html/_images/math/3494d6c050dcba63488def5cd4e3c183f1234306.png b/doc/html/_images/math/3494d6c050dcba63488def5cd4e3c183f1234306.png
new file mode 100644
index 0000000..ec3a9aa
Binary files /dev/null and b/doc/html/_images/math/3494d6c050dcba63488def5cd4e3c183f1234306.png differ
diff --git a/doc/html/_images/math/3544933a920a8ff595213b8ce5a7c34454e8c95b.png b/doc/html/_images/math/3544933a920a8ff595213b8ce5a7c34454e8c95b.png
new file mode 100644
index 0000000..fe8bd15
Binary files /dev/null and b/doc/html/_images/math/3544933a920a8ff595213b8ce5a7c34454e8c95b.png differ
diff --git a/doc/html/_images/math/35a8e2ecd7dcf9d4782ba19863364e13dd621356.png b/doc/html/_images/math/35a8e2ecd7dcf9d4782ba19863364e13dd621356.png
new file mode 100644
index 0000000..36fbfcc
Binary files /dev/null and b/doc/html/_images/math/35a8e2ecd7dcf9d4782ba19863364e13dd621356.png differ
diff --git a/doc/html/_images/math/361979f771f1b6ebc76432f1e72dc4463deab580.png b/doc/html/_images/math/361979f771f1b6ebc76432f1e72dc4463deab580.png
new file mode 100644
index 0000000..54f6a0c
Binary files /dev/null and b/doc/html/_images/math/361979f771f1b6ebc76432f1e72dc4463deab580.png differ
diff --git a/doc/html/_images/math/3639c816d82c4273a598c5d5a8040c7290c9444f.png b/doc/html/_images/math/3639c816d82c4273a598c5d5a8040c7290c9444f.png
new file mode 100644
index 0000000..666a4b5
Binary files /dev/null and b/doc/html/_images/math/3639c816d82c4273a598c5d5a8040c7290c9444f.png differ
diff --git a/doc/html/_images/math/36aca10ddac71d0dfa118b71798b39f02f0a9726.png b/doc/html/_images/math/36aca10ddac71d0dfa118b71798b39f02f0a9726.png
new file mode 100644
index 0000000..c88a8f7
Binary files /dev/null and b/doc/html/_images/math/36aca10ddac71d0dfa118b71798b39f02f0a9726.png differ
diff --git a/doc/html/_images/math/375dade287d6d8a7f17747b4bbf7b248b1df901d.png b/doc/html/_images/math/375dade287d6d8a7f17747b4bbf7b248b1df901d.png
new file mode 100644
index 0000000..f9ab735
Binary files /dev/null and b/doc/html/_images/math/375dade287d6d8a7f17747b4bbf7b248b1df901d.png differ
diff --git a/doc/html/_images/math/398c3d618b009a88e125501c25cb69118705dd92.png b/doc/html/_images/math/398c3d618b009a88e125501c25cb69118705dd92.png
new file mode 100644
index 0000000..3a68e0b
Binary files /dev/null and b/doc/html/_images/math/398c3d618b009a88e125501c25cb69118705dd92.png differ
diff --git a/doc/html/_images/math/3b344fee0435b4b969e4fefb5ccb44f50efa14f8.png b/doc/html/_images/math/3b344fee0435b4b969e4fefb5ccb44f50efa14f8.png
new file mode 100644
index 0000000..2ff6695
Binary files /dev/null and b/doc/html/_images/math/3b344fee0435b4b969e4fefb5ccb44f50efa14f8.png differ
diff --git a/doc/html/_images/math/3c8db3ccd634c824b36b6a922439b35ed2e0c84e.png b/doc/html/_images/math/3c8db3ccd634c824b36b6a922439b35ed2e0c84e.png
new file mode 100644
index 0000000..e50dc58
Binary files /dev/null and b/doc/html/_images/math/3c8db3ccd634c824b36b6a922439b35ed2e0c84e.png differ
diff --git a/doc/html/_images/math/3eb1b11cbb2adbb474beb16112fc1cc0446baade.png b/doc/html/_images/math/3eb1b11cbb2adbb474beb16112fc1cc0446baade.png
new file mode 100644
index 0000000..0fea20f
Binary files /dev/null and b/doc/html/_images/math/3eb1b11cbb2adbb474beb16112fc1cc0446baade.png differ
diff --git a/doc/html/_images/math/3eca8557203e86160952e1c0f735f7417f3285b1.png b/doc/html/_images/math/3eca8557203e86160952e1c0f735f7417f3285b1.png
new file mode 100644
index 0000000..337ef4f
Binary files /dev/null and b/doc/html/_images/math/3eca8557203e86160952e1c0f735f7417f3285b1.png differ
diff --git a/doc/html/_images/math/3edfaee3e2a41aade18b71a49c852209260e87c2.png b/doc/html/_images/math/3edfaee3e2a41aade18b71a49c852209260e87c2.png
new file mode 100644
index 0000000..5b17863
Binary files /dev/null and b/doc/html/_images/math/3edfaee3e2a41aade18b71a49c852209260e87c2.png differ
diff --git a/doc/html/_images/math/3fe72eac326113d25ef1eb961213c508f763c92a.png b/doc/html/_images/math/3fe72eac326113d25ef1eb961213c508f763c92a.png
new file mode 100644
index 0000000..3563b57
Binary files /dev/null and b/doc/html/_images/math/3fe72eac326113d25ef1eb961213c508f763c92a.png differ
diff --git a/doc/html/_images/math/40136bd3592e339b6af5c8514cf2a19d64befce6.png b/doc/html/_images/math/40136bd3592e339b6af5c8514cf2a19d64befce6.png
new file mode 100644
index 0000000..0ab9671
Binary files /dev/null and b/doc/html/_images/math/40136bd3592e339b6af5c8514cf2a19d64befce6.png differ
diff --git a/doc/html/_images/math/40927c2139d8e7ce9f9746651d5f28351835e658.png b/doc/html/_images/math/40927c2139d8e7ce9f9746651d5f28351835e658.png
new file mode 100644
index 0000000..6a4fc18
Binary files /dev/null and b/doc/html/_images/math/40927c2139d8e7ce9f9746651d5f28351835e658.png differ
diff --git a/doc/html/_images/math/413f8a8e40062a9090d9d50b88bc7b551b314c26.png b/doc/html/_images/math/413f8a8e40062a9090d9d50b88bc7b551b314c26.png
new file mode 100644
index 0000000..b7562bc
Binary files /dev/null and b/doc/html/_images/math/413f8a8e40062a9090d9d50b88bc7b551b314c26.png differ
diff --git a/doc/html/_images/math/417cf98ea074fe2be69f48ae0235eb405c1d0282.png b/doc/html/_images/math/417cf98ea074fe2be69f48ae0235eb405c1d0282.png
new file mode 100644
index 0000000..c0178a4
Binary files /dev/null and b/doc/html/_images/math/417cf98ea074fe2be69f48ae0235eb405c1d0282.png differ
diff --git a/doc/html/_images/math/4183ccded09d4e9db5fc8ffc56d52408488b005d.png b/doc/html/_images/math/4183ccded09d4e9db5fc8ffc56d52408488b005d.png
new file mode 100644
index 0000000..316d02f
Binary files /dev/null and b/doc/html/_images/math/4183ccded09d4e9db5fc8ffc56d52408488b005d.png differ
diff --git a/doc/html/_images/math/4204a71d348a21dafe10f112f5c8e7c436d34957.png b/doc/html/_images/math/4204a71d348a21dafe10f112f5c8e7c436d34957.png
new file mode 100644
index 0000000..5327488
Binary files /dev/null and b/doc/html/_images/math/4204a71d348a21dafe10f112f5c8e7c436d34957.png differ
diff --git a/doc/html/_images/math/425d86ba2f2979d75b7535c2bcf92c33ed6b285a.png b/doc/html/_images/math/425d86ba2f2979d75b7535c2bcf92c33ed6b285a.png
new file mode 100644
index 0000000..407d702
Binary files /dev/null and b/doc/html/_images/math/425d86ba2f2979d75b7535c2bcf92c33ed6b285a.png differ
diff --git a/doc/html/_images/math/42c237a9ee94ebc91e1cbec07638f3d32626b9c8.png b/doc/html/_images/math/42c237a9ee94ebc91e1cbec07638f3d32626b9c8.png
new file mode 100644
index 0000000..0401de2
Binary files /dev/null and b/doc/html/_images/math/42c237a9ee94ebc91e1cbec07638f3d32626b9c8.png differ
diff --git a/doc/html/_images/math/449cc2343a5592f974e22266e8c12d6a008c8a5e.png b/doc/html/_images/math/449cc2343a5592f974e22266e8c12d6a008c8a5e.png
new file mode 100644
index 0000000..de1b92a
Binary files /dev/null and b/doc/html/_images/math/449cc2343a5592f974e22266e8c12d6a008c8a5e.png differ
diff --git a/doc/html/_images/math/4558d1a86459cbf3f41c913dbfeb39b4d3e4c00e.png b/doc/html/_images/math/4558d1a86459cbf3f41c913dbfeb39b4d3e4c00e.png
new file mode 100644
index 0000000..dead105
Binary files /dev/null and b/doc/html/_images/math/4558d1a86459cbf3f41c913dbfeb39b4d3e4c00e.png differ
diff --git a/doc/html/_images/math/4597d4c954c896f007283312ad9225476a27cbe6.png b/doc/html/_images/math/4597d4c954c896f007283312ad9225476a27cbe6.png
new file mode 100644
index 0000000..59625d3
Binary files /dev/null and b/doc/html/_images/math/4597d4c954c896f007283312ad9225476a27cbe6.png differ
diff --git a/doc/html/_images/math/4686c6013ea687f6a5b2fb37cd87d9298c5fe5d8.png b/doc/html/_images/math/4686c6013ea687f6a5b2fb37cd87d9298c5fe5d8.png
new file mode 100644
index 0000000..15a5b0e
Binary files /dev/null and b/doc/html/_images/math/4686c6013ea687f6a5b2fb37cd87d9298c5fe5d8.png differ
diff --git a/doc/html/_images/math/47b3ae0420c52db79daf3c6b84a01b2bcc5de5a3.png b/doc/html/_images/math/47b3ae0420c52db79daf3c6b84a01b2bcc5de5a3.png
new file mode 100644
index 0000000..9273fc4
Binary files /dev/null and b/doc/html/_images/math/47b3ae0420c52db79daf3c6b84a01b2bcc5de5a3.png differ
diff --git a/doc/html/_images/math/48cec103218010fa067eea0252f644c77d7dcffd.png b/doc/html/_images/math/48cec103218010fa067eea0252f644c77d7dcffd.png
new file mode 100644
index 0000000..9c6b578
Binary files /dev/null and b/doc/html/_images/math/48cec103218010fa067eea0252f644c77d7dcffd.png differ
diff --git a/doc/html/_images/math/48f75e0b463f2fdb7fca9566cffdc439cae6967f.png b/doc/html/_images/math/48f75e0b463f2fdb7fca9566cffdc439cae6967f.png
new file mode 100644
index 0000000..9d53b57
Binary files /dev/null and b/doc/html/_images/math/48f75e0b463f2fdb7fca9566cffdc439cae6967f.png differ
diff --git a/doc/html/_images/math/48fc33825c4a21511eb640baa57e792ccb79a0d7.png b/doc/html/_images/math/48fc33825c4a21511eb640baa57e792ccb79a0d7.png
new file mode 100644
index 0000000..4b901af
Binary files /dev/null and b/doc/html/_images/math/48fc33825c4a21511eb640baa57e792ccb79a0d7.png differ
diff --git a/doc/html/_images/math/49e9bad6f3f8925a19802b447eb5f47a1351aaf3.png b/doc/html/_images/math/49e9bad6f3f8925a19802b447eb5f47a1351aaf3.png
new file mode 100644
index 0000000..49190a3
Binary files /dev/null and b/doc/html/_images/math/49e9bad6f3f8925a19802b447eb5f47a1351aaf3.png differ
diff --git a/doc/html/_images/math/4a5a1bbcc3881a422d50385a7b28ba2f8b138058.png b/doc/html/_images/math/4a5a1bbcc3881a422d50385a7b28ba2f8b138058.png
new file mode 100644
index 0000000..bec31d8
Binary files /dev/null and b/doc/html/_images/math/4a5a1bbcc3881a422d50385a7b28ba2f8b138058.png differ
diff --git a/doc/html/_images/math/4a82b599d0a030a9cabfc00f731fbc8471d90e9a.png b/doc/html/_images/math/4a82b599d0a030a9cabfc00f731fbc8471d90e9a.png
new file mode 100644
index 0000000..3a1649c
Binary files /dev/null and b/doc/html/_images/math/4a82b599d0a030a9cabfc00f731fbc8471d90e9a.png differ
diff --git a/doc/html/_images/math/4b78615a721358c983b51554b59f51f691a9494e.png b/doc/html/_images/math/4b78615a721358c983b51554b59f51f691a9494e.png
new file mode 100644
index 0000000..aed60cb
Binary files /dev/null and b/doc/html/_images/math/4b78615a721358c983b51554b59f51f691a9494e.png differ
diff --git a/doc/html/_images/math/4bcc5345587505a3531e55592670a69b99256846.png b/doc/html/_images/math/4bcc5345587505a3531e55592670a69b99256846.png
new file mode 100644
index 0000000..f59202e
Binary files /dev/null and b/doc/html/_images/math/4bcc5345587505a3531e55592670a69b99256846.png differ
diff --git a/doc/html/_images/math/4bd01d9da8529d13bb84945da2a23c92fefc4103.png b/doc/html/_images/math/4bd01d9da8529d13bb84945da2a23c92fefc4103.png
new file mode 100644
index 0000000..5232416
Binary files /dev/null and b/doc/html/_images/math/4bd01d9da8529d13bb84945da2a23c92fefc4103.png differ
diff --git a/doc/html/_images/math/4cde26b9ef3ee30a688192516abb5c07ab89cbaa.png b/doc/html/_images/math/4cde26b9ef3ee30a688192516abb5c07ab89cbaa.png
new file mode 100644
index 0000000..59ec351
Binary files /dev/null and b/doc/html/_images/math/4cde26b9ef3ee30a688192516abb5c07ab89cbaa.png differ
diff --git a/doc/html/_images/math/4d6932bf96d15f8796e6c888eebd5315e29bc092.png b/doc/html/_images/math/4d6932bf96d15f8796e6c888eebd5315e29bc092.png
new file mode 100644
index 0000000..06fbf86
Binary files /dev/null and b/doc/html/_images/math/4d6932bf96d15f8796e6c888eebd5315e29bc092.png differ
diff --git a/doc/html/_images/math/4e08ab76044c33b5ec9ded78921ddc90d3385668.png b/doc/html/_images/math/4e08ab76044c33b5ec9ded78921ddc90d3385668.png
new file mode 100644
index 0000000..ca4bde1
Binary files /dev/null and b/doc/html/_images/math/4e08ab76044c33b5ec9ded78921ddc90d3385668.png differ
diff --git a/doc/html/_images/math/4e16b64d140d24f2c624f3ecea15c6b54e963888.png b/doc/html/_images/math/4e16b64d140d24f2c624f3ecea15c6b54e963888.png
new file mode 100644
index 0000000..b7cf431
Binary files /dev/null and b/doc/html/_images/math/4e16b64d140d24f2c624f3ecea15c6b54e963888.png differ
diff --git a/doc/html/_images/math/4ecc882685570bb0542e7bedddfdf46f42d162c6.png b/doc/html/_images/math/4ecc882685570bb0542e7bedddfdf46f42d162c6.png
new file mode 100644
index 0000000..0eb457d
Binary files /dev/null and b/doc/html/_images/math/4ecc882685570bb0542e7bedddfdf46f42d162c6.png differ
diff --git a/doc/html/_images/math/50793b5b6c2d777f66cf1b8e1671fba966b2fb3c.png b/doc/html/_images/math/50793b5b6c2d777f66cf1b8e1671fba966b2fb3c.png
new file mode 100644
index 0000000..ca465bc
Binary files /dev/null and b/doc/html/_images/math/50793b5b6c2d777f66cf1b8e1671fba966b2fb3c.png differ
diff --git a/doc/html/_images/math/508fc704035c2701c87f20328fc1dc5fb2b339cf.png b/doc/html/_images/math/508fc704035c2701c87f20328fc1dc5fb2b339cf.png
new file mode 100644
index 0000000..d2c11f1
Binary files /dev/null and b/doc/html/_images/math/508fc704035c2701c87f20328fc1dc5fb2b339cf.png differ
diff --git a/doc/html/_images/math/50cf04b9d1b2e43389af7efacd08a059a35a8766.png b/doc/html/_images/math/50cf04b9d1b2e43389af7efacd08a059a35a8766.png
new file mode 100644
index 0000000..98eae23
Binary files /dev/null and b/doc/html/_images/math/50cf04b9d1b2e43389af7efacd08a059a35a8766.png differ
diff --git a/doc/html/_images/math/50e0b32054a553f10d8a402909d4bfd04ff51197.png b/doc/html/_images/math/50e0b32054a553f10d8a402909d4bfd04ff51197.png
new file mode 100644
index 0000000..962883a
Binary files /dev/null and b/doc/html/_images/math/50e0b32054a553f10d8a402909d4bfd04ff51197.png differ
diff --git a/doc/html/_images/math/51740ecb092f1303e28a2ef073ffe22771df6fde.png b/doc/html/_images/math/51740ecb092f1303e28a2ef073ffe22771df6fde.png
new file mode 100644
index 0000000..508454f
Binary files /dev/null and b/doc/html/_images/math/51740ecb092f1303e28a2ef073ffe22771df6fde.png differ
diff --git a/doc/html/_images/math/51cdd82f300c6154550f86854c3834537fdec1e8.png b/doc/html/_images/math/51cdd82f300c6154550f86854c3834537fdec1e8.png
new file mode 100644
index 0000000..a604330
Binary files /dev/null and b/doc/html/_images/math/51cdd82f300c6154550f86854c3834537fdec1e8.png differ
diff --git a/doc/html/_images/math/52031bf68ee42296146e8a3e4f5033b6173dcf51.png b/doc/html/_images/math/52031bf68ee42296146e8a3e4f5033b6173dcf51.png
new file mode 100644
index 0000000..e9f4bbc
Binary files /dev/null and b/doc/html/_images/math/52031bf68ee42296146e8a3e4f5033b6173dcf51.png differ
diff --git a/doc/html/_images/math/5308e7e88533ca4ea02a94c0429e96337438173c.png b/doc/html/_images/math/5308e7e88533ca4ea02a94c0429e96337438173c.png
new file mode 100644
index 0000000..e2359ce
Binary files /dev/null and b/doc/html/_images/math/5308e7e88533ca4ea02a94c0429e96337438173c.png differ
diff --git a/doc/html/_images/math/55826404e30a9012f804c4eac5d19b0598af8d30.png b/doc/html/_images/math/55826404e30a9012f804c4eac5d19b0598af8d30.png
new file mode 100644
index 0000000..b1d219c
Binary files /dev/null and b/doc/html/_images/math/55826404e30a9012f804c4eac5d19b0598af8d30.png differ
diff --git a/doc/html/_images/math/562b5099bcca7182c340b5c730982e24aca78314.png b/doc/html/_images/math/562b5099bcca7182c340b5c730982e24aca78314.png
new file mode 100644
index 0000000..40d6269
Binary files /dev/null and b/doc/html/_images/math/562b5099bcca7182c340b5c730982e24aca78314.png differ
diff --git a/doc/html/_images/math/567d706970f5fafe73762cfb27d1c51c65bd49e2.png b/doc/html/_images/math/567d706970f5fafe73762cfb27d1c51c65bd49e2.png
new file mode 100644
index 0000000..e3460bc
Binary files /dev/null and b/doc/html/_images/math/567d706970f5fafe73762cfb27d1c51c65bd49e2.png differ
diff --git a/doc/html/_images/math/573f1dbd55f7a60f53088d2ebc1c19b6d9d20e29.png b/doc/html/_images/math/573f1dbd55f7a60f53088d2ebc1c19b6d9d20e29.png
new file mode 100644
index 0000000..d6c66f3
Binary files /dev/null and b/doc/html/_images/math/573f1dbd55f7a60f53088d2ebc1c19b6d9d20e29.png differ
diff --git a/doc/html/_images/math/57b5c2817ccca5f67197e2d35ede3a4bb0aeeee7.png b/doc/html/_images/math/57b5c2817ccca5f67197e2d35ede3a4bb0aeeee7.png
new file mode 100644
index 0000000..c06352f
Binary files /dev/null and b/doc/html/_images/math/57b5c2817ccca5f67197e2d35ede3a4bb0aeeee7.png differ
diff --git a/doc/html/_images/math/57e1fde7720d12084876914987a2765e33c23e13.png b/doc/html/_images/math/57e1fde7720d12084876914987a2765e33c23e13.png
new file mode 100644
index 0000000..2ce5b2b
Binary files /dev/null and b/doc/html/_images/math/57e1fde7720d12084876914987a2765e33c23e13.png differ
diff --git a/doc/html/_images/math/57f23d18fa879e51e776968c9e8ed86e6856b728.png b/doc/html/_images/math/57f23d18fa879e51e776968c9e8ed86e6856b728.png
new file mode 100644
index 0000000..610975f
Binary files /dev/null and b/doc/html/_images/math/57f23d18fa879e51e776968c9e8ed86e6856b728.png differ
diff --git a/doc/html/_images/math/59bb1e408af7fa4b18883af769320f0f79abd8b0.png b/doc/html/_images/math/59bb1e408af7fa4b18883af769320f0f79abd8b0.png
new file mode 100644
index 0000000..505ca18
Binary files /dev/null and b/doc/html/_images/math/59bb1e408af7fa4b18883af769320f0f79abd8b0.png differ
diff --git a/doc/html/_images/math/59c706ea5c074f4fd2d3fc9f17d7ac3d276dc84f.png b/doc/html/_images/math/59c706ea5c074f4fd2d3fc9f17d7ac3d276dc84f.png
new file mode 100644
index 0000000..3061db4
Binary files /dev/null and b/doc/html/_images/math/59c706ea5c074f4fd2d3fc9f17d7ac3d276dc84f.png differ
diff --git a/doc/html/_images/math/5d07fc103b7ffd76b1fef90c4c130dae17dcb379.png b/doc/html/_images/math/5d07fc103b7ffd76b1fef90c4c130dae17dcb379.png
new file mode 100644
index 0000000..258b1b5
Binary files /dev/null and b/doc/html/_images/math/5d07fc103b7ffd76b1fef90c4c130dae17dcb379.png differ
diff --git a/doc/html/_images/math/5e8d847f99a6188e8c177b540a963731cc8c4932.png b/doc/html/_images/math/5e8d847f99a6188e8c177b540a963731cc8c4932.png
new file mode 100644
index 0000000..c03f02e
Binary files /dev/null and b/doc/html/_images/math/5e8d847f99a6188e8c177b540a963731cc8c4932.png differ
diff --git a/doc/html/_images/math/60111a617c52fd240dc8ecbe5ba3c92f721041f2.png b/doc/html/_images/math/60111a617c52fd240dc8ecbe5ba3c92f721041f2.png
new file mode 100644
index 0000000..e83d4e9
Binary files /dev/null and b/doc/html/_images/math/60111a617c52fd240dc8ecbe5ba3c92f721041f2.png differ
diff --git a/doc/html/_images/math/60230b9d07628d38e7e9695d7b938de174d52a3d.png b/doc/html/_images/math/60230b9d07628d38e7e9695d7b938de174d52a3d.png
new file mode 100644
index 0000000..1df3f5e
Binary files /dev/null and b/doc/html/_images/math/60230b9d07628d38e7e9695d7b938de174d52a3d.png differ
diff --git a/doc/html/_images/math/61b1d49d589b4261653044f5426a95e3841cc3db.png b/doc/html/_images/math/61b1d49d589b4261653044f5426a95e3841cc3db.png
new file mode 100644
index 0000000..30cf4bb
Binary files /dev/null and b/doc/html/_images/math/61b1d49d589b4261653044f5426a95e3841cc3db.png differ
diff --git a/doc/html/_images/math/62427a6fca421a1163a5acdd2a4358db51fe648d.png b/doc/html/_images/math/62427a6fca421a1163a5acdd2a4358db51fe648d.png
new file mode 100644
index 0000000..67173d3
Binary files /dev/null and b/doc/html/_images/math/62427a6fca421a1163a5acdd2a4358db51fe648d.png differ
diff --git a/doc/html/_images/math/63c066dc8bf940c63186bcaf5d0bdf30a7956df9.png b/doc/html/_images/math/63c066dc8bf940c63186bcaf5d0bdf30a7956df9.png
new file mode 100644
index 0000000..0995d80
Binary files /dev/null and b/doc/html/_images/math/63c066dc8bf940c63186bcaf5d0bdf30a7956df9.png differ
diff --git a/doc/html/_images/math/64f647808deab7ef08f8e07fa9bd7fd0591e0ab5.png b/doc/html/_images/math/64f647808deab7ef08f8e07fa9bd7fd0591e0ab5.png
new file mode 100644
index 0000000..19b5a64
Binary files /dev/null and b/doc/html/_images/math/64f647808deab7ef08f8e07fa9bd7fd0591e0ab5.png differ
diff --git a/doc/html/_images/math/6769835c6d47790785cdad70118ca039d3b360a1.png b/doc/html/_images/math/6769835c6d47790785cdad70118ca039d3b360a1.png
new file mode 100644
index 0000000..1f91fbc
Binary files /dev/null and b/doc/html/_images/math/6769835c6d47790785cdad70118ca039d3b360a1.png differ
diff --git a/doc/html/_images/math/6859317dd1b439cef34131bcd4bafee8393444e0.png b/doc/html/_images/math/6859317dd1b439cef34131bcd4bafee8393444e0.png
new file mode 100644
index 0000000..850ad00
Binary files /dev/null and b/doc/html/_images/math/6859317dd1b439cef34131bcd4bafee8393444e0.png differ
diff --git a/doc/html/_images/math/685ed7a61bc090b05dc270e1096aaf697907640d.png b/doc/html/_images/math/685ed7a61bc090b05dc270e1096aaf697907640d.png
new file mode 100644
index 0000000..aa24a98
Binary files /dev/null and b/doc/html/_images/math/685ed7a61bc090b05dc270e1096aaf697907640d.png differ
diff --git a/doc/html/_images/math/693faad2f042b0565c90df7cfced16cb9413c166.png b/doc/html/_images/math/693faad2f042b0565c90df7cfced16cb9413c166.png
new file mode 100644
index 0000000..6bcd6da
Binary files /dev/null and b/doc/html/_images/math/693faad2f042b0565c90df7cfced16cb9413c166.png differ
diff --git a/doc/html/_images/math/699d472974095e5eb4fe313c1f43831127eaaf3b.png b/doc/html/_images/math/699d472974095e5eb4fe313c1f43831127eaaf3b.png
new file mode 100644
index 0000000..04bb5a9
Binary files /dev/null and b/doc/html/_images/math/699d472974095e5eb4fe313c1f43831127eaaf3b.png differ
diff --git a/doc/html/_images/math/6d30c08912d4ce82399fcafc9e108b39746be281.png b/doc/html/_images/math/6d30c08912d4ce82399fcafc9e108b39746be281.png
new file mode 100644
index 0000000..8aaa55f
Binary files /dev/null and b/doc/html/_images/math/6d30c08912d4ce82399fcafc9e108b39746be281.png differ
diff --git a/doc/html/_images/math/6d42c88506b8da39a2a23653aecbfb7c29728063.png b/doc/html/_images/math/6d42c88506b8da39a2a23653aecbfb7c29728063.png
new file mode 100644
index 0000000..c0bbb79
Binary files /dev/null and b/doc/html/_images/math/6d42c88506b8da39a2a23653aecbfb7c29728063.png differ
diff --git a/doc/html/_images/math/6dc95523d22428403e9ec3e7f37e26ea270bf4dc.png b/doc/html/_images/math/6dc95523d22428403e9ec3e7f37e26ea270bf4dc.png
new file mode 100644
index 0000000..1ad8c18
Binary files /dev/null and b/doc/html/_images/math/6dc95523d22428403e9ec3e7f37e26ea270bf4dc.png differ
diff --git a/doc/html/_images/math/6e98fc286854081ea2b9adf373df551256afff7c.png b/doc/html/_images/math/6e98fc286854081ea2b9adf373df551256afff7c.png
new file mode 100644
index 0000000..4bd8e6d
Binary files /dev/null and b/doc/html/_images/math/6e98fc286854081ea2b9adf373df551256afff7c.png differ
diff --git a/doc/html/_images/math/6fdc9fd7f741378b1513fd6a50d2beb900c205fe.png b/doc/html/_images/math/6fdc9fd7f741378b1513fd6a50d2beb900c205fe.png
new file mode 100644
index 0000000..4bfbbe0
Binary files /dev/null and b/doc/html/_images/math/6fdc9fd7f741378b1513fd6a50d2beb900c205fe.png differ
diff --git a/doc/html/_images/math/71fb275b87fc895a155092b9c7726b05dce93eab.png b/doc/html/_images/math/71fb275b87fc895a155092b9c7726b05dce93eab.png
new file mode 100644
index 0000000..ce809e9
Binary files /dev/null and b/doc/html/_images/math/71fb275b87fc895a155092b9c7726b05dce93eab.png differ
diff --git a/doc/html/_images/math/72c56dc5b07da4f7d7c4d5534c1a532b8882393e.png b/doc/html/_images/math/72c56dc5b07da4f7d7c4d5534c1a532b8882393e.png
new file mode 100644
index 0000000..bf40f41
Binary files /dev/null and b/doc/html/_images/math/72c56dc5b07da4f7d7c4d5534c1a532b8882393e.png differ
diff --git a/doc/html/_images/math/73f5e249c88b2b3068263480f576b051cb5c4f6e.png b/doc/html/_images/math/73f5e249c88b2b3068263480f576b051cb5c4f6e.png
new file mode 100644
index 0000000..12faa6b
Binary files /dev/null and b/doc/html/_images/math/73f5e249c88b2b3068263480f576b051cb5c4f6e.png differ
diff --git a/doc/html/_images/math/75c046897f0096f476a55496317bd0ef6dd1fda8.png b/doc/html/_images/math/75c046897f0096f476a55496317bd0ef6dd1fda8.png
new file mode 100644
index 0000000..334e1fc
Binary files /dev/null and b/doc/html/_images/math/75c046897f0096f476a55496317bd0ef6dd1fda8.png differ
diff --git a/doc/html/_images/math/75e27f04188974063be3230dca208cd495b77ce1.png b/doc/html/_images/math/75e27f04188974063be3230dca208cd495b77ce1.png
new file mode 100644
index 0000000..c7b0ff3
Binary files /dev/null and b/doc/html/_images/math/75e27f04188974063be3230dca208cd495b77ce1.png differ
diff --git a/doc/html/_images/math/76bacccf4cec63f756095d309f1d0625a5c79952.png b/doc/html/_images/math/76bacccf4cec63f756095d309f1d0625a5c79952.png
new file mode 100644
index 0000000..4826bbf
Binary files /dev/null and b/doc/html/_images/math/76bacccf4cec63f756095d309f1d0625a5c79952.png differ
diff --git a/doc/html/_images/math/779452dac0b743460f8ed93ee0b34d1d42657bbb.png b/doc/html/_images/math/779452dac0b743460f8ed93ee0b34d1d42657bbb.png
new file mode 100644
index 0000000..b144bb3
Binary files /dev/null and b/doc/html/_images/math/779452dac0b743460f8ed93ee0b34d1d42657bbb.png differ
diff --git a/doc/html/_images/math/77aec2862da28625ff641e3f560e157fbd895a2b.png b/doc/html/_images/math/77aec2862da28625ff641e3f560e157fbd895a2b.png
new file mode 100644
index 0000000..1063d6e
Binary files /dev/null and b/doc/html/_images/math/77aec2862da28625ff641e3f560e157fbd895a2b.png differ
diff --git a/doc/html/_images/math/77eb5b629a0ce4f734ad13638babf1ececb73c70.png b/doc/html/_images/math/77eb5b629a0ce4f734ad13638babf1ececb73c70.png
new file mode 100644
index 0000000..f0a493b
Binary files /dev/null and b/doc/html/_images/math/77eb5b629a0ce4f734ad13638babf1ececb73c70.png differ
diff --git a/doc/html/_images/math/787db56b15092dd4d749cdf10fe3d67ddd0fc985.png b/doc/html/_images/math/787db56b15092dd4d749cdf10fe3d67ddd0fc985.png
new file mode 100644
index 0000000..0ace73b
Binary files /dev/null and b/doc/html/_images/math/787db56b15092dd4d749cdf10fe3d67ddd0fc985.png differ
diff --git a/doc/html/_images/math/78b84981125b77d5fbccd78772d46452501d159a.png b/doc/html/_images/math/78b84981125b77d5fbccd78772d46452501d159a.png
new file mode 100644
index 0000000..4bd8e6d
Binary files /dev/null and b/doc/html/_images/math/78b84981125b77d5fbccd78772d46452501d159a.png differ
diff --git a/doc/html/_images/math/7949c78c45dd5977a07f55aab72d3f7d7b991f19.png b/doc/html/_images/math/7949c78c45dd5977a07f55aab72d3f7d7b991f19.png
new file mode 100644
index 0000000..8214e74
Binary files /dev/null and b/doc/html/_images/math/7949c78c45dd5977a07f55aab72d3f7d7b991f19.png differ
diff --git a/doc/html/_images/math/7aa3098b904c11d68c01bd6694f9d3e363d53b88.png b/doc/html/_images/math/7aa3098b904c11d68c01bd6694f9d3e363d53b88.png
new file mode 100644
index 0000000..bd689b7
Binary files /dev/null and b/doc/html/_images/math/7aa3098b904c11d68c01bd6694f9d3e363d53b88.png differ
diff --git a/doc/html/_images/math/7b1816c51f7d31275cd3ad400208fb7b3ce136a0.png b/doc/html/_images/math/7b1816c51f7d31275cd3ad400208fb7b3ce136a0.png
new file mode 100644
index 0000000..44fdc88
Binary files /dev/null and b/doc/html/_images/math/7b1816c51f7d31275cd3ad400208fb7b3ce136a0.png differ
diff --git a/doc/html/_images/math/7ccc306d0b1a362ea794e28e35f620ae8f3da1e5.png b/doc/html/_images/math/7ccc306d0b1a362ea794e28e35f620ae8f3da1e5.png
new file mode 100644
index 0000000..ac859cb
Binary files /dev/null and b/doc/html/_images/math/7ccc306d0b1a362ea794e28e35f620ae8f3da1e5.png differ
diff --git a/doc/html/_images/math/7da70b3b7d88430e05c47da4f78f6da83ee974b9.png b/doc/html/_images/math/7da70b3b7d88430e05c47da4f78f6da83ee974b9.png
new file mode 100644
index 0000000..c6f26b2
Binary files /dev/null and b/doc/html/_images/math/7da70b3b7d88430e05c47da4f78f6da83ee974b9.png differ
diff --git a/doc/html/_images/math/7dc222c37caf762ab8bae6587603cc12a151bb17.png b/doc/html/_images/math/7dc222c37caf762ab8bae6587603cc12a151bb17.png
new file mode 100644
index 0000000..5d031d9
Binary files /dev/null and b/doc/html/_images/math/7dc222c37caf762ab8bae6587603cc12a151bb17.png differ
diff --git a/doc/html/_images/math/7decdbe004c7b85da96241226ca9f150731c9365.png b/doc/html/_images/math/7decdbe004c7b85da96241226ca9f150731c9365.png
new file mode 100644
index 0000000..af9ccb0
Binary files /dev/null and b/doc/html/_images/math/7decdbe004c7b85da96241226ca9f150731c9365.png differ
diff --git a/doc/html/_images/math/7fb876996f317119f4a67c585344c9d153432a9b.png b/doc/html/_images/math/7fb876996f317119f4a67c585344c9d153432a9b.png
new file mode 100644
index 0000000..85e4a21
Binary files /dev/null and b/doc/html/_images/math/7fb876996f317119f4a67c585344c9d153432a9b.png differ
diff --git a/doc/html/_images/math/80027ab1c7a3a805fc9f6de9c84d42a3e5fa0073.png b/doc/html/_images/math/80027ab1c7a3a805fc9f6de9c84d42a3e5fa0073.png
new file mode 100644
index 0000000..65630e2
Binary files /dev/null and b/doc/html/_images/math/80027ab1c7a3a805fc9f6de9c84d42a3e5fa0073.png differ
diff --git a/doc/html/_images/math/8005301c57dbcd3f8754173aaa142f457c62467a.png b/doc/html/_images/math/8005301c57dbcd3f8754173aaa142f457c62467a.png
new file mode 100644
index 0000000..90a261e
Binary files /dev/null and b/doc/html/_images/math/8005301c57dbcd3f8754173aaa142f457c62467a.png differ
diff --git a/doc/html/_images/math/80bee4e7ca18b9e178cbe36de0a963d928f0dd7a.png b/doc/html/_images/math/80bee4e7ca18b9e178cbe36de0a963d928f0dd7a.png
new file mode 100644
index 0000000..5b17863
Binary files /dev/null and b/doc/html/_images/math/80bee4e7ca18b9e178cbe36de0a963d928f0dd7a.png differ
diff --git a/doc/html/_images/math/80f4968bb0812d8fd7b7d0d6168a86820b0a7ec7.png b/doc/html/_images/math/80f4968bb0812d8fd7b7d0d6168a86820b0a7ec7.png
new file mode 100644
index 0000000..e3340eb
Binary files /dev/null and b/doc/html/_images/math/80f4968bb0812d8fd7b7d0d6168a86820b0a7ec7.png differ
diff --git a/doc/html/_images/math/80f8ee73e5a62640aeb2442e3f5c66a1de7a5518.png b/doc/html/_images/math/80f8ee73e5a62640aeb2442e3f5c66a1de7a5518.png
new file mode 100644
index 0000000..a4563c9
Binary files /dev/null and b/doc/html/_images/math/80f8ee73e5a62640aeb2442e3f5c66a1de7a5518.png differ
diff --git a/doc/html/_images/math/81724a45ae0ea76d9390da91f126e17e9ddf2cc7.png b/doc/html/_images/math/81724a45ae0ea76d9390da91f126e17e9ddf2cc7.png
new file mode 100644
index 0000000..b496c6d
Binary files /dev/null and b/doc/html/_images/math/81724a45ae0ea76d9390da91f126e17e9ddf2cc7.png differ
diff --git a/doc/html/_images/math/830aa83ce734c51e198b4204591c7e5c58d40fcc.png b/doc/html/_images/math/830aa83ce734c51e198b4204591c7e5c58d40fcc.png
new file mode 100644
index 0000000..5474297
Binary files /dev/null and b/doc/html/_images/math/830aa83ce734c51e198b4204591c7e5c58d40fcc.png differ
diff --git a/doc/html/_images/math/83956e92fcc80dee17fce864543216939a3c9da7.png b/doc/html/_images/math/83956e92fcc80dee17fce864543216939a3c9da7.png
new file mode 100644
index 0000000..ae0bb8a
Binary files /dev/null and b/doc/html/_images/math/83956e92fcc80dee17fce864543216939a3c9da7.png differ
diff --git a/doc/html/_images/math/84d7271dd9e78c1e05d6c3c6ecb60309ef7dfc73.png b/doc/html/_images/math/84d7271dd9e78c1e05d6c3c6ecb60309ef7dfc73.png
new file mode 100644
index 0000000..697d355
Binary files /dev/null and b/doc/html/_images/math/84d7271dd9e78c1e05d6c3c6ecb60309ef7dfc73.png differ
diff --git a/doc/html/_images/math/852a6f372bdee813bd247643f7c2c114cfcce21a.png b/doc/html/_images/math/852a6f372bdee813bd247643f7c2c114cfcce21a.png
new file mode 100644
index 0000000..1a48f0c
Binary files /dev/null and b/doc/html/_images/math/852a6f372bdee813bd247643f7c2c114cfcce21a.png differ
diff --git a/doc/html/_images/math/8659700e6646cd91bc02c32affaa5ec046ee9935.png b/doc/html/_images/math/8659700e6646cd91bc02c32affaa5ec046ee9935.png
new file mode 100644
index 0000000..6693ed2
Binary files /dev/null and b/doc/html/_images/math/8659700e6646cd91bc02c32affaa5ec046ee9935.png differ
diff --git a/doc/html/_images/math/8695ed280e712cc4490c3e60810b4c6b6881cd1e.png b/doc/html/_images/math/8695ed280e712cc4490c3e60810b4c6b6881cd1e.png
new file mode 100644
index 0000000..a03c425
Binary files /dev/null and b/doc/html/_images/math/8695ed280e712cc4490c3e60810b4c6b6881cd1e.png differ
diff --git a/doc/html/_images/math/87202d921ebebf9a42f0d17a9823a59ee3f5c83c.png b/doc/html/_images/math/87202d921ebebf9a42f0d17a9823a59ee3f5c83c.png
new file mode 100644
index 0000000..d48c208
Binary files /dev/null and b/doc/html/_images/math/87202d921ebebf9a42f0d17a9823a59ee3f5c83c.png differ
diff --git a/doc/html/_images/math/878c3440b3937563378692ea68e4a8915a548704.png b/doc/html/_images/math/878c3440b3937563378692ea68e4a8915a548704.png
new file mode 100644
index 0000000..a8b05cd
Binary files /dev/null and b/doc/html/_images/math/878c3440b3937563378692ea68e4a8915a548704.png differ
diff --git a/doc/html/_images/math/87c716e048b6466c0459d609f9ca1d12c92df084.png b/doc/html/_images/math/87c716e048b6466c0459d609f9ca1d12c92df084.png
new file mode 100644
index 0000000..a1f2191
Binary files /dev/null and b/doc/html/_images/math/87c716e048b6466c0459d609f9ca1d12c92df084.png differ
diff --git a/doc/html/_images/math/87da707293d2f36ee9c5e0026ac69dfbe0722a1f.png b/doc/html/_images/math/87da707293d2f36ee9c5e0026ac69dfbe0722a1f.png
new file mode 100644
index 0000000..8afe9d0
Binary files /dev/null and b/doc/html/_images/math/87da707293d2f36ee9c5e0026ac69dfbe0722a1f.png differ
diff --git a/doc/html/_images/math/8823f1b861429c99f6495d784260f4b06544df26.png b/doc/html/_images/math/8823f1b861429c99f6495d784260f4b06544df26.png
new file mode 100644
index 0000000..c0cab37
Binary files /dev/null and b/doc/html/_images/math/8823f1b861429c99f6495d784260f4b06544df26.png differ
diff --git a/doc/html/_images/math/8867a6f23bdc90d9850c212da3b1f6c85da9cfa9.png b/doc/html/_images/math/8867a6f23bdc90d9850c212da3b1f6c85da9cfa9.png
new file mode 100644
index 0000000..9b9ebe1
Binary files /dev/null and b/doc/html/_images/math/8867a6f23bdc90d9850c212da3b1f6c85da9cfa9.png differ
diff --git a/doc/html/_images/math/8ae3de0b7f36ecd8ce55762fd04636f2d562ec4a.png b/doc/html/_images/math/8ae3de0b7f36ecd8ce55762fd04636f2d562ec4a.png
new file mode 100644
index 0000000..1011804
Binary files /dev/null and b/doc/html/_images/math/8ae3de0b7f36ecd8ce55762fd04636f2d562ec4a.png differ
diff --git a/doc/html/_images/math/8c805be7cd7c66579717675a5f59630263eb7b0e.png b/doc/html/_images/math/8c805be7cd7c66579717675a5f59630263eb7b0e.png
new file mode 100644
index 0000000..7f0e726
Binary files /dev/null and b/doc/html/_images/math/8c805be7cd7c66579717675a5f59630263eb7b0e.png differ
diff --git a/doc/html/_images/math/8ccf00431f4274015c9bc2048bc21b7d8b01a1d6.png b/doc/html/_images/math/8ccf00431f4274015c9bc2048bc21b7d8b01a1d6.png
new file mode 100644
index 0000000..2b35c4e
Binary files /dev/null and b/doc/html/_images/math/8ccf00431f4274015c9bc2048bc21b7d8b01a1d6.png differ
diff --git a/doc/html/_images/math/8ced9967cf5ac8a7dfe5907f92559a67567f9fd1.png b/doc/html/_images/math/8ced9967cf5ac8a7dfe5907f92559a67567f9fd1.png
new file mode 100644
index 0000000..53addc0
Binary files /dev/null and b/doc/html/_images/math/8ced9967cf5ac8a7dfe5907f92559a67567f9fd1.png differ
diff --git a/doc/html/_images/math/8cf728804c10fea4c1a4a50e39ae56823d3117fd.png b/doc/html/_images/math/8cf728804c10fea4c1a4a50e39ae56823d3117fd.png
new file mode 100644
index 0000000..385c9e9
Binary files /dev/null and b/doc/html/_images/math/8cf728804c10fea4c1a4a50e39ae56823d3117fd.png differ
diff --git a/doc/html/_images/math/8dd73eec3308cda7fab4013f76bc74e4ead2be0d.png b/doc/html/_images/math/8dd73eec3308cda7fab4013f76bc74e4ead2be0d.png
new file mode 100644
index 0000000..c38f278
Binary files /dev/null and b/doc/html/_images/math/8dd73eec3308cda7fab4013f76bc74e4ead2be0d.png differ
diff --git a/doc/html/_images/math/8e474a33274085c7c884dba1c98a91ef2c13ebfa.png b/doc/html/_images/math/8e474a33274085c7c884dba1c98a91ef2c13ebfa.png
new file mode 100644
index 0000000..0980329
Binary files /dev/null and b/doc/html/_images/math/8e474a33274085c7c884dba1c98a91ef2c13ebfa.png differ
diff --git a/doc/html/_images/math/8eda42f47290c234d1bff18ec887dcf1078a45ba.png b/doc/html/_images/math/8eda42f47290c234d1bff18ec887dcf1078a45ba.png
new file mode 100644
index 0000000..acfd855
Binary files /dev/null and b/doc/html/_images/math/8eda42f47290c234d1bff18ec887dcf1078a45ba.png differ
diff --git a/doc/html/_images/math/8f2359ded4ff57243e264242d0f12aa98be5666b.png b/doc/html/_images/math/8f2359ded4ff57243e264242d0f12aa98be5666b.png
new file mode 100644
index 0000000..3d47361
Binary files /dev/null and b/doc/html/_images/math/8f2359ded4ff57243e264242d0f12aa98be5666b.png differ
diff --git a/doc/html/_images/math/9169b2404d0208a7b57d7957672810ac001b0ead.png b/doc/html/_images/math/9169b2404d0208a7b57d7957672810ac001b0ead.png
new file mode 100644
index 0000000..8c48b26
Binary files /dev/null and b/doc/html/_images/math/9169b2404d0208a7b57d7957672810ac001b0ead.png differ
diff --git a/doc/html/_images/math/92c25fa25f006cdfe8ef28f3d3141e558aaac740.png b/doc/html/_images/math/92c25fa25f006cdfe8ef28f3d3141e558aaac740.png
new file mode 100644
index 0000000..ae10ce9
Binary files /dev/null and b/doc/html/_images/math/92c25fa25f006cdfe8ef28f3d3141e558aaac740.png differ
diff --git a/doc/html/_images/math/92d23ba3d0cf03e961e3c70407948e15a3239435.png b/doc/html/_images/math/92d23ba3d0cf03e961e3c70407948e15a3239435.png
new file mode 100644
index 0000000..58b9b52
Binary files /dev/null and b/doc/html/_images/math/92d23ba3d0cf03e961e3c70407948e15a3239435.png differ
diff --git a/doc/html/_images/math/93876b6d08a3f850d1f4aba28cd41ca97d66880a.png b/doc/html/_images/math/93876b6d08a3f850d1f4aba28cd41ca97d66880a.png
new file mode 100644
index 0000000..5be0507
Binary files /dev/null and b/doc/html/_images/math/93876b6d08a3f850d1f4aba28cd41ca97d66880a.png differ
diff --git a/doc/html/_images/math/939a9dbe9eed7a3842b6d7eacd5621587127ef00.png b/doc/html/_images/math/939a9dbe9eed7a3842b6d7eacd5621587127ef00.png
new file mode 100644
index 0000000..a4a6462
Binary files /dev/null and b/doc/html/_images/math/939a9dbe9eed7a3842b6d7eacd5621587127ef00.png differ
diff --git a/doc/html/_images/math/95b533418f20fc19e5a7c52bd3e324ce5cd4a652.png b/doc/html/_images/math/95b533418f20fc19e5a7c52bd3e324ce5cd4a652.png
new file mode 100644
index 0000000..2f876e5
Binary files /dev/null and b/doc/html/_images/math/95b533418f20fc19e5a7c52bd3e324ce5cd4a652.png differ
diff --git a/doc/html/_images/math/95c816a6adaedb425dfaa2baa4162ad150db679d.png b/doc/html/_images/math/95c816a6adaedb425dfaa2baa4162ad150db679d.png
new file mode 100644
index 0000000..1b240a8
Binary files /dev/null and b/doc/html/_images/math/95c816a6adaedb425dfaa2baa4162ad150db679d.png differ
diff --git a/doc/html/_images/math/95eb42a74083f3034ef47412f7b8b9c91f4292b5.png b/doc/html/_images/math/95eb42a74083f3034ef47412f7b8b9c91f4292b5.png
new file mode 100644
index 0000000..5b64d6b
Binary files /dev/null and b/doc/html/_images/math/95eb42a74083f3034ef47412f7b8b9c91f4292b5.png differ
diff --git a/doc/html/_images/math/9812a102ddba49461ec38204d13a46cc35d13ec5.png b/doc/html/_images/math/9812a102ddba49461ec38204d13a46cc35d13ec5.png
new file mode 100644
index 0000000..3e4ac9e
Binary files /dev/null and b/doc/html/_images/math/9812a102ddba49461ec38204d13a46cc35d13ec5.png differ
diff --git a/doc/html/_images/math/9933c894ca1816b4c192bb1e05f3ca0235b700cc.png b/doc/html/_images/math/9933c894ca1816b4c192bb1e05f3ca0235b700cc.png
new file mode 100644
index 0000000..fb7f75e
Binary files /dev/null and b/doc/html/_images/math/9933c894ca1816b4c192bb1e05f3ca0235b700cc.png differ
diff --git a/doc/html/_images/math/9d86170e7de539c0ff999de09621ee0c7b6c8ed0.png b/doc/html/_images/math/9d86170e7de539c0ff999de09621ee0c7b6c8ed0.png
new file mode 100644
index 0000000..007a6ab
Binary files /dev/null and b/doc/html/_images/math/9d86170e7de539c0ff999de09621ee0c7b6c8ed0.png differ
diff --git a/doc/html/_images/math/9db05ed7f916830e24071ea1ac13f9200438f256.png b/doc/html/_images/math/9db05ed7f916830e24071ea1ac13f9200438f256.png
new file mode 100644
index 0000000..e689358
Binary files /dev/null and b/doc/html/_images/math/9db05ed7f916830e24071ea1ac13f9200438f256.png differ
diff --git a/doc/html/_images/math/9dfa31437b58c0473299320aa638151cd88cf61b.png b/doc/html/_images/math/9dfa31437b58c0473299320aa638151cd88cf61b.png
new file mode 100644
index 0000000..c46bd5f
Binary files /dev/null and b/doc/html/_images/math/9dfa31437b58c0473299320aa638151cd88cf61b.png differ
diff --git a/doc/html/_images/math/9e3f7a73ad343d876522dc29fa778c661cd0bc73.png b/doc/html/_images/math/9e3f7a73ad343d876522dc29fa778c661cd0bc73.png
new file mode 100644
index 0000000..5daa1f4
Binary files /dev/null and b/doc/html/_images/math/9e3f7a73ad343d876522dc29fa778c661cd0bc73.png differ
diff --git a/doc/html/_images/math/9e64d39bc789763f5e7b0226e4e577d6701be82d.png b/doc/html/_images/math/9e64d39bc789763f5e7b0226e4e577d6701be82d.png
new file mode 100644
index 0000000..ebf14d0
Binary files /dev/null and b/doc/html/_images/math/9e64d39bc789763f5e7b0226e4e577d6701be82d.png differ
diff --git a/doc/html/_images/math/9f7ae16df27305a288220a25c67fec281582a178.png b/doc/html/_images/math/9f7ae16df27305a288220a25c67fec281582a178.png
new file mode 100644
index 0000000..575d205
Binary files /dev/null and b/doc/html/_images/math/9f7ae16df27305a288220a25c67fec281582a178.png differ
diff --git a/doc/html/_images/math/a0386a36f70af7ebf114810dc9670c273b60092e.png b/doc/html/_images/math/a0386a36f70af7ebf114810dc9670c273b60092e.png
new file mode 100644
index 0000000..4875eb8
Binary files /dev/null and b/doc/html/_images/math/a0386a36f70af7ebf114810dc9670c273b60092e.png differ
diff --git a/doc/html/_images/math/a185258fa2bb48f87e585228395f07c3864a5ee7.png b/doc/html/_images/math/a185258fa2bb48f87e585228395f07c3864a5ee7.png
new file mode 100644
index 0000000..daeb168
Binary files /dev/null and b/doc/html/_images/math/a185258fa2bb48f87e585228395f07c3864a5ee7.png differ
diff --git a/doc/html/_images/math/a18a2efee809525e5d5e2b90234d90492605910b.png b/doc/html/_images/math/a18a2efee809525e5d5e2b90234d90492605910b.png
new file mode 100644
index 0000000..1390400
Binary files /dev/null and b/doc/html/_images/math/a18a2efee809525e5d5e2b90234d90492605910b.png differ
diff --git a/doc/html/_images/math/a1bc13b30be9e9dfe869a53a7765a333f0a7d3b5.png b/doc/html/_images/math/a1bc13b30be9e9dfe869a53a7765a333f0a7d3b5.png
new file mode 100644
index 0000000..4bd8e6d
Binary files /dev/null and b/doc/html/_images/math/a1bc13b30be9e9dfe869a53a7765a333f0a7d3b5.png differ
diff --git a/doc/html/_images/math/a263cf4c66f239a6fc0fb13bdd3c5233766186ae.png b/doc/html/_images/math/a263cf4c66f239a6fc0fb13bdd3c5233766186ae.png
new file mode 100644
index 0000000..9037397
Binary files /dev/null and b/doc/html/_images/math/a263cf4c66f239a6fc0fb13bdd3c5233766186ae.png differ
diff --git a/doc/html/_images/math/a47ccc33ac0f8662ee27020d71ec5bca4b6218bc.png b/doc/html/_images/math/a47ccc33ac0f8662ee27020d71ec5bca4b6218bc.png
new file mode 100644
index 0000000..a1cd7c4
Binary files /dev/null and b/doc/html/_images/math/a47ccc33ac0f8662ee27020d71ec5bca4b6218bc.png differ
diff --git a/doc/html/_images/math/a54708fe7e95067497dd42cdf40c2b0c8023b956.png b/doc/html/_images/math/a54708fe7e95067497dd42cdf40c2b0c8023b956.png
new file mode 100644
index 0000000..81a8ef7
Binary files /dev/null and b/doc/html/_images/math/a54708fe7e95067497dd42cdf40c2b0c8023b956.png differ
diff --git a/doc/html/_images/math/a561f265b36883ab4d6de8f9669351888a2373ed.png b/doc/html/_images/math/a561f265b36883ab4d6de8f9669351888a2373ed.png
new file mode 100644
index 0000000..fa761af
Binary files /dev/null and b/doc/html/_images/math/a561f265b36883ab4d6de8f9669351888a2373ed.png differ
diff --git a/doc/html/_images/math/a5d6a9ffacc01b68b780618818cbd90474466cc9.png b/doc/html/_images/math/a5d6a9ffacc01b68b780618818cbd90474466cc9.png
new file mode 100644
index 0000000..7511535
Binary files /dev/null and b/doc/html/_images/math/a5d6a9ffacc01b68b780618818cbd90474466cc9.png differ
diff --git a/doc/html/_images/math/a6a7e011236d9329c082e3494416f1d23d431080.png b/doc/html/_images/math/a6a7e011236d9329c082e3494416f1d23d431080.png
new file mode 100644
index 0000000..812341f
Binary files /dev/null and b/doc/html/_images/math/a6a7e011236d9329c082e3494416f1d23d431080.png differ
diff --git a/doc/html/_images/math/a716012e7386039e71ab4fed061d9ae7bb567ab8.png b/doc/html/_images/math/a716012e7386039e71ab4fed061d9ae7bb567ab8.png
new file mode 100644
index 0000000..f9a433e
Binary files /dev/null and b/doc/html/_images/math/a716012e7386039e71ab4fed061d9ae7bb567ab8.png differ
diff --git a/doc/html/_images/math/a7e20a9e22ab40126649b8601c14c0c53625c1a5.png b/doc/html/_images/math/a7e20a9e22ab40126649b8601c14c0c53625c1a5.png
new file mode 100644
index 0000000..ffd95dd
Binary files /dev/null and b/doc/html/_images/math/a7e20a9e22ab40126649b8601c14c0c53625c1a5.png differ
diff --git a/doc/html/_images/math/a8f6a1645b0da6b1a3e4d25495e7f11d48508cf8.png b/doc/html/_images/math/a8f6a1645b0da6b1a3e4d25495e7f11d48508cf8.png
new file mode 100644
index 0000000..2613b2d
Binary files /dev/null and b/doc/html/_images/math/a8f6a1645b0da6b1a3e4d25495e7f11d48508cf8.png differ
diff --git a/doc/html/_images/math/aa47517e24a51fb89da8cd0899238d4758406d33.png b/doc/html/_images/math/aa47517e24a51fb89da8cd0899238d4758406d33.png
new file mode 100644
index 0000000..641a608
Binary files /dev/null and b/doc/html/_images/math/aa47517e24a51fb89da8cd0899238d4758406d33.png differ
diff --git a/doc/html/_images/math/aa6d78ef03e72bc807167e84142a6f9cf0e6860d.png b/doc/html/_images/math/aa6d78ef03e72bc807167e84142a6f9cf0e6860d.png
new file mode 100644
index 0000000..a717ba2
Binary files /dev/null and b/doc/html/_images/math/aa6d78ef03e72bc807167e84142a6f9cf0e6860d.png differ
diff --git a/doc/html/_images/math/aad007aad36276e84b88349a62e466b615cc30e4.png b/doc/html/_images/math/aad007aad36276e84b88349a62e466b615cc30e4.png
new file mode 100644
index 0000000..9b9ebe1
Binary files /dev/null and b/doc/html/_images/math/aad007aad36276e84b88349a62e466b615cc30e4.png differ
diff --git a/doc/html/_images/math/abf754938d86994e8b9cd5ed7c22814cdd8265a3.png b/doc/html/_images/math/abf754938d86994e8b9cd5ed7c22814cdd8265a3.png
new file mode 100644
index 0000000..adfb9ed
Binary files /dev/null and b/doc/html/_images/math/abf754938d86994e8b9cd5ed7c22814cdd8265a3.png differ
diff --git a/doc/html/_images/math/b018f9153661cd702305aecc28713fd9705e7cb3.png b/doc/html/_images/math/b018f9153661cd702305aecc28713fd9705e7cb3.png
new file mode 100644
index 0000000..25812ff
Binary files /dev/null and b/doc/html/_images/math/b018f9153661cd702305aecc28713fd9705e7cb3.png differ
diff --git a/doc/html/_images/math/b124ff74afb0914bb434e8fb849eb56d734412f8.png b/doc/html/_images/math/b124ff74afb0914bb434e8fb849eb56d734412f8.png
new file mode 100644
index 0000000..28dd7de
Binary files /dev/null and b/doc/html/_images/math/b124ff74afb0914bb434e8fb849eb56d734412f8.png differ
diff --git a/doc/html/_images/math/b3263c15725476b4815cfd68a2a0fa73286d58de.png b/doc/html/_images/math/b3263c15725476b4815cfd68a2a0fa73286d58de.png
new file mode 100644
index 0000000..539c58f
Binary files /dev/null and b/doc/html/_images/math/b3263c15725476b4815cfd68a2a0fa73286d58de.png differ
diff --git a/doc/html/_images/math/b4185883f66070faa34444043851101bf3e4e072.png b/doc/html/_images/math/b4185883f66070faa34444043851101bf3e4e072.png
new file mode 100644
index 0000000..206f7fa
Binary files /dev/null and b/doc/html/_images/math/b4185883f66070faa34444043851101bf3e4e072.png differ
diff --git a/doc/html/_images/math/b4b77eb87eaf7b5cec38b838667240420953bf95.png b/doc/html/_images/math/b4b77eb87eaf7b5cec38b838667240420953bf95.png
new file mode 100644
index 0000000..4000a52
Binary files /dev/null and b/doc/html/_images/math/b4b77eb87eaf7b5cec38b838667240420953bf95.png differ
diff --git a/doc/html/_images/math/b57b6b6bf761902ccdea737725a89486be6e32d0.png b/doc/html/_images/math/b57b6b6bf761902ccdea737725a89486be6e32d0.png
new file mode 100644
index 0000000..d24e2c6
Binary files /dev/null and b/doc/html/_images/math/b57b6b6bf761902ccdea737725a89486be6e32d0.png differ
diff --git a/doc/html/_images/math/b5ddd66f365b65ac1d67353904f48cd161730514.png b/doc/html/_images/math/b5ddd66f365b65ac1d67353904f48cd161730514.png
new file mode 100644
index 0000000..16f91f6
Binary files /dev/null and b/doc/html/_images/math/b5ddd66f365b65ac1d67353904f48cd161730514.png differ
diff --git a/doc/html/_images/math/b6afb9cb106e21d5944296c61fa1e7161e2f6c69.png b/doc/html/_images/math/b6afb9cb106e21d5944296c61fa1e7161e2f6c69.png
new file mode 100644
index 0000000..8ec4910
Binary files /dev/null and b/doc/html/_images/math/b6afb9cb106e21d5944296c61fa1e7161e2f6c69.png differ
diff --git a/doc/html/_images/math/b810258d7f5a5470ef5ee8adda6b7a3957875e70.png b/doc/html/_images/math/b810258d7f5a5470ef5ee8adda6b7a3957875e70.png
new file mode 100644
index 0000000..78c49f6
Binary files /dev/null and b/doc/html/_images/math/b810258d7f5a5470ef5ee8adda6b7a3957875e70.png differ
diff --git a/doc/html/_images/math/b828151fe9afd4446b89b49af5391342a5012fa7.png b/doc/html/_images/math/b828151fe9afd4446b89b49af5391342a5012fa7.png
new file mode 100644
index 0000000..b1f7489
Binary files /dev/null and b/doc/html/_images/math/b828151fe9afd4446b89b49af5391342a5012fa7.png differ
diff --git a/doc/html/_images/math/b8652b0e047832222474a1e2a4ed998e75b698af.png b/doc/html/_images/math/b8652b0e047832222474a1e2a4ed998e75b698af.png
new file mode 100644
index 0000000..8524980
Binary files /dev/null and b/doc/html/_images/math/b8652b0e047832222474a1e2a4ed998e75b698af.png differ
diff --git a/doc/html/_images/math/b9237e06a8e6e906a69ec6acdc633603ba50084b.png b/doc/html/_images/math/b9237e06a8e6e906a69ec6acdc633603ba50084b.png
new file mode 100644
index 0000000..7c58e86
Binary files /dev/null and b/doc/html/_images/math/b9237e06a8e6e906a69ec6acdc633603ba50084b.png differ
diff --git a/doc/html/_images/math/b92c09a649305a0aef3239729d93cdf941e0e5cf.png b/doc/html/_images/math/b92c09a649305a0aef3239729d93cdf941e0e5cf.png
new file mode 100644
index 0000000..0c00eac
Binary files /dev/null and b/doc/html/_images/math/b92c09a649305a0aef3239729d93cdf941e0e5cf.png differ
diff --git a/doc/html/_images/math/b94be0ad0fc90fa2e4e61c0c2c094ebc202d7729.png b/doc/html/_images/math/b94be0ad0fc90fa2e4e61c0c2c094ebc202d7729.png
new file mode 100644
index 0000000..c6779c3
Binary files /dev/null and b/doc/html/_images/math/b94be0ad0fc90fa2e4e61c0c2c094ebc202d7729.png differ
diff --git a/doc/html/_images/math/b9cc307099bb9947c8a56f892a3ea6e731d1cac5.png b/doc/html/_images/math/b9cc307099bb9947c8a56f892a3ea6e731d1cac5.png
new file mode 100644
index 0000000..f3a17c4
Binary files /dev/null and b/doc/html/_images/math/b9cc307099bb9947c8a56f892a3ea6e731d1cac5.png differ
diff --git a/doc/html/_images/math/ba1be82ee324edf53ae6c1811f327002883c18ee.png b/doc/html/_images/math/ba1be82ee324edf53ae6c1811f327002883c18ee.png
new file mode 100644
index 0000000..5f3786b
Binary files /dev/null and b/doc/html/_images/math/ba1be82ee324edf53ae6c1811f327002883c18ee.png differ
diff --git a/doc/html/_images/math/ba6b90460b73c045bb825f6609b3415e301bb2b8.png b/doc/html/_images/math/ba6b90460b73c045bb825f6609b3415e301bb2b8.png
new file mode 100644
index 0000000..c280bee
Binary files /dev/null and b/doc/html/_images/math/ba6b90460b73c045bb825f6609b3415e301bb2b8.png differ
diff --git a/doc/html/_images/math/bb47877556480ddd060e47647cade1b212b9cde5.png b/doc/html/_images/math/bb47877556480ddd060e47647cade1b212b9cde5.png
new file mode 100644
index 0000000..685e761
Binary files /dev/null and b/doc/html/_images/math/bb47877556480ddd060e47647cade1b212b9cde5.png differ
diff --git a/doc/html/_images/math/bbe3c7674803b8326dfc8b4b1ba88c675de5721d.png b/doc/html/_images/math/bbe3c7674803b8326dfc8b4b1ba88c675de5721d.png
new file mode 100644
index 0000000..e029e69
Binary files /dev/null and b/doc/html/_images/math/bbe3c7674803b8326dfc8b4b1ba88c675de5721d.png differ
diff --git a/doc/html/_images/math/bbeb45fdc8ef73286444f7323c922bf638e059c1.png b/doc/html/_images/math/bbeb45fdc8ef73286444f7323c922bf638e059c1.png
new file mode 100644
index 0000000..cc2e664
Binary files /dev/null and b/doc/html/_images/math/bbeb45fdc8ef73286444f7323c922bf638e059c1.png differ
diff --git a/doc/html/_images/math/c02c277280c0b3f1615a4f191b963a70fb36ecd8.png b/doc/html/_images/math/c02c277280c0b3f1615a4f191b963a70fb36ecd8.png
new file mode 100644
index 0000000..34a477d
Binary files /dev/null and b/doc/html/_images/math/c02c277280c0b3f1615a4f191b963a70fb36ecd8.png differ
diff --git a/doc/html/_images/math/c13187825263b2dc8bae4e30d0d15cf8670b6956.png b/doc/html/_images/math/c13187825263b2dc8bae4e30d0d15cf8670b6956.png
new file mode 100644
index 0000000..754a072
Binary files /dev/null and b/doc/html/_images/math/c13187825263b2dc8bae4e30d0d15cf8670b6956.png differ
diff --git a/doc/html/_images/math/c138ee6943c33ad686fbcc19f6b8987bca18788c.png b/doc/html/_images/math/c138ee6943c33ad686fbcc19f6b8987bca18788c.png
new file mode 100644
index 0000000..d099fed
Binary files /dev/null and b/doc/html/_images/math/c138ee6943c33ad686fbcc19f6b8987bca18788c.png differ
diff --git a/doc/html/_images/math/c3bb2dbfdf9313d0d369ef7ac0c4c2b58f310d92.png b/doc/html/_images/math/c3bb2dbfdf9313d0d369ef7ac0c4c2b58f310d92.png
new file mode 100644
index 0000000..6c10df4
Binary files /dev/null and b/doc/html/_images/math/c3bb2dbfdf9313d0d369ef7ac0c4c2b58f310d92.png differ
diff --git a/doc/html/_images/math/c3c08496f07567285212e468b173bea9ca153fab.png b/doc/html/_images/math/c3c08496f07567285212e468b173bea9ca153fab.png
new file mode 100644
index 0000000..89f96e1
Binary files /dev/null and b/doc/html/_images/math/c3c08496f07567285212e468b173bea9ca153fab.png differ
diff --git a/doc/html/_images/math/c4bb40dd65eae6c11b325989b14e0b8d35e4e3ef.png b/doc/html/_images/math/c4bb40dd65eae6c11b325989b14e0b8d35e4e3ef.png
new file mode 100644
index 0000000..23c3acd
Binary files /dev/null and b/doc/html/_images/math/c4bb40dd65eae6c11b325989b14e0b8d35e4e3ef.png differ
diff --git a/doc/html/_images/math/c59f33685835e497f8b4d66cbff87e46afa6e30d.png b/doc/html/_images/math/c59f33685835e497f8b4d66cbff87e46afa6e30d.png
new file mode 100644
index 0000000..5ac04bf
Binary files /dev/null and b/doc/html/_images/math/c59f33685835e497f8b4d66cbff87e46afa6e30d.png differ
diff --git a/doc/html/_images/math/c7c0674ced05ddaa94bd705d1a836882a49c5b85.png b/doc/html/_images/math/c7c0674ced05ddaa94bd705d1a836882a49c5b85.png
new file mode 100644
index 0000000..de49d95
Binary files /dev/null and b/doc/html/_images/math/c7c0674ced05ddaa94bd705d1a836882a49c5b85.png differ
diff --git a/doc/html/_images/math/c861d27ab46dcf1be207f024a0ce2fbb9d9d4ec1.png b/doc/html/_images/math/c861d27ab46dcf1be207f024a0ce2fbb9d9d4ec1.png
new file mode 100644
index 0000000..092bb25
Binary files /dev/null and b/doc/html/_images/math/c861d27ab46dcf1be207f024a0ce2fbb9d9d4ec1.png differ
diff --git a/doc/html/_images/math/c86b80d3cf8c7319c3652e5a4453e29840e97a9c.png b/doc/html/_images/math/c86b80d3cf8c7319c3652e5a4453e29840e97a9c.png
new file mode 100644
index 0000000..4c399f1
Binary files /dev/null and b/doc/html/_images/math/c86b80d3cf8c7319c3652e5a4453e29840e97a9c.png differ
diff --git a/doc/html/_images/math/c888fcb025bde0ed335be8d5f932ac56d5950d45.png b/doc/html/_images/math/c888fcb025bde0ed335be8d5f932ac56d5950d45.png
new file mode 100644
index 0000000..56a48db
Binary files /dev/null and b/doc/html/_images/math/c888fcb025bde0ed335be8d5f932ac56d5950d45.png differ
diff --git a/doc/html/_images/math/c96f101392de9d4e76dd0dba40750bb61a49e9a2.png b/doc/html/_images/math/c96f101392de9d4e76dd0dba40750bb61a49e9a2.png
new file mode 100644
index 0000000..349850a
Binary files /dev/null and b/doc/html/_images/math/c96f101392de9d4e76dd0dba40750bb61a49e9a2.png differ
diff --git a/doc/html/_images/math/c983ed273b9536c28bbff3ab1a32c2458c70fe22.png b/doc/html/_images/math/c983ed273b9536c28bbff3ab1a32c2458c70fe22.png
new file mode 100644
index 0000000..b63a2e1
Binary files /dev/null and b/doc/html/_images/math/c983ed273b9536c28bbff3ab1a32c2458c70fe22.png differ
diff --git a/doc/html/_images/math/c99df7a209495334da442b1ec998abaabfa320d8.png b/doc/html/_images/math/c99df7a209495334da442b1ec998abaabfa320d8.png
new file mode 100644
index 0000000..07f8cda
Binary files /dev/null and b/doc/html/_images/math/c99df7a209495334da442b1ec998abaabfa320d8.png differ
diff --git a/doc/html/_images/math/ca01cc7f3857720f5dc4b843e209e0c95830807c.png b/doc/html/_images/math/ca01cc7f3857720f5dc4b843e209e0c95830807c.png
new file mode 100644
index 0000000..76a0fc8
Binary files /dev/null and b/doc/html/_images/math/ca01cc7f3857720f5dc4b843e209e0c95830807c.png differ
diff --git a/doc/html/_images/math/cba0afcbfd537186714602299bfdbeb8006cebd6.png b/doc/html/_images/math/cba0afcbfd537186714602299bfdbeb8006cebd6.png
new file mode 100644
index 0000000..866d056
Binary files /dev/null and b/doc/html/_images/math/cba0afcbfd537186714602299bfdbeb8006cebd6.png differ
diff --git a/doc/html/_images/math/cbb80ad77aa7a5e227d5a46bc44d235284106cfc.png b/doc/html/_images/math/cbb80ad77aa7a5e227d5a46bc44d235284106cfc.png
new file mode 100644
index 0000000..a8f1f0b
Binary files /dev/null and b/doc/html/_images/math/cbb80ad77aa7a5e227d5a46bc44d235284106cfc.png differ
diff --git a/doc/html/_images/math/cd01aaaa1674ff77afb5f645d5eacd0f2ec1b573.png b/doc/html/_images/math/cd01aaaa1674ff77afb5f645d5eacd0f2ec1b573.png
new file mode 100644
index 0000000..b5c9149
Binary files /dev/null and b/doc/html/_images/math/cd01aaaa1674ff77afb5f645d5eacd0f2ec1b573.png differ
diff --git a/doc/html/_images/math/cd586484e994863e4dce4dec3e742ab3a1232bc2.png b/doc/html/_images/math/cd586484e994863e4dce4dec3e742ab3a1232bc2.png
new file mode 100644
index 0000000..3edecd2
Binary files /dev/null and b/doc/html/_images/math/cd586484e994863e4dce4dec3e742ab3a1232bc2.png differ
diff --git a/doc/html/_images/math/cd7041cd0a90f7d24f6f5c2a40216706d95858ec.png b/doc/html/_images/math/cd7041cd0a90f7d24f6f5c2a40216706d95858ec.png
new file mode 100644
index 0000000..f007f37
Binary files /dev/null and b/doc/html/_images/math/cd7041cd0a90f7d24f6f5c2a40216706d95858ec.png differ
diff --git a/doc/html/_images/math/cd963d5c6113215ea256c383c90369f9e79d0b05.png b/doc/html/_images/math/cd963d5c6113215ea256c383c90369f9e79d0b05.png
new file mode 100644
index 0000000..76bfdd7
Binary files /dev/null and b/doc/html/_images/math/cd963d5c6113215ea256c383c90369f9e79d0b05.png differ
diff --git a/doc/html/_images/math/cdb26bb9819bf8adb395cdada207cbb0e095ec3f.png b/doc/html/_images/math/cdb26bb9819bf8adb395cdada207cbb0e095ec3f.png
new file mode 100644
index 0000000..1671f50
Binary files /dev/null and b/doc/html/_images/math/cdb26bb9819bf8adb395cdada207cbb0e095ec3f.png differ
diff --git a/doc/html/_images/math/cfb14204c91bf302a59f79887bd459ca0ca3565a.png b/doc/html/_images/math/cfb14204c91bf302a59f79887bd459ca0ca3565a.png
new file mode 100644
index 0000000..2cf31e7
Binary files /dev/null and b/doc/html/_images/math/cfb14204c91bf302a59f79887bd459ca0ca3565a.png differ
diff --git a/doc/html/_images/math/d07b4c16d04b6739df29c10f32dfc4b946061922.png b/doc/html/_images/math/d07b4c16d04b6739df29c10f32dfc4b946061922.png
new file mode 100644
index 0000000..7213175
Binary files /dev/null and b/doc/html/_images/math/d07b4c16d04b6739df29c10f32dfc4b946061922.png differ
diff --git a/doc/html/_images/math/d1b0f996b995464353b9222ef666f5b6f63580c9.png b/doc/html/_images/math/d1b0f996b995464353b9222ef666f5b6f63580c9.png
new file mode 100644
index 0000000..9e80f3d
Binary files /dev/null and b/doc/html/_images/math/d1b0f996b995464353b9222ef666f5b6f63580c9.png differ
diff --git a/doc/html/_images/math/d2ac2e45e520f9ba6c24cc8087486cf69552fcff.png b/doc/html/_images/math/d2ac2e45e520f9ba6c24cc8087486cf69552fcff.png
new file mode 100644
index 0000000..d705f61
Binary files /dev/null and b/doc/html/_images/math/d2ac2e45e520f9ba6c24cc8087486cf69552fcff.png differ
diff --git a/doc/html/_images/math/d3de882a6e7d634336449ea13442b526c815a7af.png b/doc/html/_images/math/d3de882a6e7d634336449ea13442b526c815a7af.png
new file mode 100644
index 0000000..c8a7caf
Binary files /dev/null and b/doc/html/_images/math/d3de882a6e7d634336449ea13442b526c815a7af.png differ
diff --git a/doc/html/_images/math/d555fc582c6ae0fbb92f32567d87578eafa2be7a.png b/doc/html/_images/math/d555fc582c6ae0fbb92f32567d87578eafa2be7a.png
new file mode 100644
index 0000000..dfcc08d
Binary files /dev/null and b/doc/html/_images/math/d555fc582c6ae0fbb92f32567d87578eafa2be7a.png differ
diff --git a/doc/html/_images/math/d5657b2f0822ec6051e030822e03d104dbb946d2.png b/doc/html/_images/math/d5657b2f0822ec6051e030822e03d104dbb946d2.png
new file mode 100644
index 0000000..23f90c5
Binary files /dev/null and b/doc/html/_images/math/d5657b2f0822ec6051e030822e03d104dbb946d2.png differ
diff --git a/doc/html/_images/math/d6882108988b75f2c185ff66d8ca996834b46260.png b/doc/html/_images/math/d6882108988b75f2c185ff66d8ca996834b46260.png
new file mode 100644
index 0000000..d78d435
Binary files /dev/null and b/doc/html/_images/math/d6882108988b75f2c185ff66d8ca996834b46260.png differ
diff --git a/doc/html/_images/math/d758b8f7ecd9593ebd41b06fde3fa0bbb1dd86f6.png b/doc/html/_images/math/d758b8f7ecd9593ebd41b06fde3fa0bbb1dd86f6.png
new file mode 100644
index 0000000..f3b1bb2
Binary files /dev/null and b/doc/html/_images/math/d758b8f7ecd9593ebd41b06fde3fa0bbb1dd86f6.png differ
diff --git a/doc/html/_images/math/d76965f1a033d354c739074571c898e2d6d90094.png b/doc/html/_images/math/d76965f1a033d354c739074571c898e2d6d90094.png
new file mode 100644
index 0000000..1c5fb91
Binary files /dev/null and b/doc/html/_images/math/d76965f1a033d354c739074571c898e2d6d90094.png differ
diff --git a/doc/html/_images/math/d8001236f7a0a1c28d770b1f7bf892316f2aad57.png b/doc/html/_images/math/d8001236f7a0a1c28d770b1f7bf892316f2aad57.png
new file mode 100644
index 0000000..1c659a8
Binary files /dev/null and b/doc/html/_images/math/d8001236f7a0a1c28d770b1f7bf892316f2aad57.png differ
diff --git a/doc/html/_images/math/d99efde75c84ef402a92cd4497530d2366fb112f.png b/doc/html/_images/math/d99efde75c84ef402a92cd4497530d2366fb112f.png
new file mode 100644
index 0000000..70ddbe8
Binary files /dev/null and b/doc/html/_images/math/d99efde75c84ef402a92cd4497530d2366fb112f.png differ
diff --git a/doc/html/_images/math/da6c2abaedd5a781e19aa98607eca6a3d15288f5.png b/doc/html/_images/math/da6c2abaedd5a781e19aa98607eca6a3d15288f5.png
new file mode 100644
index 0000000..fe14097
Binary files /dev/null and b/doc/html/_images/math/da6c2abaedd5a781e19aa98607eca6a3d15288f5.png differ
diff --git a/doc/html/_images/math/dad488d02bdf01d0de39f3dcd6fed9fd66d9d8e6.png b/doc/html/_images/math/dad488d02bdf01d0de39f3dcd6fed9fd66d9d8e6.png
new file mode 100644
index 0000000..66fdb31
Binary files /dev/null and b/doc/html/_images/math/dad488d02bdf01d0de39f3dcd6fed9fd66d9d8e6.png differ
diff --git a/doc/html/_images/math/db2ffb8640c25ef093a0a63051e7bacec0b05d97.png b/doc/html/_images/math/db2ffb8640c25ef093a0a63051e7bacec0b05d97.png
new file mode 100644
index 0000000..0539904
Binary files /dev/null and b/doc/html/_images/math/db2ffb8640c25ef093a0a63051e7bacec0b05d97.png differ
diff --git a/doc/html/_images/math/dc587b1b1e755bddb49ec6d1eab6cf0e169cefec.png b/doc/html/_images/math/dc587b1b1e755bddb49ec6d1eab6cf0e169cefec.png
new file mode 100644
index 0000000..cc8f5af
Binary files /dev/null and b/doc/html/_images/math/dc587b1b1e755bddb49ec6d1eab6cf0e169cefec.png differ
diff --git a/doc/html/_images/math/de8abededa5bdbf7dd749842436f6456587dc3b6.png b/doc/html/_images/math/de8abededa5bdbf7dd749842436f6456587dc3b6.png
new file mode 100644
index 0000000..8b52400
Binary files /dev/null and b/doc/html/_images/math/de8abededa5bdbf7dd749842436f6456587dc3b6.png differ
diff --git a/doc/html/_images/math/dee8ae46a5b8057f8d7d48bb39deae1fbf9bfeb3.png b/doc/html/_images/math/dee8ae46a5b8057f8d7d48bb39deae1fbf9bfeb3.png
new file mode 100644
index 0000000..6e3fe60
Binary files /dev/null and b/doc/html/_images/math/dee8ae46a5b8057f8d7d48bb39deae1fbf9bfeb3.png differ
diff --git a/doc/html/_images/math/dfdb481523b4f08cc85ceaa14507fd7419bd1f14.png b/doc/html/_images/math/dfdb481523b4f08cc85ceaa14507fd7419bd1f14.png
new file mode 100644
index 0000000..05944a3
Binary files /dev/null and b/doc/html/_images/math/dfdb481523b4f08cc85ceaa14507fd7419bd1f14.png differ
diff --git a/doc/html/_images/math/e0ea47f3b1a636373372f1d3fdc4d49842592724.png b/doc/html/_images/math/e0ea47f3b1a636373372f1d3fdc4d49842592724.png
new file mode 100644
index 0000000..43ec61b
Binary files /dev/null and b/doc/html/_images/math/e0ea47f3b1a636373372f1d3fdc4d49842592724.png differ
diff --git a/doc/html/_images/math/e19bbf7b0589a31564d0f2b5183804851cb8846e.png b/doc/html/_images/math/e19bbf7b0589a31564d0f2b5183804851cb8846e.png
new file mode 100644
index 0000000..f0e5672
Binary files /dev/null and b/doc/html/_images/math/e19bbf7b0589a31564d0f2b5183804851cb8846e.png differ
diff --git a/doc/html/_images/math/e1c7f0c9b12f842d6225770277576547e13dce69.png b/doc/html/_images/math/e1c7f0c9b12f842d6225770277576547e13dce69.png
new file mode 100644
index 0000000..9a80a91
Binary files /dev/null and b/doc/html/_images/math/e1c7f0c9b12f842d6225770277576547e13dce69.png differ
diff --git a/doc/html/_images/math/e2faf4578b5333a790f89cf2c080a9e297bde7d4.png b/doc/html/_images/math/e2faf4578b5333a790f89cf2c080a9e297bde7d4.png
new file mode 100644
index 0000000..4837695
Binary files /dev/null and b/doc/html/_images/math/e2faf4578b5333a790f89cf2c080a9e297bde7d4.png differ
diff --git a/doc/html/_images/math/e3be8b9772729b304adf47f411e4ac8d7e4ab48a.png b/doc/html/_images/math/e3be8b9772729b304adf47f411e4ac8d7e4ab48a.png
new file mode 100644
index 0000000..0d9c9db
Binary files /dev/null and b/doc/html/_images/math/e3be8b9772729b304adf47f411e4ac8d7e4ab48a.png differ
diff --git a/doc/html/_images/math/e3e1b8a98590631e4c5dc9df782ebe2cd9822722.png b/doc/html/_images/math/e3e1b8a98590631e4c5dc9df782ebe2cd9822722.png
new file mode 100644
index 0000000..39b30e5
Binary files /dev/null and b/doc/html/_images/math/e3e1b8a98590631e4c5dc9df782ebe2cd9822722.png differ
diff --git a/doc/html/_images/math/e46a26135e0ceb7bf8a11ec2c0b76d0692cb242d.png b/doc/html/_images/math/e46a26135e0ceb7bf8a11ec2c0b76d0692cb242d.png
new file mode 100644
index 0000000..6625da5
Binary files /dev/null and b/doc/html/_images/math/e46a26135e0ceb7bf8a11ec2c0b76d0692cb242d.png differ
diff --git a/doc/html/_images/math/e480d25b49f5eab31ed34e936f2e0103e01a819e.png b/doc/html/_images/math/e480d25b49f5eab31ed34e936f2e0103e01a819e.png
new file mode 100644
index 0000000..5e6256b
Binary files /dev/null and b/doc/html/_images/math/e480d25b49f5eab31ed34e936f2e0103e01a819e.png differ
diff --git a/doc/html/_images/math/e558b0b209fc138468737f6695fef0795f8c8336.png b/doc/html/_images/math/e558b0b209fc138468737f6695fef0795f8c8336.png
new file mode 100644
index 0000000..cbcfbb2
Binary files /dev/null and b/doc/html/_images/math/e558b0b209fc138468737f6695fef0795f8c8336.png differ
diff --git a/doc/html/_images/math/e5fc41b391867da81606413e3389c7efc73abaf0.png b/doc/html/_images/math/e5fc41b391867da81606413e3389c7efc73abaf0.png
new file mode 100644
index 0000000..1bed881
Binary files /dev/null and b/doc/html/_images/math/e5fc41b391867da81606413e3389c7efc73abaf0.png differ
diff --git a/doc/html/_images/math/e685fdf1ecd460e241aacbbd6d1accbc12cc5829.png b/doc/html/_images/math/e685fdf1ecd460e241aacbbd6d1accbc12cc5829.png
new file mode 100644
index 0000000..ed62d67
Binary files /dev/null and b/doc/html/_images/math/e685fdf1ecd460e241aacbbd6d1accbc12cc5829.png differ
diff --git a/doc/html/_images/math/e7239335d875a754186e9932b8906570a49cbefe.png b/doc/html/_images/math/e7239335d875a754186e9932b8906570a49cbefe.png
new file mode 100644
index 0000000..fc2f384
Binary files /dev/null and b/doc/html/_images/math/e7239335d875a754186e9932b8906570a49cbefe.png differ
diff --git a/doc/html/_images/math/e72a184be24a21b39b31cc95d26e6608c73484b0.png b/doc/html/_images/math/e72a184be24a21b39b31cc95d26e6608c73484b0.png
new file mode 100644
index 0000000..a3ca1c4
Binary files /dev/null and b/doc/html/_images/math/e72a184be24a21b39b31cc95d26e6608c73484b0.png differ
diff --git a/doc/html/_images/math/e7d8829a559936a233a47cc7b6b40b8d04c5bd41.png b/doc/html/_images/math/e7d8829a559936a233a47cc7b6b40b8d04c5bd41.png
new file mode 100644
index 0000000..104e4a6
Binary files /dev/null and b/doc/html/_images/math/e7d8829a559936a233a47cc7b6b40b8d04c5bd41.png differ
diff --git a/doc/html/_images/math/e88d7235397bfea3fbb0fb4e7680407acdb79f87.png b/doc/html/_images/math/e88d7235397bfea3fbb0fb4e7680407acdb79f87.png
new file mode 100644
index 0000000..3d5a43c
Binary files /dev/null and b/doc/html/_images/math/e88d7235397bfea3fbb0fb4e7680407acdb79f87.png differ
diff --git a/doc/html/_images/math/e9203da50e1059455123460d4e716c9c7f440cc3.png b/doc/html/_images/math/e9203da50e1059455123460d4e716c9c7f440cc3.png
new file mode 100644
index 0000000..f411cdf
Binary files /dev/null and b/doc/html/_images/math/e9203da50e1059455123460d4e716c9c7f440cc3.png differ
diff --git a/doc/html/_images/math/e9424ef951bc888bb64400220e3db2751194bf8e.png b/doc/html/_images/math/e9424ef951bc888bb64400220e3db2751194bf8e.png
new file mode 100644
index 0000000..2faf545
Binary files /dev/null and b/doc/html/_images/math/e9424ef951bc888bb64400220e3db2751194bf8e.png differ
diff --git a/doc/html/_images/math/e9f7483f134d4b791c23663683f97a82ba62b056.png b/doc/html/_images/math/e9f7483f134d4b791c23663683f97a82ba62b056.png
new file mode 100644
index 0000000..1c5fb91
Binary files /dev/null and b/doc/html/_images/math/e9f7483f134d4b791c23663683f97a82ba62b056.png differ
diff --git a/doc/html/_images/math/eaf624467206a87efe3bd482abed3cc36875d59f.png b/doc/html/_images/math/eaf624467206a87efe3bd482abed3cc36875d59f.png
new file mode 100644
index 0000000..6557dbf
Binary files /dev/null and b/doc/html/_images/math/eaf624467206a87efe3bd482abed3cc36875d59f.png differ
diff --git a/doc/html/_images/math/eb00f840427485fbf0601b84d2126406edc0f392.png b/doc/html/_images/math/eb00f840427485fbf0601b84d2126406edc0f392.png
new file mode 100644
index 0000000..a906732
Binary files /dev/null and b/doc/html/_images/math/eb00f840427485fbf0601b84d2126406edc0f392.png differ
diff --git a/doc/html/_images/math/eb3d9f0698c7f5c1906c4d26b8fcf1f315e74318.png b/doc/html/_images/math/eb3d9f0698c7f5c1906c4d26b8fcf1f315e74318.png
new file mode 100644
index 0000000..a717ba2
Binary files /dev/null and b/doc/html/_images/math/eb3d9f0698c7f5c1906c4d26b8fcf1f315e74318.png differ
diff --git a/doc/html/_images/math/eb46511dbb028c937d098a05e091ad298f313e5b.png b/doc/html/_images/math/eb46511dbb028c937d098a05e091ad298f313e5b.png
new file mode 100644
index 0000000..b4808b8
Binary files /dev/null and b/doc/html/_images/math/eb46511dbb028c937d098a05e091ad298f313e5b.png differ
diff --git a/doc/html/_images/math/ec0606574b5c69317afdafe1c02bce1ce201f7a7.png b/doc/html/_images/math/ec0606574b5c69317afdafe1c02bce1ce201f7a7.png
new file mode 100644
index 0000000..34a477d
Binary files /dev/null and b/doc/html/_images/math/ec0606574b5c69317afdafe1c02bce1ce201f7a7.png differ
diff --git a/doc/html/_images/math/ec45b525199e9ca199573bf72bbebde0a0aaf8f2.png b/doc/html/_images/math/ec45b525199e9ca199573bf72bbebde0a0aaf8f2.png
new file mode 100644
index 0000000..5474297
Binary files /dev/null and b/doc/html/_images/math/ec45b525199e9ca199573bf72bbebde0a0aaf8f2.png differ
diff --git a/doc/html/_images/math/ec9a814a8db8511dd6afe998d946e72bb79ae20c.png b/doc/html/_images/math/ec9a814a8db8511dd6afe998d946e72bb79ae20c.png
new file mode 100644
index 0000000..557b2d0
Binary files /dev/null and b/doc/html/_images/math/ec9a814a8db8511dd6afe998d946e72bb79ae20c.png differ
diff --git a/doc/html/_images/math/edcbd6cd73ef9909f576e6dc918b5defd822ea7d.png b/doc/html/_images/math/edcbd6cd73ef9909f576e6dc918b5defd822ea7d.png
new file mode 100644
index 0000000..6798a17
Binary files /dev/null and b/doc/html/_images/math/edcbd6cd73ef9909f576e6dc918b5defd822ea7d.png differ
diff --git a/doc/html/_images/math/ee5608e78ca5349deca6cf03fdbdf3e278f797e0.png b/doc/html/_images/math/ee5608e78ca5349deca6cf03fdbdf3e278f797e0.png
new file mode 100644
index 0000000..a3279dc
Binary files /dev/null and b/doc/html/_images/math/ee5608e78ca5349deca6cf03fdbdf3e278f797e0.png differ
diff --git a/doc/html/_images/math/ef03e779d72e2e413d309e114a6b43cb0aa0a79d.png b/doc/html/_images/math/ef03e779d72e2e413d309e114a6b43cb0aa0a79d.png
new file mode 100644
index 0000000..1695594
Binary files /dev/null and b/doc/html/_images/math/ef03e779d72e2e413d309e114a6b43cb0aa0a79d.png differ
diff --git a/doc/html/_images/math/ef12b38f8dd041b3da4503cfb9e2c1c3d38a0486.png b/doc/html/_images/math/ef12b38f8dd041b3da4503cfb9e2c1c3d38a0486.png
new file mode 100644
index 0000000..998654c
Binary files /dev/null and b/doc/html/_images/math/ef12b38f8dd041b3da4503cfb9e2c1c3d38a0486.png differ
diff --git a/doc/html/_images/math/ef2b551c8cc9515c28c7517d5620b634b3b7beb6.png b/doc/html/_images/math/ef2b551c8cc9515c28c7517d5620b634b3b7beb6.png
new file mode 100644
index 0000000..203f049
Binary files /dev/null and b/doc/html/_images/math/ef2b551c8cc9515c28c7517d5620b634b3b7beb6.png differ
diff --git a/doc/html/_images/math/f026aecf11ec7f6141ab863f260d395f94b10f51.png b/doc/html/_images/math/f026aecf11ec7f6141ab863f260d395f94b10f51.png
new file mode 100644
index 0000000..100389e
Binary files /dev/null and b/doc/html/_images/math/f026aecf11ec7f6141ab863f260d395f94b10f51.png differ
diff --git a/doc/html/_images/math/f0c84551b5a2d13213791afff102b42d3416c913.png b/doc/html/_images/math/f0c84551b5a2d13213791afff102b42d3416c913.png
new file mode 100644
index 0000000..1b16181
Binary files /dev/null and b/doc/html/_images/math/f0c84551b5a2d13213791afff102b42d3416c913.png differ
diff --git a/doc/html/_images/math/f2cfc079aca0e287101d38af0c5399937658a911.png b/doc/html/_images/math/f2cfc079aca0e287101d38af0c5399937658a911.png
new file mode 100644
index 0000000..9a61f0a
Binary files /dev/null and b/doc/html/_images/math/f2cfc079aca0e287101d38af0c5399937658a911.png differ
diff --git a/doc/html/_images/math/f4136218c7316891923eb92e8e53da9c884ba7da.png b/doc/html/_images/math/f4136218c7316891923eb92e8e53da9c884ba7da.png
new file mode 100644
index 0000000..790d1c7
Binary files /dev/null and b/doc/html/_images/math/f4136218c7316891923eb92e8e53da9c884ba7da.png differ
diff --git a/doc/html/_images/math/f48b617185733d8dd6712643f1ab17c736661a06.png b/doc/html/_images/math/f48b617185733d8dd6712643f1ab17c736661a06.png
new file mode 100644
index 0000000..2578a66
Binary files /dev/null and b/doc/html/_images/math/f48b617185733d8dd6712643f1ab17c736661a06.png differ
diff --git a/doc/html/_images/math/f4f7b1326f5012dac838e6664ea24caa73c10742.png b/doc/html/_images/math/f4f7b1326f5012dac838e6664ea24caa73c10742.png
new file mode 100644
index 0000000..d130240
Binary files /dev/null and b/doc/html/_images/math/f4f7b1326f5012dac838e6664ea24caa73c10742.png differ
diff --git a/doc/html/_images/math/f50d3a495c7268eacf7f28116e0737ea5744d856.png b/doc/html/_images/math/f50d3a495c7268eacf7f28116e0737ea5744d856.png
new file mode 100644
index 0000000..6aedd04
Binary files /dev/null and b/doc/html/_images/math/f50d3a495c7268eacf7f28116e0737ea5744d856.png differ
diff --git a/doc/html/_images/math/f550d35baced9ff07145881ea1b76d6167735056.png b/doc/html/_images/math/f550d35baced9ff07145881ea1b76d6167735056.png
new file mode 100644
index 0000000..3719489
Binary files /dev/null and b/doc/html/_images/math/f550d35baced9ff07145881ea1b76d6167735056.png differ
diff --git a/doc/html/_images/math/f56f7bbc4271cd2930fb8434a6b1f448f806677c.png b/doc/html/_images/math/f56f7bbc4271cd2930fb8434a6b1f448f806677c.png
new file mode 100644
index 0000000..35a8f20
Binary files /dev/null and b/doc/html/_images/math/f56f7bbc4271cd2930fb8434a6b1f448f806677c.png differ
diff --git a/doc/html/_images/math/f653e38f1855f52cb4db07a7a9fcf43d99337b25.png b/doc/html/_images/math/f653e38f1855f52cb4db07a7a9fcf43d99337b25.png
new file mode 100644
index 0000000..c42daa9
Binary files /dev/null and b/doc/html/_images/math/f653e38f1855f52cb4db07a7a9fcf43d99337b25.png differ
diff --git a/doc/html/_images/math/f737c57f30b69731860640f7b2408b8103df0cd8.png b/doc/html/_images/math/f737c57f30b69731860640f7b2408b8103df0cd8.png
new file mode 100644
index 0000000..4f335a8
Binary files /dev/null and b/doc/html/_images/math/f737c57f30b69731860640f7b2408b8103df0cd8.png differ
diff --git a/doc/html/_images/math/f760f3b11939823c9b02bad5db429093145730a6.png b/doc/html/_images/math/f760f3b11939823c9b02bad5db429093145730a6.png
new file mode 100644
index 0000000..04b92b7
Binary files /dev/null and b/doc/html/_images/math/f760f3b11939823c9b02bad5db429093145730a6.png differ
diff --git a/doc/html/_images/math/f8a049b96970ce863efb8a9f7b40c855f0422d56.png b/doc/html/_images/math/f8a049b96970ce863efb8a9f7b40c855f0422d56.png
new file mode 100644
index 0000000..8e3a93e
Binary files /dev/null and b/doc/html/_images/math/f8a049b96970ce863efb8a9f7b40c855f0422d56.png differ
diff --git a/doc/html/_images/math/fa34489cf430b7630b30f28b2eb050e2489e3523.png b/doc/html/_images/math/fa34489cf430b7630b30f28b2eb050e2489e3523.png
new file mode 100644
index 0000000..66befbb
Binary files /dev/null and b/doc/html/_images/math/fa34489cf430b7630b30f28b2eb050e2489e3523.png differ
diff --git a/doc/html/_images/math/fa72eb1a540cebc3dd7afb49700e6c0f08745b5c.png b/doc/html/_images/math/fa72eb1a540cebc3dd7afb49700e6c0f08745b5c.png
new file mode 100644
index 0000000..50b9cc3
Binary files /dev/null and b/doc/html/_images/math/fa72eb1a540cebc3dd7afb49700e6c0f08745b5c.png differ
diff --git a/doc/html/_images/math/fa936b47d91813a2d099353200d65b79527bab6b.png b/doc/html/_images/math/fa936b47d91813a2d099353200d65b79527bab6b.png
new file mode 100644
index 0000000..b35e9be
Binary files /dev/null and b/doc/html/_images/math/fa936b47d91813a2d099353200d65b79527bab6b.png differ
diff --git a/doc/html/_images/math/faba65ef70827bc1839211eafd2d9573b6aa64b0.png b/doc/html/_images/math/faba65ef70827bc1839211eafd2d9573b6aa64b0.png
new file mode 100644
index 0000000..fda22d5
Binary files /dev/null and b/doc/html/_images/math/faba65ef70827bc1839211eafd2d9573b6aa64b0.png differ
diff --git a/doc/html/_images/math/fb5edeffaf21bca5d920ea2fb9ed088cb574281f.png b/doc/html/_images/math/fb5edeffaf21bca5d920ea2fb9ed088cb574281f.png
new file mode 100644
index 0000000..57827e8
Binary files /dev/null and b/doc/html/_images/math/fb5edeffaf21bca5d920ea2fb9ed088cb574281f.png differ
diff --git a/doc/html/_images/math/fcc3930195947f4188f6a6042495d139c80e173f.png b/doc/html/_images/math/fcc3930195947f4188f6a6042495d139c80e173f.png
new file mode 100644
index 0000000..e6bc9b6
Binary files /dev/null and b/doc/html/_images/math/fcc3930195947f4188f6a6042495d139c80e173f.png differ
diff --git a/doc/html/_images/math/fcd1cfebe325cf88db061ad2327f0db3a8aba939.png b/doc/html/_images/math/fcd1cfebe325cf88db061ad2327f0db3a8aba939.png
new file mode 100644
index 0000000..5b17863
Binary files /dev/null and b/doc/html/_images/math/fcd1cfebe325cf88db061ad2327f0db3a8aba939.png differ
diff --git a/doc/html/_images/math/fd4a8900a7d32aa765cff143ac4c964935bc071d.png b/doc/html/_images/math/fd4a8900a7d32aa765cff143ac4c964935bc071d.png
new file mode 100644
index 0000000..a2b3862
Binary files /dev/null and b/doc/html/_images/math/fd4a8900a7d32aa765cff143ac4c964935bc071d.png differ
diff --git a/doc/html/_images/math/fda7c606710a3011192999c39b6c862d9db414d6.png b/doc/html/_images/math/fda7c606710a3011192999c39b6c862d9db414d6.png
new file mode 100644
index 0000000..111ff75
Binary files /dev/null and b/doc/html/_images/math/fda7c606710a3011192999c39b6c862d9db414d6.png differ
diff --git a/doc/html/_images/math/fee01d5bc4ab0ae7122cf4cc3ce5fd16e75b82c4.png b/doc/html/_images/math/fee01d5bc4ab0ae7122cf4cc3ce5fd16e75b82c4.png
new file mode 100644
index 0000000..20e1802
Binary files /dev/null and b/doc/html/_images/math/fee01d5bc4ab0ae7122cf4cc3ce5fd16e75b82c4.png differ
diff --git a/doc/html/_images/normappr.png b/doc/html/_images/normappr.png
new file mode 100644
index 0000000..1a78d78
Binary files /dev/null and b/doc/html/_images/normappr.png differ
diff --git a/doc/html/_images/portfolio1.png b/doc/html/_images/portfolio1.png
new file mode 100644
index 0000000..6b9491e
Binary files /dev/null and b/doc/html/_images/portfolio1.png differ
diff --git a/doc/html/_images/portfolio2.png b/doc/html/_images/portfolio2.png
new file mode 100644
index 0000000..35a368f
Binary files /dev/null and b/doc/html/_images/portfolio2.png differ
diff --git a/doc/html/_static/basic.css b/doc/html/_static/basic.css
new file mode 100644
index 0000000..9fa77d8
--- /dev/null
+++ b/doc/html/_static/basic.css
@@ -0,0 +1,599 @@
+/*
+ * basic.css
+ * ~~~~~~~~~
+ *
+ * Sphinx stylesheet -- basic theme.
+ *
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/* -- main layout ----------------------------------------------------------- */
+
+div.clearer {
+ clear: both;
+}
+
+/* -- relbar ---------------------------------------------------------------- */
+
+div.related {
+ width: 100%;
+ font-size: 90%;
+}
+
+div.related h3 {
+ display: none;
+}
+
+div.related ul {
+ margin: 0;
+ padding: 0 0 0 10px;
+ list-style: none;
+}
+
+div.related li {
+ display: inline;
+}
+
+div.related li.right {
+ float: right;
+ margin-right: 5px;
+}
+
+/* -- sidebar --------------------------------------------------------------- */
+
+div.sphinxsidebarwrapper {
+ padding: 10px 5px 0 10px;
+}
+
+div.sphinxsidebar {
+ float: left;
+ width: 230px;
+ margin-left: -100%;
+ font-size: 90%;
+}
+
+div.sphinxsidebar ul {
+ list-style: none;
+}
+
+div.sphinxsidebar ul ul,
+div.sphinxsidebar ul.want-points {
+ margin-left: 20px;
+ list-style: square;
+}
+
+div.sphinxsidebar ul ul {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+div.sphinxsidebar form {
+ margin-top: 10px;
+}
+
+div.sphinxsidebar input {
+ border: 1px solid #98dbcc;
+ font-family: sans-serif;
+ font-size: 1em;
+}
+
+div.sphinxsidebar #searchbox input[type="text"] {
+ width: 170px;
+}
+
+div.sphinxsidebar #searchbox input[type="submit"] {
+ width: 30px;
+}
+
+img {
+ border: 0;
+ max-width: 100%;
+}
+
+/* -- search page ----------------------------------------------------------- */
+
+ul.search {
+ margin: 10px 0 0 20px;
+ padding: 0;
+}
+
+ul.search li {
+ padding: 5px 0 5px 20px;
+ background-image: url(file.png);
+ background-repeat: no-repeat;
+ background-position: 0 7px;
+}
+
+ul.search li a {
+ font-weight: bold;
+}
+
+ul.search li div.context {
+ color: #888;
+ margin: 2px 0 0 30px;
+ text-align: left;
+}
+
+ul.keywordmatches li.goodmatch a {
+ font-weight: bold;
+}
+
+/* -- index page ------------------------------------------------------------ */
+
+table.contentstable {
+ width: 90%;
+}
+
+table.contentstable p.biglink {
+ line-height: 150%;
+}
+
+a.biglink {
+ font-size: 1.3em;
+}
+
+span.linkdescr {
+ font-style: italic;
+ padding-top: 5px;
+ font-size: 90%;
+}
+
+/* -- general index --------------------------------------------------------- */
+
+table.indextable {
+ width: 100%;
+}
+
+table.indextable td {
+ text-align: left;
+ vertical-align: top;
+}
+
+table.indextable dl, table.indextable dd {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+table.indextable tr.pcap {
+ height: 10px;
+}
+
+table.indextable tr.cap {
+ margin-top: 10px;
+ background-color: #f2f2f2;
+}
+
+img.toggler {
+ margin-right: 3px;
+ margin-top: 3px;
+ cursor: pointer;
+}
+
+div.modindex-jumpbox {
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
+ margin: 1em 0 1em 0;
+ padding: 0.4em;
+}
+
+div.genindex-jumpbox {
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
+ margin: 1em 0 1em 0;
+ padding: 0.4em;
+}
+
+/* -- general body styles --------------------------------------------------- */
+
+a.headerlink {
+ visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink,
+caption:hover > a.headerlink,
+p.caption:hover > a.headerlink,
+div.code-block-caption:hover > a.headerlink {
+ visibility: visible;
+}
+
+div.body p.caption {
+ text-align: inherit;
+}
+
+div.body td {
+ text-align: left;
+}
+
+.field-list ul {
+ padding-left: 1em;
+}
+
+.first {
+ margin-top: 0 !important;
+}
+
+p.rubric {
+ margin-top: 30px;
+ font-weight: bold;
+}
+
+img.align-left, .figure.align-left, object.align-left {
+ clear: left;
+ float: left;
+ margin-right: 1em;
+}
+
+img.align-right, .figure.align-right, object.align-right {
+ clear: right;
+ float: right;
+ margin-left: 1em;
+}
+
+img.align-center, .figure.align-center, object.align-center {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.align-left {
+ text-align: left;
+}
+
+.align-center {
+ text-align: center;
+}
+
+.align-right {
+ text-align: right;
+}
+
+/* -- sidebars -------------------------------------------------------------- */
+
+div.sidebar {
+ margin: 0 0 0.5em 1em;
+ border: 1px solid #ddb;
+ padding: 7px 7px 0 7px;
+ background-color: #ffe;
+ width: 40%;
+ float: right;
+}
+
+p.sidebar-title {
+ font-weight: bold;
+}
+
+/* -- topics ---------------------------------------------------------------- */
+
+div.topic {
+ border: 1px solid #ccc;
+ padding: 7px 7px 0 7px;
+ margin: 10px 0 10px 0;
+}
+
+p.topic-title {
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-top: 10px;
+}
+
+/* -- admonitions ----------------------------------------------------------- */
+
+div.admonition {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ padding: 7px;
+}
+
+div.admonition dt {
+ font-weight: bold;
+}
+
+div.admonition dl {
+ margin-bottom: 0;
+}
+
+p.admonition-title {
+ margin: 0px 10px 5px 0px;
+ font-weight: bold;
+}
+
+div.body p.centered {
+ text-align: center;
+ margin-top: 25px;
+}
+
+/* -- tables ---------------------------------------------------------------- */
+
+table.docutils {
+ border: 0;
+ border-collapse: collapse;
+}
+
+table caption span.caption-number {
+ font-style: italic;
+}
+
+table caption span.caption-text {
+}
+
+table.docutils td, table.docutils th {
+ padding: 1px 8px 1px 5px;
+ border-top: 0;
+ border-left: 0;
+ border-right: 0;
+ border-bottom: 1px solid #aaa;
+}
+
+table.field-list td, table.field-list th {
+ border: 0 !important;
+}
+
+table.footnote td, table.footnote th {
+ border: 0 !important;
+}
+
+th {
+ text-align: left;
+ padding-right: 5px;
+}
+
+table.citation {
+ border-left: solid 1px gray;
+ margin-left: 1px;
+}
+
+table.citation td {
+ border-bottom: none;
+}
+
+/* -- figures --------------------------------------------------------------- */
+
+div.figure {
+ margin: 0.5em;
+ padding: 0.5em;
+}
+
+div.figure p.caption {
+ padding: 0.3em;
+}
+
+div.figure p.caption span.caption-number {
+ font-style: italic;
+}
+
+div.figure p.caption span.caption-text {
+}
+
+
+/* -- other body styles ----------------------------------------------------- */
+
+ol.arabic {
+ list-style: decimal;
+}
+
+ol.loweralpha {
+ list-style: lower-alpha;
+}
+
+ol.upperalpha {
+ list-style: upper-alpha;
+}
+
+ol.lowerroman {
+ list-style: lower-roman;
+}
+
+ol.upperroman {
+ list-style: upper-roman;
+}
+
+dl {
+ margin-bottom: 15px;
+}
+
+dd p {
+ margin-top: 0px;
+}
+
+dd ul, dd table {
+ margin-bottom: 10px;
+}
+
+dd {
+ margin-top: 3px;
+ margin-bottom: 10px;
+ margin-left: 30px;
+}
+
+dt:target, .highlighted {
+ background-color: #fbe54e;
+}
+
+dl.glossary dt {
+ font-weight: bold;
+ font-size: 1.1em;
+}
+
+.field-list ul {
+ margin: 0;
+ padding-left: 1em;
+}
+
+.field-list p {
+ margin: 0;
+}
+
+.optional {
+ font-size: 1.3em;
+}
+
+.sig-paren {
+ font-size: larger;
+}
+
+.versionmodified {
+ font-style: italic;
+}
+
+.system-message {
+ background-color: #fda;
+ padding: 5px;
+ border: 3px solid red;
+}
+
+.footnote:target {
+ background-color: #ffa;
+}
+
+.line-block {
+ display: block;
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+
+.line-block .line-block {
+ margin-top: 0;
+ margin-bottom: 0;
+ margin-left: 1.5em;
+}
+
+.guilabel, .menuselection {
+ font-family: sans-serif;
+}
+
+.accelerator {
+ text-decoration: underline;
+}
+
+.classifier {
+ font-style: oblique;
+}
+
+abbr, acronym {
+ border-bottom: dotted 1px;
+ cursor: help;
+}
+
+/* -- code displays --------------------------------------------------------- */
+
+pre {
+ overflow: auto;
+ overflow-y: hidden; /* fixes display issues on Chrome browsers */
+}
+
+td.linenos pre {
+ padding: 5px 0px;
+ border: 0;
+ background-color: transparent;
+ color: #aaa;
+}
+
+table.highlighttable {
+ margin-left: 0.5em;
+}
+
+table.highlighttable td {
+ padding: 0 0.5em 0 0.5em;
+}
+
+div.code-block-caption {
+ padding: 2px 5px;
+ font-size: small;
+}
+
+div.code-block-caption code {
+ background-color: transparent;
+}
+
+div.code-block-caption + div > div.highlight > pre {
+ margin-top: 0;
+}
+
+div.code-block-caption span.caption-number {
+ padding: 0.1em 0.3em;
+ font-style: italic;
+}
+
+div.code-block-caption span.caption-text {
+}
+
+div.literal-block-wrapper {
+ padding: 1em 1em 0;
+}
+
+div.literal-block-wrapper div.highlight {
+ margin: 0;
+}
+
+code.descname {
+ background-color: transparent;
+ font-weight: bold;
+ font-size: 1.2em;
+}
+
+code.descclassname {
+ background-color: transparent;
+}
+
+code.xref, a code {
+ background-color: transparent;
+ font-weight: bold;
+}
+
+h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
+ background-color: transparent;
+}
+
+.viewcode-link {
+ float: right;
+}
+
+.viewcode-back {
+ float: right;
+ font-family: sans-serif;
+}
+
+div.viewcode-block:target {
+ margin: -1px -10px;
+ padding: 0 10px;
+}
+
+/* -- math display ---------------------------------------------------------- */
+
+img.math {
+ vertical-align: middle;
+}
+
+div.body div.math p {
+ text-align: center;
+}
+
+span.eqno {
+ float: right;
+}
+
+/* -- printout stylesheet --------------------------------------------------- */
+
+ at media print {
+ div.document,
+ div.documentwrapper,
+ div.bodywrapper {
+ margin: 0 !important;
+ width: 100%;
+ }
+
+ div.sphinxsidebar,
+ div.related,
+ div.footer,
+ #top-link {
+ display: none;
+ }
+}
\ No newline at end of file
diff --git a/doc/html/_static/comment-bright.png b/doc/html/_static/comment-bright.png
new file mode 100644
index 0000000..551517b
Binary files /dev/null and b/doc/html/_static/comment-bright.png differ
diff --git a/doc/html/_static/comment-close.png b/doc/html/_static/comment-close.png
new file mode 100644
index 0000000..09b54be
Binary files /dev/null and b/doc/html/_static/comment-close.png differ
diff --git a/doc/html/_static/comment.png b/doc/html/_static/comment.png
new file mode 100644
index 0000000..92feb52
Binary files /dev/null and b/doc/html/_static/comment.png differ
diff --git a/doc/html/_static/css/badge_only.css b/doc/html/_static/css/badge_only.css
new file mode 100644
index 0000000..4868a00
--- /dev/null
+++ b/doc/html/_static/css/badge_only.css
@@ -0,0 +1 @@
+.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg# [...]
diff --git a/doc/html/_static/css/theme.css b/doc/html/_static/css/theme.css
new file mode 100644
index 0000000..8123d3a
--- /dev/null
+++ b/doc/html/_static/css/theme.css
@@ -0,0 +1,4 @@
+*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[ [...]
+ * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
+ * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.0.3");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff?v=4.0.3") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.0.3") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa,.rst-content .admonition-title,.rst-content h1 .headerlink,. [...]
diff --git a/doc/html/_static/cvxopt.css b/doc/html/_static/cvxopt.css
new file mode 100644
index 0000000..1a7f740
--- /dev/null
+++ b/doc/html/_static/cvxopt.css
@@ -0,0 +1,630 @@
+/*
+ * Alternate Sphinx design
+ * Originally created by Armin Ronacher for Werkzeug, adapted by Georg
+ * Brandl.
+ * Adapted for CVXOPT.
+ */
+
+body {
+ font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif;
+ font-size: 14px;
+ letter-spacing: -0.01em;
+ line-height: 150%;
+ text-align: center;
+ /* background-color: #AFC1C4; */
+ /* background-color: #BFD1D4; */
+ color: black;
+ /* border: 1px solid #aaa; */
+ margin: 0px 20px 0px 20px;
+ /* min-width: 740px; */
+ min-width: 800px; */
+}
+
+a {
+/* color: #CA7900; */
+ color: black;
+ text-decoration: underline;
+}
+
+a:hover {
+/* color: #2491CF; */
+ text-decoration: underline;
+}
+
+li[class="toctree-l1"] a, div.sphinxsidebar a {
+ text-decoration: none !important;
+}
+li[class="toctree-l1"] a:hover, div.sphinxsidebar a:hover {
+ text-decoration: underline !important;
+ color: black !important;
+}
+li[class="toctree-l1"] ul {
+ list-style-type: circle;
+}
+
+div.sphinxsidebarwrapper h3 a:hover {
+ text-decoration: none !important;
+ color: white !important;
+}
+
+pre {
+ font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+ font-size: 0.95em;
+ letter-spacing: 0.015em;
+ padding: 0.5em;
+ border: 1px solid #ccc;
+ background-color: #f8f8f8;
+}
+
+td.linenos pre {
+ padding: 0.5em 0;
+ border: 0;
+ background-color: transparent;
+ color: #aaa;
+}
+
+table.highlighttable {
+ margin-left: 0.5em;
+}
+
+table.highlighttable td {
+ padding: 0 0.5em 0 0.5em;
+}
+
+cite, code {
+ font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+ font-size: 0.95em;
+ letter-spacing: 0.01em;
+}
+
+hr {
+ border: 1px solid #abc;
+ margin: 2em;
+}
+
+tt {
+ font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+}
+
+/* function names */
+tt.descname {
+ font-style: normal;
+ background-color: transparent;
+ font-weight: bold;
+ font-size: 1.2em;
+ border: 0;
+}
+
+/* module name prepended to function name*/
+tt.descclassname {
+ font-style: normal;
+ background-color: transparent;
+ border: 0;
+}
+
+/* variables in function argument list and definition, :samp: */
+tt.docutils.literal, dl.function em {
+ font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+ font-style: italic;
+ background-color: transparent;
+ border: 0;
+}
+
+/* function name in reference, and literals */
+tt.xref.docutils.literal {
+ font-style: normal;
+ background-color: transparent;
+ font-weight: bold;
+ border: 0;
+}
+
+a tt {
+ background-color: transparent;
+ font-weight: bold;
+ border: 0;
+/* color: #CA7900; */
+}
+
+/*
+a tt:hover {
+ color: #2491CF;
+}
+*/
+
+
+.field-list ul {
+ margin: 0;
+ padding-left: 1em;
+}
+
+.field-list p {
+ margin: 0;
+}
+
+dl {
+ margin-bottom: 15px;
+}
+
+
+
+dd p {
+ margin-top: 0px;
+}
+
+dd ul, dd table {
+ margin-bottom: 10px;
+}
+
+dd {
+ margin-top: 3px;
+ margin-bottom: 10px;
+ margin-left: 30px;
+}
+
+.refcount {
+ color: #060;
+}
+
+dt:target,
+.highlight {
+ background-color: #fbe54e;
+}
+
+dl.glossary dt {
+ font-weight: bold;
+ font-size: 1.1em;
+}
+
+pre {
+ line-height: 120%;
+}
+
+pre a {
+ color: inherit;
+ text-decoration: underline;
+}
+
+.first {
+ margin-top: 0 !important;
+}
+
+div.document {
+ background-color: white;
+ text-align: left;
+/* background-image: url(contents.png); */
+/* background-repeat: repeat-x; */
+}
+
+/*
+div.documentwrapper {
+ width: 100%;
+}
+*/
+
+div.clearer {
+ clear: both;
+}
+
+div.related h3 {
+ display: none;
+}
+
+div.related ul {
+/* background-image: url(navigation.png); */
+ height: 2em;
+ list-style: none;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
+ margin: 0;
+ padding-left: 10px;
+}
+
+div.related ul li {
+ margin: 0;
+ padding: 0;
+ height: 2em;
+ float: left;
+}
+
+div.related ul li.right {
+ float: right;
+ margin-right: 5px;
+}
+
+div.related ul li a {
+ margin: 0;
+ padding: 0 5px 0 5px;
+ line-height: 1.75em;
+/* color: #EE9816; */
+ text-decoration: none;
+}
+
+div.related ul li a:hover {
+/* color: #3CA8E7; */
+ text-decoration: underline;
+}
+
+div.body {
+ margin: 0;
+ padding: 0.5em 20px 20px 20px;
+}
+
+div.documentwrapper{
+ float: left;
+ width: 100%;
+}
+
+div.bodywrapper {
+/* margin: 0 240px 0 0; */
+ margin: 0 0 0 240px;
+ border-left: 1px solid #ccc;
+}
+
+/*
+div.body a {
+ text-decoration: underline;
+ text-decoration: none;
+}
+*/
+
+div.body a:hover {
+ color: #2491CF;
+}
+
+div.sphinxsidebar {
+ margin: 0;
+ padding: 0.5em 15px 15px 0;
+ width: 210px;
+ float: left;
+ text-align: left;
+ margin-left: -100%;
+}
+
+div.sphinxsidebar h4, div.sphinxsidebar h3 {
+ margin: 1em 0 .2em 0;
+/* font-size: 0.9em; */
+ font-size: 1.1em;
+
+ padding: 0.1em 0 0.1em 0.5em;
+ color: white;
+ border: 1px solid #86989B;
+ background-color: #AFC1C4;
+}
+
+div.sphinxsidebar h3 a {
+ color: white;
+}
+
+div.sphinxsidebar ul {
+ padding-left: 1.5em;
+ margin-top: 7px;
+ list-style: none;
+ padding: 0;
+ line-height: 130%;
+}
+
+div.sphinxsidebar ul ul {
+ list-style: square;
+ margin-left: 20px;
+}
+
+p {
+ margin: 0.8em 0 0.5em 0;
+}
+
+p.rubric {
+ font-weight: bold;
+}
+
+div.sidebar {
+ margin: 0 0 0.5em 1em;
+ border: 1px solid #ddb;
+ padding: 7px 7px 0 7px;
+ background-color: #ffe;
+ width: 40%;
+ float: right;
+}
+
+div.quotebar {
+ background-color: #f8f8f8;
+ max-width: 250px;
+ float: right;
+ padding: 2px 7px;
+ border: 1px solid #ccc;
+}
+
+p.sidebar-title {
+ font-weight: bold;
+}
+
+div.topic {
+ background-color: #f8f8f8;
+ border: 1px solid #ccc;
+ padding: 7px 7px 0 7px;
+ margin: 10px 0 10px 0;
+}
+
+p.topic-title {
+ font-size: 1.1em;
+ font-weight: bold;
+}
+
+h1 {
+ margin: 0;
+ padding: 0.7em 0 0.3em 0;
+ font-size: 1.5em;
+ color: #11557C;
+}
+
+h2 {
+ margin: 1.3em 0 0.2em 0;
+ font-size: 1.35em;
+ padding: 0;
+ color: #11557C;
+}
+
+h3 {
+ margin: 1em 0 -0.3em 0;
+ font-size: 1.2em;
+}
+
+div.body h1 a, div.body h2 a, div.body h3 a, div.body h4 a, div.body h5 a, div.body h6 a {
+ color: black!important;
+}
+
+h1 a.anchor, h2 a.anchor, h3 a.anchor, h4 a.anchor, h5 a.anchor, h6 a.anchor {
+ display: none;
+ margin: 0 0 0 0.3em;
+ padding: 0 0.2em 0 0.2em;
+ color: #aaa!important;
+}
+
+h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor,
+h5:hover a.anchor, h6:hover a.anchor {
+ display: inline;
+}
+
+h1 a.anchor:hover, h2 a.anchor:hover, h3 a.anchor:hover, h4 a.anchor:hover,
+h5 a.anchor:hover, h6 a.anchor:hover {
+ color: #777;
+ background-color: #eee;
+}
+
+table {
+ border-collapse: collapse;
+ margin: 0 -0.5em 0 -0.5em;
+}
+
+table.docutils{
+ margin-left: auto;
+ margin-right: auto;
+ width: 60%;
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+
+table td, table th {
+ padding: 0.2em 0.5em 0.2em 0.5em;
+}
+
+div.footer {
+/* background-color: #E3EFF1; */
+ color: #86989B;
+ padding: 3px 8px 3px 0;
+ clear: both;
+ font-size: 0.8em;
+ text-align: right;
+}
+
+div.footer a {
+ color: #86989B;
+ text-decoration: underline;
+}
+
+div.pagination {
+ margin-top: 2em;
+ padding-top: 0.5em;
+ border-top: 1px solid black;
+ text-align: center;
+}
+
+div.sphinxsidebar ul.toc {
+ margin: 1em 0 1em 0;
+ padding: 0 0 0 0.5em;
+ list-style: none;
+}
+
+div.sphinxsidebar ul.toc li {
+ margin: 0.5em 0 0.5em 0;
+ font-size: 0.9em;
+ line-height: 130%;
+}
+
+div.sphinxsidebar ul.toc li p {
+ margin: 0;
+ padding: 0;
+}
+
+div.sphinxsidebar ul.toc ul {
+ margin: 0.2em 0 0.2em 0;
+ padding: 0 0 0 1.8em;
+}
+
+div.sphinxsidebar ul.toc ul li {
+ padding: 0;
+}
+
+div.admonition, div.warning {
+ font-size: 0.9em;
+ margin: 1em 0 0 0;
+ border: 1px solid #86989B;
+ background-color: #f7f7f7;
+}
+
+div.admonition p, div.warning p {
+ margin: 0.5em 1em 0.5em 1em;
+ padding: 0;
+}
+
+div.admonition pre, div.warning pre {
+ margin: 0.4em 1em 0.4em 1em;
+}
+
+div.admonition p.admonition-title,
+div.warning p.admonition-title {
+ margin: 0;
+ padding: 0.1em 0 0.1em 0.5em;
+ color: white;
+ border-bottom: 1px solid #86989B;
+ font-weight: bold;
+ background-color: #AFC1C4;
+}
+
+div.warning {
+ border: 1px solid #940000;
+}
+
+div.warning p.admonition-title {
+ background-color: #CF0000;
+ border-bottom-color: #940000;
+}
+
+div.admonition ul, div.admonition ol,
+div.warning ul, div.warning ol {
+ margin: 0.1em 0.5em 0.5em 3em;
+ padding: 0;
+}
+
+div.versioninfo {
+ margin: 1em 0 0 0;
+ border: 1px solid #ccc;
+ background-color: #DDEAF0;
+ padding: 8px;
+ line-height: 1.3em;
+ font-size: 0.9em;
+}
+
+
+a.headerlink {
+ color: #c60f0f!important;
+ font-size: 1em;
+ margin-left: 6px;
+ padding: 0 4px 0 4px;
+ text-decoration: none!important;
+ visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink {
+ visibility: visible;
+}
+
+a.headerlink:hover {
+ background-color: #ccc;
+ color: white!important;
+}
+
+table.indextable td {
+ text-align: left;
+ vertical-align: top;
+}
+
+table.indextable dl, table.indextable dd {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+table.indextable tr.pcap {
+ height: 10px;
+}
+
+table.indextable tr.cap {
+ margin-top: 10px;
+ background-color: #f2f2f2;
+}
+
+img.toggler {
+ margin-right: 3px;
+ margin-top: 3px;
+ cursor: pointer;
+}
+
+form.pfform {
+ margin: 10px 0 20px 0;
+}
+
+table.contentstable {
+ width: 90%;
+}
+
+table.contentstable p.biglink {
+ line-height: 150%;
+}
+
+a.biglink {
+ font-size: 1.3em;
+}
+
+span.linkdescr {
+ font-style: italic;
+ padding-top: 5px;
+ font-size: 90%;
+}
+
+ul.search {
+ margin: 10px 0 0 20px;
+ padding: 0;
+}
+
+ul.search li {
+ padding: 5px 0 5px 20px;
+ background-image: url(file.png);
+ background-repeat: no-repeat;
+ background-position: 0 7px;
+}
+
+ul.search li a {
+ font-weight: bold;
+}
+
+ul.search li div.context {
+ color: #888;
+ margin: 2px 0 0 30px;
+ text-align: left;
+}
+
+ul.keywordmatches li.goodmatch a {
+ font-weight: bold;
+}
+
+img.math {
+ vertical-align: middle;
+}
+
+div.math {
+ text-align: center;
+}
+
+span.eqno {
+ float: right;
+}
+
+img.logo {
+ border: 0;
+}
+
+span.raise {
+ vertical-align:super;
+ font-size: .7em;
+}
+
+ul {
+ list-style-type: disc;
+}
+
+
diff --git a/doc/html/_static/doctools.js b/doc/html/_static/doctools.js
new file mode 100644
index 0000000..c7bfe76
--- /dev/null
+++ b/doc/html/_static/doctools.js
@@ -0,0 +1,263 @@
+/*
+ * doctools.js
+ * ~~~~~~~~~~~
+ *
+ * Sphinx JavaScript utilities for all documentation.
+ *
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/**
+ * select a different prefix for underscore
+ */
+$u = _.noConflict();
+
+/**
+ * make the code below compatible with browsers without
+ * an installed firebug like debugger
+if (!window.console || !console.firebug) {
+ var names = ["log", "debug", "info", "warn", "error", "assert", "dir",
+ "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace",
+ "profile", "profileEnd"];
+ window.console = {};
+ for (var i = 0; i < names.length; ++i)
+ window.console[names[i]] = function() {};
+}
+ */
+
+/**
+ * small helper function to urldecode strings
+ */
+jQuery.urldecode = function(x) {
+ return decodeURIComponent(x).replace(/\+/g, ' ');
+};
+
+/**
+ * small helper function to urlencode strings
+ */
+jQuery.urlencode = encodeURIComponent;
+
+/**
+ * This function returns the parsed url parameters of the
+ * current request. Multiple values per key are supported,
+ * it will always return arrays of strings for the value parts.
+ */
+jQuery.getQueryParameters = function(s) {
+ if (typeof s == 'undefined')
+ s = document.location.search;
+ var parts = s.substr(s.indexOf('?') + 1).split('&');
+ var result = {};
+ for (var i = 0; i < parts.length; i++) {
+ var tmp = parts[i].split('=', 2);
+ var key = jQuery.urldecode(tmp[0]);
+ var value = jQuery.urldecode(tmp[1]);
+ if (key in result)
+ result[key].push(value);
+ else
+ result[key] = [value];
+ }
+ return result;
+};
+
+/**
+ * highlight a given string on a jquery object by wrapping it in
+ * span elements with the given class name.
+ */
+jQuery.fn.highlightText = function(text, className) {
+ function highlight(node) {
+ if (node.nodeType == 3) {
+ var val = node.nodeValue;
+ var pos = val.toLowerCase().indexOf(text);
+ if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
+ var span = document.createElement("span");
+ span.className = className;
+ span.appendChild(document.createTextNode(val.substr(pos, text.length)));
+ node.parentNode.insertBefore(span, node.parentNode.insertBefore(
+ document.createTextNode(val.substr(pos + text.length)),
+ node.nextSibling));
+ node.nodeValue = val.substr(0, pos);
+ }
+ }
+ else if (!jQuery(node).is("button, select, textarea")) {
+ jQuery.each(node.childNodes, function() {
+ highlight(this);
+ });
+ }
+ }
+ return this.each(function() {
+ highlight(this);
+ });
+};
+
+/*
+ * backward compatibility for jQuery.browser
+ * This will be supported until firefox bug is fixed.
+ */
+if (!jQuery.browser) {
+ jQuery.uaMatch = function(ua) {
+ ua = ua.toLowerCase();
+
+ var match = /(chrome)[ \/]([\w.]+)/.exec(ua) ||
+ /(webkit)[ \/]([\w.]+)/.exec(ua) ||
+ /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
+ /(msie) ([\w.]+)/.exec(ua) ||
+ ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
+ [];
+
+ return {
+ browser: match[ 1 ] || "",
+ version: match[ 2 ] || "0"
+ };
+ };
+ jQuery.browser = {};
+ jQuery.browser[jQuery.uaMatch(navigator.userAgent).browser] = true;
+}
+
+/**
+ * Small JavaScript module for the documentation.
+ */
+var Documentation = {
+
+ init : function() {
+ this.fixFirefoxAnchorBug();
+ this.highlightSearchWords();
+ this.initIndexTable();
+ },
+
+ /**
+ * i18n support
+ */
+ TRANSLATIONS : {},
+ PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
+ LOCALE : 'unknown',
+
+ // gettext and ngettext don't access this so that the functions
+ // can safely bound to a different name (_ = Documentation.gettext)
+ gettext : function(string) {
+ var translated = Documentation.TRANSLATIONS[string];
+ if (typeof translated == 'undefined')
+ return string;
+ return (typeof translated == 'string') ? translated : translated[0];
+ },
+
+ ngettext : function(singular, plural, n) {
+ var translated = Documentation.TRANSLATIONS[singular];
+ if (typeof translated == 'undefined')
+ return (n == 1) ? singular : plural;
+ return translated[Documentation.PLURALEXPR(n)];
+ },
+
+ addTranslations : function(catalog) {
+ for (var key in catalog.messages)
+ this.TRANSLATIONS[key] = catalog.messages[key];
+ this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
+ this.LOCALE = catalog.locale;
+ },
+
+ /**
+ * add context elements like header anchor links
+ */
+ addContextElements : function() {
+ $('div[id] > :header:first').each(function() {
+ $('<a class="headerlink">\u00B6</a>').
+ attr('href', '#' + this.id).
+ attr('title', _('Permalink to this headline')).
+ appendTo(this);
+ });
+ $('dt[id]').each(function() {
+ $('<a class="headerlink">\u00B6</a>').
+ attr('href', '#' + this.id).
+ attr('title', _('Permalink to this definition')).
+ appendTo(this);
+ });
+ },
+
+ /**
+ * workaround a firefox stupidity
+ * see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075
+ */
+ fixFirefoxAnchorBug : function() {
+ if (document.location.hash)
+ window.setTimeout(function() {
+ document.location.href += '';
+ }, 10);
+ },
+
+ /**
+ * highlight the search words provided in the url in the text
+ */
+ highlightSearchWords : function() {
+ var params = $.getQueryParameters();
+ var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
+ if (terms.length) {
+ var body = $('div.body');
+ if (!body.length) {
+ body = $('body');
+ }
+ window.setTimeout(function() {
+ $.each(terms, function() {
+ body.highlightText(this.toLowerCase(), 'highlighted');
+ });
+ }, 10);
+ $('<p class="highlight-link"><a href="javascript:Documentation.' +
+ 'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>')
+ .appendTo($('#searchbox'));
+ }
+ },
+
+ /**
+ * init the domain index toggle buttons
+ */
+ initIndexTable : function() {
+ var togglers = $('img.toggler').click(function() {
+ var src = $(this).attr('src');
+ var idnum = $(this).attr('id').substr(7);
+ $('tr.cg-' + idnum).toggle();
+ if (src.substr(-9) == 'minus.png')
+ $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
+ else
+ $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
+ }).css('display', '');
+ if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) {
+ togglers.click();
+ }
+ },
+
+ /**
+ * helper function to hide the search marks again
+ */
+ hideSearchWords : function() {
+ $('#searchbox .highlight-link').fadeOut(300);
+ $('span.highlighted').removeClass('highlighted');
+ },
+
+ /**
+ * make the url absolute
+ */
+ makeURL : function(relativeURL) {
+ return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL;
+ },
+
+ /**
+ * get the current relative url
+ */
+ getCurrentURL : function() {
+ var path = document.location.pathname;
+ var parts = path.split(/\//);
+ $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
+ if (this == '..')
+ parts.pop();
+ });
+ var url = parts.join('/');
+ return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
+ }
+};
+
+// quick alias for translations
+_ = Documentation.gettext;
+
+$(document).ready(function() {
+ Documentation.init();
+});
diff --git a/doc/html/_static/down-pressed.png b/doc/html/_static/down-pressed.png
new file mode 100644
index 0000000..7c30d00
Binary files /dev/null and b/doc/html/_static/down-pressed.png differ
diff --git a/doc/html/_static/down.png b/doc/html/_static/down.png
new file mode 100644
index 0000000..f48098a
Binary files /dev/null and b/doc/html/_static/down.png differ
diff --git a/doc/html/_static/file.png b/doc/html/_static/file.png
new file mode 100644
index 0000000..254c60b
Binary files /dev/null and b/doc/html/_static/file.png differ
diff --git a/doc/html/_static/fonts/FontAwesome.otf b/doc/html/_static/fonts/FontAwesome.otf
new file mode 100644
index 0000000..8b0f54e
Binary files /dev/null and b/doc/html/_static/fonts/FontAwesome.otf differ
diff --git a/doc/html/_static/fonts/fontawesome-webfont.eot b/doc/html/_static/fonts/fontawesome-webfont.eot
new file mode 100644
index 0000000..7c79c6a
Binary files /dev/null and b/doc/html/_static/fonts/fontawesome-webfont.eot differ
diff --git a/doc/html/_static/fonts/fontawesome-webfont.svg b/doc/html/_static/fonts/fontawesome-webfont.svg
new file mode 100644
index 0000000..45fdf33
--- /dev/null
+++ b/doc/html/_static/fonts/fontawesome-webfont.svg
@@ -0,0 +1,414 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="fontawesomeregular" horiz-adv-x="1536" >
+<font-face units-per-em="1792" ascent="1536" descent="-256" />
+<missing-glyph horiz-adv-x="448" />
+<glyph unicode=" " horiz-adv-x="448" />
+<glyph unicode="	" horiz-adv-x="448" />
+<glyph unicode=" " horiz-adv-x="448" />
+<glyph unicode="¨" horiz-adv-x="1792" />
+<glyph unicode="©" horiz-adv-x="1792" />
+<glyph unicode="®" horiz-adv-x="1792" />
+<glyph unicode="´" horiz-adv-x="1792" />
+<glyph unicode="Æ" horiz-adv-x="1792" />
+<glyph unicode=" " horiz-adv-x="768" />
+<glyph unicode=" " />
+<glyph unicode=" " horiz-adv-x="768" />
+<glyph unicode=" " />
+<glyph unicode=" " horiz-adv-x="512" />
+<glyph unicode=" " horiz-adv-x="384" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode=" " horiz-adv-x="192" />
+<glyph unicode=" " horiz-adv-x="307" />
+<glyph unicode=" " horiz-adv-x="85" />
+<glyph unicode=" " horiz-adv-x="307" />
+<glyph unicode=" " horiz-adv-x="384" />
+<glyph unicode="™" horiz-adv-x="1792" />
+<glyph unicode="∞" horiz-adv-x="1792" />
+<glyph unicode="≠" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+<glyph unicode="" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 [...]
+<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t [...]
+<glyph unicode="" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
+<glyph unicode="" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t2 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q4 [...]
+<glyph unicode="" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
+<glyph unicode="" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+<glyph unicode="" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 2 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 [...]
+<glyph unicode="" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -1 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 [...]
+<glyph unicode="" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+<glyph unicode="" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+<glyph unicode="" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+<glyph unicode="" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l7 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 - [...]
+<glyph unicode="" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q- [...]
+<glyph unicode="" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 [...]
+<glyph unicode="" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -7 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q- [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
+<glyph unicode="" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+<glyph unicode="" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+<glyph unicode="" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 12 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
+<glyph unicode="" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+<glyph unicode="" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
+<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
+<glyph unicode="" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 - [...]
+<glyph unicode="" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-38 [...]
+<glyph unicode="" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h [...]
+<glyph unicode="" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385. [...]
+<glyph unicode="" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+<glyph unicode="" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
+<glyph unicode="" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+<glyph unicode="" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+<glyph unicode="" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 3 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150. [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+<glyph unicode="" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h28 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -1 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+<glyph unicode="" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t [...]
+<glyph unicode="" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 [...]
+<glyph unicode="" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 4 [...]
+<glyph unicode="" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h [...]
+<glyph unicode="" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -6 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t4 [...]
+<glyph unicode="" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q2 [...]
+<glyph unicode="" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -2 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 4 [...]
+<glyph unicode="" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 [...]
+<glyph unicode="" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t- [...]
+<glyph unicode="" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216. [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+<glyph unicode="" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
+<glyph unicode="" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 - [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5 [...]
+<glyph unicode="" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q- [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117 [...]
+<glyph unicode="" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-1 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32z [...]
+<glyph unicode="" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 - [...]
+<glyph unicode="" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -4 [...]
+<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+<glyph unicode="" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -7 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3. [...]
+<glyph unicode="" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
+<glyph unicode="" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+<glyph unicode="" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 [...]
+<glyph unicode="" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 [...]
+<glyph unicode="" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22. [...]
+<glyph unicode="" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t- [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -3 [...]
+<glyph unicode="" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -1 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -2 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 [...]
+<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11 [...]
+<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 - [...]
+<glyph unicode="" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -1 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t11 [...]
+<glyph unicode="" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q [...]
+<glyph unicode="" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h [...]
+<glyph unicode="" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 2 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+<glyph unicode="" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
+<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t1 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 15 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
+<glyph unicode="" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+<glyph unicode="" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+<glyph unicode="" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+<glyph unicode="" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 [...]
+<glyph unicode="" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 [...]
+<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+<glyph unicode="" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM16 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 [...]
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-2 [...]
+<glyph unicode="" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248 [...]
+<glyph unicode="" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136. [...]
+<glyph unicode="" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -1 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16z [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -9 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q [...]
+<glyph unicode="" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
+<glyph unicode="" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 - [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 13 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 [...]
+<glyph unicode="" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t- [...]
+<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t- [...]
+<glyph unicode="" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t [...]
+<glyph unicode="" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+<glyph unicode="" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-2 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+<glyph unicode="" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+<glyph unicode="" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+<glyph unicode="" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 [...]
+<glyph unicode="" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
+<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 2 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+<glyph unicode="" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23z [...]
+<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+<glyph unicode="" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+<glyph unicode="" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 [...]
+<glyph unicode="" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+<glyph unicode="" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-1 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l- [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 [...]
+<glyph unicode="" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 [...]
+<glyph unicode="" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -4 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 [...]
+<glyph unicode="" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86 [...]
+<glyph unicode="" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
+<glyph unicode="" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
+<glyph unicode="" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+<glyph unicode="" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
+<glyph unicode="" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-11 [...]
+<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+<glyph unicode="" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q- [...]
+<glyph unicode="" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 4 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
+<glyph unicode="" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+<glyph unicode="" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+<glyph unicode="" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 [...]
+<glyph unicode="" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69 [...]
+<glyph unicode="" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q [...]
+<glyph unicode="" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 - [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l [...]
+<glyph unicode="" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65. [...]
+<glyph unicode="" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 2 [...]
+<glyph unicode="" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 [...]
+<glyph unicode="" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
+<glyph unicode="" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455 [...]
+<glyph unicode="" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t7 [...]
+<glyph unicode="" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 20 [...]
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/doc/html/_static/fonts/fontawesome-webfont.ttf b/doc/html/_static/fonts/fontawesome-webfont.ttf
new file mode 100644
index 0000000..e89738d
Binary files /dev/null and b/doc/html/_static/fonts/fontawesome-webfont.ttf differ
diff --git a/doc/html/_static/fonts/fontawesome-webfont.woff b/doc/html/_static/fonts/fontawesome-webfont.woff
new file mode 100644
index 0000000..8c1748a
Binary files /dev/null and b/doc/html/_static/fonts/fontawesome-webfont.woff differ
diff --git a/doc/html/_static/jquery-1.11.1.js b/doc/html/_static/jquery-1.11.1.js
new file mode 100644
index 0000000..d4b67f7
--- /dev/null
+++ b/doc/html/_static/jquery-1.11.1.js
@@ -0,0 +1,10308 @@
+/*!
+ * jQuery JavaScript Library v1.11.1
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-05-01T17:42Z
+ */
+
+(function( global, factory ) {
+
+ if ( typeof module === "object" && typeof module.exports === "object" ) {
+ // For CommonJS and CommonJS-like environments where a proper window is present,
+ // execute the factory and get jQuery
+ // For environments that do not inherently posses a window with a document
+ // (such as Node.js), expose a jQuery-making factory as module.exports
+ // This accentuates the need for the creation of a real window
+ // e.g. var jQuery = require("jquery")(window);
+ // See ticket #14549 for more info
+ module.exports = global.document ?
+ factory( global, true ) :
+ function( w ) {
+ if ( !w.document ) {
+ throw new Error( "jQuery requires a window with a document" );
+ }
+ return factory( w );
+ };
+ } else {
+ factory( global );
+ }
+
+// Pass this if window is not defined yet
+}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Can't do this because several apps including ASP.NET trace
+// the stack via arguments.caller.callee and Firefox dies if
+// you try to trace through "use strict" call chains. (#13335)
+// Support: Firefox 18+
+//
+
+var deletedIds = [];
+
+var slice = deletedIds.slice;
+
+var concat = deletedIds.concat;
+
+var push = deletedIds.push;
+
+var indexOf = deletedIds.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var support = {};
+
+
+
+var
+ version = "1.11.1",
+
+ // Define a local copy of jQuery
+ jQuery = function( selector, context ) {
+ // The jQuery object is actually just the init constructor 'enhanced'
+ // Need init if jQuery is called (just allow error to be thrown if not included)
+ return new jQuery.fn.init( selector, context );
+ },
+
+ // Support: Android<4.1, IE<9
+ // Make sure we trim BOM and NBSP
+ rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+ // Matches dashed string for camelizing
+ rmsPrefix = /^-ms-/,
+ rdashAlpha = /-([\da-z])/gi,
+
+ // Used by jQuery.camelCase as callback to replace()
+ fcamelCase = function( all, letter ) {
+ return letter.toUpperCase();
+ };
+
+jQuery.fn = jQuery.prototype = {
+ // The current version of jQuery being used
+ jquery: version,
+
+ constructor: jQuery,
+
+ // Start with an empty selector
+ selector: "",
+
+ // The default length of a jQuery object is 0
+ length: 0,
+
+ toArray: function() {
+ return slice.call( this );
+ },
+
+ // Get the Nth element in the matched element set OR
+ // Get the whole matched element set as a clean array
+ get: function( num ) {
+ return num != null ?
+
+ // Return just the one element from the set
+ ( num < 0 ? this[ num + this.length ] : this[ num ] ) :
+
+ // Return all the elements in a clean array
+ slice.call( this );
+ },
+
+ // Take an array of elements and push it onto the stack
+ // (returning the new matched element set)
+ pushStack: function( elems ) {
+
+ // Build a new jQuery matched element set
+ var ret = jQuery.merge( this.constructor(), elems );
+
+ // Add the old object onto the stack (as a reference)
+ ret.prevObject = this;
+ ret.context = this.context;
+
+ // Return the newly-formed element set
+ return ret;
+ },
+
+ // Execute a callback for every element in the matched set.
+ // (You can seed the arguments with an array of args, but this is
+ // only used internally.)
+ each: function( callback, args ) {
+ return jQuery.each( this, callback, args );
+ },
+
+ map: function( callback ) {
+ return this.pushStack( jQuery.map(this, function( elem, i ) {
+ return callback.call( elem, i, elem );
+ }));
+ },
+
+ slice: function() {
+ return this.pushStack( slice.apply( this, arguments ) );
+ },
+
+ first: function() {
+ return this.eq( 0 );
+ },
+
+ last: function() {
+ return this.eq( -1 );
+ },
+
+ eq: function( i ) {
+ var len = this.length,
+ j = +i + ( i < 0 ? len : 0 );
+ return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
+ },
+
+ end: function() {
+ return this.prevObject || this.constructor(null);
+ },
+
+ // For internal use only.
+ // Behaves like an Array's method, not like a jQuery method.
+ push: push,
+ sort: deletedIds.sort,
+ splice: deletedIds.splice
+};
+
+jQuery.extend = jQuery.fn.extend = function() {
+ var src, copyIsArray, copy, name, options, clone,
+ target = arguments[0] || {},
+ i = 1,
+ length = arguments.length,
+ deep = false;
+
+ // Handle a deep copy situation
+ if ( typeof target === "boolean" ) {
+ deep = target;
+
+ // skip the boolean and the target
+ target = arguments[ i ] || {};
+ i++;
+ }
+
+ // Handle case when target is a string or something (possible in deep copy)
+ if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+ target = {};
+ }
+
+ // extend jQuery itself if only one argument is passed
+ if ( i === length ) {
+ target = this;
+ i--;
+ }
+
+ for ( ; i < length; i++ ) {
+ // Only deal with non-null/undefined values
+ if ( (options = arguments[ i ]) != null ) {
+ // Extend the base object
+ for ( name in options ) {
+ src = target[ name ];
+ copy = options[ name ];
+
+ // Prevent never-ending loop
+ if ( target === copy ) {
+ continue;
+ }
+
+ // Recurse if we're merging plain objects or arrays
+ if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+ if ( copyIsArray ) {
+ copyIsArray = false;
+ clone = src && jQuery.isArray(src) ? src : [];
+
+ } else {
+ clone = src && jQuery.isPlainObject(src) ? src : {};
+ }
+
+ // Never move original objects, clone them
+ target[ name ] = jQuery.extend( deep, clone, copy );
+
+ // Don't bring in undefined values
+ } else if ( copy !== undefined ) {
+ target[ name ] = copy;
+ }
+ }
+ }
+ }
+
+ // Return the modified object
+ return target;
+};
+
+jQuery.extend({
+ // Unique for each copy of jQuery on the page
+ expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
+
+ // Assume jQuery is ready without the ready module
+ isReady: true,
+
+ error: function( msg ) {
+ throw new Error( msg );
+ },
+
+ noop: function() {},
+
+ // See test/unit/core.js for details concerning isFunction.
+ // Since version 1.3, DOM methods and functions like alert
+ // aren't supported. They return false on IE (#2968).
+ isFunction: function( obj ) {
+ return jQuery.type(obj) === "function";
+ },
+
+ isArray: Array.isArray || function( obj ) {
+ return jQuery.type(obj) === "array";
+ },
+
+ isWindow: function( obj ) {
+ /* jshint eqeqeq: false */
+ return obj != null && obj == obj.window;
+ },
+
+ isNumeric: function( obj ) {
+ // parseFloat NaNs numeric-cast false positives (null|true|false|"")
+ // ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+ // subtraction forces infinities to NaN
+ return !jQuery.isArray( obj ) && obj - parseFloat( obj ) >= 0;
+ },
+
+ isEmptyObject: function( obj ) {
+ var name;
+ for ( name in obj ) {
+ return false;
+ }
+ return true;
+ },
+
+ isPlainObject: function( obj ) {
+ var key;
+
+ // Must be an Object.
+ // Because of IE, we also have to check the presence of the constructor property.
+ // Make sure that DOM nodes and window objects don't pass through, as well
+ if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+ return false;
+ }
+
+ try {
+ // Not own constructor property must be Object
+ if ( obj.constructor &&
+ !hasOwn.call(obj, "constructor") &&
+ !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+ return false;
+ }
+ } catch ( e ) {
+ // IE8,9 Will throw exceptions on certain host objects #9897
+ return false;
+ }
+
+ // Support: IE<9
+ // Handle iteration over inherited properties before own properties.
+ if ( support.ownLast ) {
+ for ( key in obj ) {
+ return hasOwn.call( obj, key );
+ }
+ }
+
+ // Own properties are enumerated firstly, so to speed up,
+ // if last one is own, then all properties are own.
+ for ( key in obj ) {}
+
+ return key === undefined || hasOwn.call( obj, key );
+ },
+
+ type: function( obj ) {
+ if ( obj == null ) {
+ return obj + "";
+ }
+ return typeof obj === "object" || typeof obj === "function" ?
+ class2type[ toString.call(obj) ] || "object" :
+ typeof obj;
+ },
+
+ // Evaluates a script in a global context
+ // Workarounds based on findings by Jim Driscoll
+ // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+ globalEval: function( data ) {
+ if ( data && jQuery.trim( data ) ) {
+ // We use execScript on Internet Explorer
+ // We use an anonymous function so that context is window
+ // rather than jQuery in Firefox
+ ( window.execScript || function( data ) {
+ window[ "eval" ].call( window, data );
+ } )( data );
+ }
+ },
+
+ // Convert dashed to camelCase; used by the css and data modules
+ // Microsoft forgot to hump their vendor prefix (#9572)
+ camelCase: function( string ) {
+ return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+ },
+
+ nodeName: function( elem, name ) {
+ return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+ },
+
+ // args is for internal usage only
+ each: function( obj, callback, args ) {
+ var value,
+ i = 0,
+ length = obj.length,
+ isArray = isArraylike( obj );
+
+ if ( args ) {
+ if ( isArray ) {
+ for ( ; i < length; i++ ) {
+ value = callback.apply( obj[ i ], args );
+
+ if ( value === false ) {
+ break;
+ }
+ }
+ } else {
+ for ( i in obj ) {
+ value = callback.apply( obj[ i ], args );
+
+ if ( value === false ) {
+ break;
+ }
+ }
+ }
+
+ // A special, fast, case for the most common use of each
+ } else {
+ if ( isArray ) {
+ for ( ; i < length; i++ ) {
+ value = callback.call( obj[ i ], i, obj[ i ] );
+
+ if ( value === false ) {
+ break;
+ }
+ }
+ } else {
+ for ( i in obj ) {
+ value = callback.call( obj[ i ], i, obj[ i ] );
+
+ if ( value === false ) {
+ break;
+ }
+ }
+ }
+ }
+
+ return obj;
+ },
+
+ // Support: Android<4.1, IE<9
+ trim: function( text ) {
+ return text == null ?
+ "" :
+ ( text + "" ).replace( rtrim, "" );
+ },
+
+ // results is for internal usage only
+ makeArray: function( arr, results ) {
+ var ret = results || [];
+
+ if ( arr != null ) {
+ if ( isArraylike( Object(arr) ) ) {
+ jQuery.merge( ret,
+ typeof arr === "string" ?
+ [ arr ] : arr
+ );
+ } else {
+ push.call( ret, arr );
+ }
+ }
+
+ return ret;
+ },
+
+ inArray: function( elem, arr, i ) {
+ var len;
+
+ if ( arr ) {
+ if ( indexOf ) {
+ return indexOf.call( arr, elem, i );
+ }
+
+ len = arr.length;
+ i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+ for ( ; i < len; i++ ) {
+ // Skip accessing in sparse arrays
+ if ( i in arr && arr[ i ] === elem ) {
+ return i;
+ }
+ }
+ }
+
+ return -1;
+ },
+
+ merge: function( first, second ) {
+ var len = +second.length,
+ j = 0,
+ i = first.length;
+
+ while ( j < len ) {
+ first[ i++ ] = second[ j++ ];
+ }
+
+ // Support: IE<9
+ // Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
+ if ( len !== len ) {
+ while ( second[j] !== undefined ) {
+ first[ i++ ] = second[ j++ ];
+ }
+ }
+
+ first.length = i;
+
+ return first;
+ },
+
+ grep: function( elems, callback, invert ) {
+ var callbackInverse,
+ matches = [],
+ i = 0,
+ length = elems.length,
+ callbackExpect = !invert;
+
+ // Go through the array, only saving the items
+ // that pass the validator function
+ for ( ; i < length; i++ ) {
+ callbackInverse = !callback( elems[ i ], i );
+ if ( callbackInverse !== callbackExpect ) {
+ matches.push( elems[ i ] );
+ }
+ }
+
+ return matches;
+ },
+
+ // arg is for internal usage only
+ map: function( elems, callback, arg ) {
+ var value,
+ i = 0,
+ length = elems.length,
+ isArray = isArraylike( elems ),
+ ret = [];
+
+ // Go through the array, translating each of the items to their new values
+ if ( isArray ) {
+ for ( ; i < length; i++ ) {
+ value = callback( elems[ i ], i, arg );
+
+ if ( value != null ) {
+ ret.push( value );
+ }
+ }
+
+ // Go through every key on the object,
+ } else {
+ for ( i in elems ) {
+ value = callback( elems[ i ], i, arg );
+
+ if ( value != null ) {
+ ret.push( value );
+ }
+ }
+ }
+
+ // Flatten any nested arrays
+ return concat.apply( [], ret );
+ },
+
+ // A global GUID counter for objects
+ guid: 1,
+
+ // Bind a function to a context, optionally partially applying any
+ // arguments.
+ proxy: function( fn, context ) {
+ var args, proxy, tmp;
+
+ if ( typeof context === "string" ) {
+ tmp = fn[ context ];
+ context = fn;
+ fn = tmp;
+ }
+
+ // Quick check to determine if target is callable, in the spec
+ // this throws a TypeError, but we will just return undefined.
+ if ( !jQuery.isFunction( fn ) ) {
+ return undefined;
+ }
+
+ // Simulated bind
+ args = slice.call( arguments, 2 );
+ proxy = function() {
+ return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
+ };
+
+ // Set the guid of unique handler to the same of original handler, so it can be removed
+ proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+ return proxy;
+ },
+
+ now: function() {
+ return +( new Date() );
+ },
+
+ // jQuery.support is not used in Core but other projects attach their
+ // properties to it so it needs to exist.
+ support: support
+});
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+ class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+function isArraylike( obj ) {
+ var length = obj.length,
+ type = jQuery.type( obj );
+
+ if ( type === "function" || jQuery.isWindow( obj ) ) {
+ return false;
+ }
+
+ if ( obj.nodeType === 1 && length ) {
+ return true;
+ }
+
+ return type === "array" || length === 0 ||
+ typeof length === "number" && length > 0 && ( length - 1 ) in obj;
+}
+var Sizzle =
+/*!
+ * Sizzle CSS Selector Engine v1.10.19
+ * http://sizzlejs.com/
+ *
+ * Copyright 2013 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-04-18
+ */
+(function( window ) {
+
+var i,
+ support,
+ Expr,
+ getText,
+ isXML,
+ tokenize,
+ compile,
+ select,
+ outermostContext,
+ sortInput,
+ hasDuplicate,
+
+ // Local document vars
+ setDocument,
+ document,
+ docElem,
+ documentIsHTML,
+ rbuggyQSA,
+ rbuggyMatches,
+ matches,
+ contains,
+
+ // Instance-specific data
+ expando = "sizzle" + -(new Date()),
+ preferredDoc = window.document,
+ dirruns = 0,
+ done = 0,
+ classCache = createCache(),
+ tokenCache = createCache(),
+ compilerCache = createCache(),
+ sortOrder = function( a, b ) {
+ if ( a === b ) {
+ hasDuplicate = true;
+ }
+ return 0;
+ },
+
+ // General-purpose constants
+ strundefined = typeof undefined,
+ MAX_NEGATIVE = 1 << 31,
+
+ // Instance methods
+ hasOwn = ({}).hasOwnProperty,
+ arr = [],
+ pop = arr.pop,
+ push_native = arr.push,
+ push = arr.push,
+ slice = arr.slice,
+ // Use a stripped-down indexOf if we can't use a native one
+ indexOf = arr.indexOf || function( elem ) {
+ var i = 0,
+ len = this.length;
+ for ( ; i < len; i++ ) {
+ if ( this[i] === elem ) {
+ return i;
+ }
+ }
+ return -1;
+ },
+
+ booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+
+ // Regular expressions
+
+ // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+ whitespace = "[\\x20\\t\\r\\n\\f]",
+ // http://www.w3.org/TR/css3-syntax/#characters
+ characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+
+ // Loosely modeled on CSS identifier characters
+ // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
+ // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+ identifier = characterEncoding.replace( "w", "w#" ),
+
+ // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+ attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
+ // Operator (capture 2)
+ "*([*^$|!~]?=)" + whitespace +
+ // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+ "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+ "*\\]",
+
+ pseudos = ":(" + characterEncoding + ")(?:\\((" +
+ // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+ // 1. quoted (capture 3; capture 4 or capture 5)
+ "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+ // 2. simple (capture 6)
+ "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+ // 3. anything else (capture 2)
+ ".*" +
+ ")\\)|)",
+
+ // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+ rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+ rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+ rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+
+ rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
+
+ rpseudo = new RegExp( pseudos ),
+ ridentifier = new RegExp( "^" + identifier + "$" ),
+
+ matchExpr = {
+ "ID": new RegExp( "^#(" + characterEncoding + ")" ),
+ "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
+ "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+ "ATTR": new RegExp( "^" + attributes ),
+ "PSEUDO": new RegExp( "^" + pseudos ),
+ "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+ "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+ "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+ "bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+ // For use in libraries implementing .is()
+ // We use this for POS matching in `select`
+ "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+ whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+ },
+
+ rinputs = /^(?:input|select|textarea|button)$/i,
+ rheader = /^h\d$/i,
+
+ rnative = /^[^{]+\{\s*\[native \w/,
+
+ // Easily-parseable/retrievable ID or TAG or CLASS selectors
+ rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+ rsibling = /[+~]/,
+ rescape = /'|\\/g,
+
+ // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+ runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
+ funescape = function( _, escaped, escapedWhitespace ) {
+ var high = "0x" + escaped - 0x10000;
+ // NaN means non-codepoint
+ // Support: Firefox<24
+ // Workaround erroneous numeric interpretation of +"0x"
+ return high !== high || escapedWhitespace ?
+ escaped :
+ high < 0 ?
+ // BMP codepoint
+ String.fromCharCode( high + 0x10000 ) :
+ // Supplemental Plane codepoint (surrogate pair)
+ String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+ };
+
+// Optimize for push.apply( _, NodeList )
+try {
+ push.apply(
+ (arr = slice.call( preferredDoc.childNodes )),
+ preferredDoc.childNodes
+ );
+ // Support: Android<4.0
+ // Detect silently failing push.apply
+ arr[ preferredDoc.childNodes.length ].nodeType;
+} catch ( e ) {
+ push = { apply: arr.length ?
+
+ // Leverage slice if possible
+ function( target, els ) {
+ push_native.apply( target, slice.call(els) );
+ } :
+
+ // Support: IE<9
+ // Otherwise append directly
+ function( target, els ) {
+ var j = target.length,
+ i = 0;
+ // Can't trust NodeList.length
+ while ( (target[j++] = els[i++]) ) {}
+ target.length = j - 1;
+ }
+ };
+}
+
+function Sizzle( selector, context, results, seed ) {
+ var match, elem, m, nodeType,
+ // QSA vars
+ i, groups, old, nid, newContext, newSelector;
+
+ if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+ setDocument( context );
+ }
+
+ context = context || document;
+ results = results || [];
+
+ if ( !selector || typeof selector !== "string" ) {
+ return results;
+ }
+
+ if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
+ return [];
+ }
+
+ if ( documentIsHTML && !seed ) {
+
+ // Shortcuts
+ if ( (match = rquickExpr.exec( selector )) ) {
+ // Speed-up: Sizzle("#ID")
+ if ( (m = match[1]) ) {
+ if ( nodeType === 9 ) {
+ elem = context.getElementById( m );
+ // Check parentNode to catch when Blackberry 4.6 returns
+ // nodes that are no longer in the document (jQuery #6963)
+ if ( elem && elem.parentNode ) {
+ // Handle the case where IE, Opera, and Webkit return items
+ // by name instead of ID
+ if ( elem.id === m ) {
+ results.push( elem );
+ return results;
+ }
+ } else {
+ return results;
+ }
+ } else {
+ // Context is not a document
+ if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
+ contains( context, elem ) && elem.id === m ) {
+ results.push( elem );
+ return results;
+ }
+ }
+
+ // Speed-up: Sizzle("TAG")
+ } else if ( match[2] ) {
+ push.apply( results, context.getElementsByTagName( selector ) );
+ return results;
+
+ // Speed-up: Sizzle(".CLASS")
+ } else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
+ push.apply( results, context.getElementsByClassName( m ) );
+ return results;
+ }
+ }
+
+ // QSA path
+ if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+ nid = old = expando;
+ newContext = context;
+ newSelector = nodeType === 9 && selector;
+
+ // qSA works strangely on Element-rooted queries
+ // We can work around this by specifying an extra ID on the root
+ // and working up from there (Thanks to Andrew Dupont for the technique)
+ // IE 8 doesn't work on object elements
+ if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+ groups = tokenize( selector );
+
+ if ( (old = context.getAttribute("id")) ) {
+ nid = old.replace( rescape, "\\$&" );
+ } else {
+ context.setAttribute( "id", nid );
+ }
+ nid = "[id='" + nid + "'] ";
+
+ i = groups.length;
+ while ( i-- ) {
+ groups[i] = nid + toSelector( groups[i] );
+ }
+ newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
+ newSelector = groups.join(",");
+ }
+
+ if ( newSelector ) {
+ try {
+ push.apply( results,
+ newContext.querySelectorAll( newSelector )
+ );
+ return results;
+ } catch(qsaError) {
+ } finally {
+ if ( !old ) {
+ context.removeAttribute("id");
+ }
+ }
+ }
+ }
+ }
+
+ // All others
+ return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ * deleting the oldest entry
+ */
+function createCache() {
+ var keys = [];
+
+ function cache( key, value ) {
+ // Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+ if ( keys.push( key + " " ) > Expr.cacheLength ) {
+ // Only keep the most recent entries
+ delete cache[ keys.shift() ];
+ }
+ return (cache[ key + " " ] = value);
+ }
+ return cache;
+}
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
+ */
+function markFunction( fn ) {
+ fn[ expando ] = true;
+ return fn;
+}
+
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created div and expects a boolean result
+ */
+function assert( fn ) {
+ var div = document.createElement("div");
+
+ try {
+ return !!fn( div );
+ } catch (e) {
+ return false;
+ } finally {
+ // Remove from its parent by default
+ if ( div.parentNode ) {
+ div.parentNode.removeChild( div );
+ }
+ // release memory in IE
+ div = null;
+ }
+}
+
+/**
+ * Adds the same handler for all of the specified attrs
+ * @param {String} attrs Pipe-separated list of attributes
+ * @param {Function} handler The method that will be applied
+ */
+function addHandle( attrs, handler ) {
+ var arr = attrs.split("|"),
+ i = attrs.length;
+
+ while ( i-- ) {
+ Expr.attrHandle[ arr[i] ] = handler;
+ }
+}
+
+/**
+ * Checks document order of two siblings
+ * @param {Element} a
+ * @param {Element} b
+ * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
+ */
+function siblingCheck( a, b ) {
+ var cur = b && a,
+ diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+ ( ~b.sourceIndex || MAX_NEGATIVE ) -
+ ( ~a.sourceIndex || MAX_NEGATIVE );
+
+ // Use IE sourceIndex if available on both nodes
+ if ( diff ) {
+ return diff;
+ }
+
+ // Check if b follows a
+ if ( cur ) {
+ while ( (cur = cur.nextSibling) ) {
+ if ( cur === b ) {
+ return -1;
+ }
+ }
+ }
+
+ return a ? 1 : -1;
+}
+
+/**
+ * Returns a function to use in pseudos for input types
+ * @param {String} type
+ */
+function createInputPseudo( type ) {
+ return function( elem ) {
+ var name = elem.nodeName.toLowerCase();
+ return name === "input" && elem.type === type;
+ };
+}
+
+/**
+ * Returns a function to use in pseudos for buttons
+ * @param {String} type
+ */
+function createButtonPseudo( type ) {
+ return function( elem ) {
+ var name = elem.nodeName.toLowerCase();
+ return (name === "input" || name === "button") && elem.type === type;
+ };
+}
+
+/**
+ * Returns a function to use in pseudos for positionals
+ * @param {Function} fn
+ */
+function createPositionalPseudo( fn ) {
+ return markFunction(function( argument ) {
+ argument = +argument;
+ return markFunction(function( seed, matches ) {
+ var j,
+ matchIndexes = fn( [], seed.length, argument ),
+ i = matchIndexes.length;
+
+ // Match elements found at the specified indexes
+ while ( i-- ) {
+ if ( seed[ (j = matchIndexes[i]) ] ) {
+ seed[j] = !(matches[j] = seed[j]);
+ }
+ }
+ });
+ });
+}
+
+/**
+ * Checks a node for validity as a Sizzle context
+ * @param {Element|Object=} context
+ * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+ */
+function testContext( context ) {
+ return context && typeof context.getElementsByTagName !== strundefined && context;
+}
+
+// Expose support vars for convenience
+support = Sizzle.support = {};
+
+/**
+ * Detects XML nodes
+ * @param {Element|Object} elem An element or a document
+ * @returns {Boolean} True iff elem is a non-HTML XML node
+ */
+isXML = Sizzle.isXML = function( elem ) {
+ // documentElement is verified for cases where it doesn't yet exist
+ // (such as loading iframes in IE - #4833)
+ var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+ return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+ var hasCompare,
+ doc = node ? node.ownerDocument || node : preferredDoc,
+ parent = doc.defaultView;
+
+ // If no document and documentElement is available, return
+ if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+ return document;
+ }
+
+ // Set our document
+ document = doc;
+ docElem = doc.documentElement;
+
+ // Support tests
+ documentIsHTML = !isXML( doc );
+
+ // Support: IE>8
+ // If iframe document is assigned to "document" variable and if iframe has been reloaded,
+ // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
+ // IE6-8 do not support the defaultView property so parent will be undefined
+ if ( parent && parent !== parent.top ) {
+ // IE11 does not have attachEvent, so all must suffer
+ if ( parent.addEventListener ) {
+ parent.addEventListener( "unload", function() {
+ setDocument();
+ }, false );
+ } else if ( parent.attachEvent ) {
+ parent.attachEvent( "onunload", function() {
+ setDocument();
+ });
+ }
+ }
+
+ /* Attributes
+ ---------------------------------------------------------------------- */
+
+ // Support: IE<8
+ // Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
+ support.attributes = assert(function( div ) {
+ div.className = "i";
+ return !div.getAttribute("className");
+ });
+
+ /* getElement(s)By*
+ ---------------------------------------------------------------------- */
+
+ // Check if getElementsByTagName("*") returns only elements
+ support.getElementsByTagName = assert(function( div ) {
+ div.appendChild( doc.createComment("") );
+ return !div.getElementsByTagName("*").length;
+ });
+
+ // Check if getElementsByClassName can be trusted
+ support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) {
+ div.innerHTML = "<div class='a'></div><div class='a i'></div>";
+
+ // Support: Safari<4
+ // Catch class over-caching
+ div.firstChild.className = "i";
+ // Support: Opera<10
+ // Catch gEBCN failure to find non-leading classes
+ return div.getElementsByClassName("i").length === 2;
+ });
+
+ // Support: IE<10
+ // Check if getElementById returns elements by name
+ // The broken getElementById methods don't pick up programatically-set names,
+ // so use a roundabout getElementsByName test
+ support.getById = assert(function( div ) {
+ docElem.appendChild( div ).id = expando;
+ return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
+ });
+
+ // ID find and filter
+ if ( support.getById ) {
+ Expr.find["ID"] = function( id, context ) {
+ if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
+ var m = context.getElementById( id );
+ // Check parentNode to catch when Blackberry 4.6 returns
+ // nodes that are no longer in the document #6963
+ return m && m.parentNode ? [ m ] : [];
+ }
+ };
+ Expr.filter["ID"] = function( id ) {
+ var attrId = id.replace( runescape, funescape );
+ return function( elem ) {
+ return elem.getAttribute("id") === attrId;
+ };
+ };
+ } else {
+ // Support: IE6/7
+ // getElementById is not reliable as a find shortcut
+ delete Expr.find["ID"];
+
+ Expr.filter["ID"] = function( id ) {
+ var attrId = id.replace( runescape, funescape );
+ return function( elem ) {
+ var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+ return node && node.value === attrId;
+ };
+ };
+ }
+
+ // Tag
+ Expr.find["TAG"] = support.getElementsByTagName ?
+ function( tag, context ) {
+ if ( typeof context.getElementsByTagName !== strundefined ) {
+ return context.getElementsByTagName( tag );
+ }
+ } :
+ function( tag, context ) {
+ var elem,
+ tmp = [],
+ i = 0,
+ results = context.getElementsByTagName( tag );
+
+ // Filter out possible comments
+ if ( tag === "*" ) {
+ while ( (elem = results[i++]) ) {
+ if ( elem.nodeType === 1 ) {
+ tmp.push( elem );
+ }
+ }
+
+ return tmp;
+ }
+ return results;
+ };
+
+ // Class
+ Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+ if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
+ return context.getElementsByClassName( className );
+ }
+ };
+
+ /* QSA/matchesSelector
+ ---------------------------------------------------------------------- */
+
+ // QSA and matchesSelector support
+
+ // matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+ rbuggyMatches = [];
+
+ // qSa(:focus) reports false when true (Chrome 21)
+ // We allow this because of a bug in IE8/9 that throws an error
+ // whenever `document.activeElement` is accessed on an iframe
+ // So, we allow :focus to pass through QSA all the time to avoid the IE error
+ // See http://bugs.jquery.com/ticket/13378
+ rbuggyQSA = [];
+
+ if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
+ // Build QSA regex
+ // Regex strategy adopted from Diego Perini
+ assert(function( div ) {
+ // Select is set to empty string on purpose
+ // This is to test IE's treatment of not explicitly
+ // setting a boolean content attribute,
+ // since its presence should be enough
+ // http://bugs.jquery.com/ticket/12359
+ div.innerHTML = "<select msallowclip=''><option selected=''></option></select>";
+
+ // Support: IE8, Opera 11-12.16
+ // Nothing should be selected when empty strings follow ^= or $= or *=
+ // The test attribute must be unknown in Opera but "safe" for WinRT
+ // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+ if ( div.querySelectorAll("[msallowclip^='']").length ) {
+ rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+ }
+
+ // Support: IE8
+ // Boolean attributes and "value" are not treated correctly
+ if ( !div.querySelectorAll("[selected]").length ) {
+ rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+ }
+
+ // Webkit/Opera - :checked should return selected option elements
+ // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+ // IE8 throws error here and will not see later tests
+ if ( !div.querySelectorAll(":checked").length ) {
+ rbuggyQSA.push(":checked");
+ }
+ });
+
+ assert(function( div ) {
+ // Support: Windows 8 Native Apps
+ // The type and name attributes are restricted during .innerHTML assignment
+ var input = doc.createElement("input");
+ input.setAttribute( "type", "hidden" );
+ div.appendChild( input ).setAttribute( "name", "D" );
+
+ // Support: IE8
+ // Enforce case-sensitivity of name attribute
+ if ( div.querySelectorAll("[name=d]").length ) {
+ rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
+ }
+
+ // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+ // IE8 throws error here and will not see later tests
+ if ( !div.querySelectorAll(":enabled").length ) {
+ rbuggyQSA.push( ":enabled", ":disabled" );
+ }
+
+ // Opera 10-11 does not throw on post-comma invalid pseudos
+ div.querySelectorAll("*,:x");
+ rbuggyQSA.push(",.*:");
+ });
+ }
+
+ if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+ docElem.webkitMatchesSelector ||
+ docElem.mozMatchesSelector ||
+ docElem.oMatchesSelector ||
+ docElem.msMatchesSelector) )) ) {
+
+ assert(function( div ) {
+ // Check to see if it's possible to do matchesSelector
+ // on a disconnected node (IE 9)
+ support.disconnectedMatch = matches.call( div, "div" );
+
+ // This should fail with an exception
+ // Gecko does not error, returns false instead
+ matches.call( div, "[s!='']:x" );
+ rbuggyMatches.push( "!=", pseudos );
+ });
+ }
+
+ rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
+ rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+
+ /* Contains
+ ---------------------------------------------------------------------- */
+ hasCompare = rnative.test( docElem.compareDocumentPosition );
+
+ // Element contains another
+ // Purposefully does not implement inclusive descendent
+ // As in, an element does not contain itself
+ contains = hasCompare || rnative.test( docElem.contains ) ?
+ function( a, b ) {
+ var adown = a.nodeType === 9 ? a.documentElement : a,
+ bup = b && b.parentNode;
+ return a === bup || !!( bup && bup.nodeType === 1 && (
+ adown.contains ?
+ adown.contains( bup ) :
+ a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+ ));
+ } :
+ function( a, b ) {
+ if ( b ) {
+ while ( (b = b.parentNode) ) {
+ if ( b === a ) {
+ return true;
+ }
+ }
+ }
+ return false;
+ };
+
+ /* Sorting
+ ---------------------------------------------------------------------- */
+
+ // Document order sorting
+ sortOrder = hasCompare ?
+ function( a, b ) {
+
+ // Flag for duplicate removal
+ if ( a === b ) {
+ hasDuplicate = true;
+ return 0;
+ }
+
+ // Sort on method existence if only one input has compareDocumentPosition
+ var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
+ if ( compare ) {
+ return compare;
+ }
+
+ // Calculate position if both inputs belong to the same document
+ compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+ a.compareDocumentPosition( b ) :
+
+ // Otherwise we know they are disconnected
+ 1;
+
+ // Disconnected nodes
+ if ( compare & 1 ||
+ (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+ // Choose the first element that is related to our preferred document
+ if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+ return -1;
+ }
+ if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+ return 1;
+ }
+
+ // Maintain original order
+ return sortInput ?
+ ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+ 0;
+ }
+
+ return compare & 4 ? -1 : 1;
+ } :
+ function( a, b ) {
+ // Exit early if the nodes are identical
+ if ( a === b ) {
+ hasDuplicate = true;
+ return 0;
+ }
+
+ var cur,
+ i = 0,
+ aup = a.parentNode,
+ bup = b.parentNode,
+ ap = [ a ],
+ bp = [ b ];
+
+ // Parentless nodes are either documents or disconnected
+ if ( !aup || !bup ) {
+ return a === doc ? -1 :
+ b === doc ? 1 :
+ aup ? -1 :
+ bup ? 1 :
+ sortInput ?
+ ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+ 0;
+
+ // If the nodes are siblings, we can do a quick check
+ } else if ( aup === bup ) {
+ return siblingCheck( a, b );
+ }
+
+ // Otherwise we need full lists of their ancestors for comparison
+ cur = a;
+ while ( (cur = cur.parentNode) ) {
+ ap.unshift( cur );
+ }
+ cur = b;
+ while ( (cur = cur.parentNode) ) {
+ bp.unshift( cur );
+ }
+
+ // Walk down the tree looking for a discrepancy
+ while ( ap[i] === bp[i] ) {
+ i++;
+ }
+
+ return i ?
+ // Do a sibling check if the nodes have a common ancestor
+ siblingCheck( ap[i], bp[i] ) :
+
+ // Otherwise nodes in our document sort first
+ ap[i] === preferredDoc ? -1 :
+ bp[i] === preferredDoc ? 1 :
+ 0;
+ };
+
+ return doc;
+};
+
+Sizzle.matches = function( expr, elements ) {
+ return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+ // Set document vars if needed
+ if ( ( elem.ownerDocument || elem ) !== document ) {
+ setDocument( elem );
+ }
+
+ // Make sure that attribute selectors are quoted
+ expr = expr.replace( rattributeQuotes, "='$1']" );
+
+ if ( support.matchesSelector && documentIsHTML &&
+ ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
+ ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) {
+
+ try {
+ var ret = matches.call( elem, expr );
+
+ // IE 9's matchesSelector returns false on disconnected nodes
+ if ( ret || support.disconnectedMatch ||
+ // As well, disconnected nodes are said to be in a document
+ // fragment in IE 9
+ elem.document && elem.document.nodeType !== 11 ) {
+ return ret;
+ }
+ } catch(e) {}
+ }
+
+ return Sizzle( expr, document, null, [ elem ] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+ // Set document vars if needed
+ if ( ( context.ownerDocument || context ) !== document ) {
+ setDocument( context );
+ }
+ return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+ // Set document vars if needed
+ if ( ( elem.ownerDocument || elem ) !== document ) {
+ setDocument( elem );
+ }
+
+ var fn = Expr.attrHandle[ name.toLowerCase() ],
+ // Don't get fooled by Object.prototype properties (jQuery #13807)
+ val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+ fn( elem, name, !documentIsHTML ) :
+ undefined;
+
+ return val !== undefined ?
+ val :
+ support.attributes || !documentIsHTML ?
+ elem.getAttribute( name ) :
+ (val = elem.getAttributeNode(name)) && val.specified ?
+ val.value :
+ null;
+};
+
+Sizzle.error = function( msg ) {
+ throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+/**
+ * Document sorting and removing duplicates
+ * @param {ArrayLike} results
+ */
+Sizzle.uniqueSort = function( results ) {
+ var elem,
+ duplicates = [],
+ j = 0,
+ i = 0;
+
+ // Unless we *know* we can detect duplicates, assume their presence
+ hasDuplicate = !support.detectDuplicates;
+ sortInput = !support.sortStable && results.slice( 0 );
+ results.sort( sortOrder );
+
+ if ( hasDuplicate ) {
+ while ( (elem = results[i++]) ) {
+ if ( elem === results[ i ] ) {
+ j = duplicates.push( i );
+ }
+ }
+ while ( j-- ) {
+ results.splice( duplicates[ j ], 1 );
+ }
+ }
+
+ // Clear input after sorting to release objects
+ // See https://github.com/jquery/sizzle/pull/225
+ sortInput = null;
+
+ return results;
+};
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+ var node,
+ ret = "",
+ i = 0,
+ nodeType = elem.nodeType;
+
+ if ( !nodeType ) {
+ // If no nodeType, this is expected to be an array
+ while ( (node = elem[i++]) ) {
+ // Do not traverse comment nodes
+ ret += getText( node );
+ }
+ } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+ // Use textContent for elements
+ // innerText usage removed for consistency of new lines (jQuery #11153)
+ if ( typeof elem.textContent === "string" ) {
+ return elem.textContent;
+ } else {
+ // Traverse its children
+ for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+ ret += getText( elem );
+ }
+ }
+ } else if ( nodeType === 3 || nodeType === 4 ) {
+ return elem.nodeValue;
+ }
+ // Do not include comment or processing instruction nodes
+
+ return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+ // Can be adjusted by the user
+ cacheLength: 50,
+
+ createPseudo: markFunction,
+
+ match: matchExpr,
+
+ attrHandle: {},
+
+ find: {},
+
+ relative: {
+ ">": { dir: "parentNode", first: true },
+ " ": { dir: "parentNode" },
+ "+": { dir: "previousSibling", first: true },
+ "~": { dir: "previousSibling" }
+ },
+
+ preFilter: {
+ "ATTR": function( match ) {
+ match[1] = match[1].replace( runescape, funescape );
+
+ // Move the given value to match[3] whether quoted or unquoted
+ match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+
+ if ( match[2] === "~=" ) {
+ match[3] = " " + match[3] + " ";
+ }
+
+ return match.slice( 0, 4 );
+ },
+
+ "CHILD": function( match ) {
+ /* matches from matchExpr["CHILD"]
+ 1 type (only|nth|...)
+ 2 what (child|of-type)
+ 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+ 4 xn-component of xn+y argument ([+-]?\d*n|)
+ 5 sign of xn-component
+ 6 x of xn-component
+ 7 sign of y-component
+ 8 y of y-component
+ */
+ match[1] = match[1].toLowerCase();
+
+ if ( match[1].slice( 0, 3 ) === "nth" ) {
+ // nth-* requires argument
+ if ( !match[3] ) {
+ Sizzle.error( match[0] );
+ }
+
+ // numeric x and y parameters for Expr.filter.CHILD
+ // remember that false/true cast respectively to 0/1
+ match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+ match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+ // other types prohibit arguments
+ } else if ( match[3] ) {
+ Sizzle.error( match[0] );
+ }
+
+ return match;
+ },
+
+ "PSEUDO": function( match ) {
+ var excess,
+ unquoted = !match[6] && match[2];
+
+ if ( matchExpr["CHILD"].test( match[0] ) ) {
+ return null;
+ }
+
+ // Accept quoted arguments as-is
+ if ( match[3] ) {
+ match[2] = match[4] || match[5] || "";
+
+ // Strip excess characters from unquoted arguments
+ } else if ( unquoted && rpseudo.test( unquoted ) &&
+ // Get excess from tokenize (recursively)
+ (excess = tokenize( unquoted, true )) &&
+ // advance to the next closing parenthesis
+ (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+ // excess is a negative index
+ match[0] = match[0].slice( 0, excess );
+ match[2] = unquoted.slice( 0, excess );
+ }
+
+ // Return only captures needed by the pseudo filter method (type and argument)
+ return match.slice( 0, 3 );
+ }
+ },
+
+ filter: {
+
+ "TAG": function( nodeNameSelector ) {
+ var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+ return nodeNameSelector === "*" ?
+ function() { return true; } :
+ function( elem ) {
+ return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+ };
+ },
+
+ "CLASS": function( className ) {
+ var pattern = classCache[ className + " " ];
+
+ return pattern ||
+ (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+ classCache( className, function( elem ) {
+ return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
+ });
+ },
+
+ "ATTR": function( name, operator, check ) {
+ return function( elem ) {
+ var result = Sizzle.attr( elem, name );
+
+ if ( result == null ) {
+ return operator === "!=";
+ }
+ if ( !operator ) {
+ return true;
+ }
+
+ result += "";
+
+ return operator === "=" ? result === check :
+ operator === "!=" ? result !== check :
+ operator === "^=" ? check && result.indexOf( check ) === 0 :
+ operator === "*=" ? check && result.indexOf( check ) > -1 :
+ operator === "$=" ? check && result.slice( -check.length ) === check :
+ operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+ operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+ false;
+ };
+ },
+
+ "CHILD": function( type, what, argument, first, last ) {
+ var simple = type.slice( 0, 3 ) !== "nth",
+ forward = type.slice( -4 ) !== "last",
+ ofType = what === "of-type";
+
+ return first === 1 && last === 0 ?
+
+ // Shortcut for :nth-*(n)
+ function( elem ) {
+ return !!elem.parentNode;
+ } :
+
+ function( elem, context, xml ) {
+ var cache, outerCache, node, diff, nodeIndex, start,
+ dir = simple !== forward ? "nextSibling" : "previousSibling",
+ parent = elem.parentNode,
+ name = ofType && elem.nodeName.toLowerCase(),
+ useCache = !xml && !ofType;
+
+ if ( parent ) {
+
+ // :(first|last|only)-(child|of-type)
+ if ( simple ) {
+ while ( dir ) {
+ node = elem;
+ while ( (node = node[ dir ]) ) {
+ if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+ return false;
+ }
+ }
+ // Reverse direction for :only-* (if we haven't yet done so)
+ start = dir = type === "only" && !start && "nextSibling";
+ }
+ return true;
+ }
+
+ start = [ forward ? parent.firstChild : parent.lastChild ];
+
+ // non-xml :nth-child(...) stores cache data on `parent`
+ if ( forward && useCache ) {
+ // Seek `elem` from a previously-cached index
+ outerCache = parent[ expando ] || (parent[ expando ] = {});
+ cache = outerCache[ type ] || [];
+ nodeIndex = cache[0] === dirruns && cache[1];
+ diff = cache[0] === dirruns && cache[2];
+ node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+ while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+ // Fallback to seeking `elem` from the start
+ (diff = nodeIndex = 0) || start.pop()) ) {
+
+ // When found, cache indexes on `parent` and break
+ if ( node.nodeType === 1 && ++diff && node === elem ) {
+ outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+ break;
+ }
+ }
+
+ // Use previously-cached element index if available
+ } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
+ diff = cache[1];
+
+ // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
+ } else {
+ // Use the same loop as above to seek `elem` from the start
+ while ( (node = ++nodeIndex && node && node[ dir ] ||
+ (diff = nodeIndex = 0) || start.pop()) ) {
+
+ if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
+ // Cache the index of each encountered element
+ if ( useCache ) {
+ (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
+ }
+
+ if ( node === elem ) {
+ break;
+ }
+ }
+ }
+ }
+
+ // Incorporate the offset, then check against cycle size
+ diff -= last;
+ return diff === first || ( diff % first === 0 && diff / first >= 0 );
+ }
+ };
+ },
+
+ "PSEUDO": function( pseudo, argument ) {
+ // pseudo-class names are case-insensitive
+ // http://www.w3.org/TR/selectors/#pseudo-classes
+ // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+ // Remember that setFilters inherits from pseudos
+ var args,
+ fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+ Sizzle.error( "unsupported pseudo: " + pseudo );
+
+ // The user may use createPseudo to indicate that
+ // arguments are needed to create the filter function
+ // just as Sizzle does
+ if ( fn[ expando ] ) {
+ return fn( argument );
+ }
+
+ // But maintain support for old signatures
+ if ( fn.length > 1 ) {
+ args = [ pseudo, pseudo, "", argument ];
+ return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+ markFunction(function( seed, matches ) {
+ var idx,
+ matched = fn( seed, argument ),
+ i = matched.length;
+ while ( i-- ) {
+ idx = indexOf.call( seed, matched[i] );
+ seed[ idx ] = !( matches[ idx ] = matched[i] );
+ }
+ }) :
+ function( elem ) {
+ return fn( elem, 0, args );
+ };
+ }
+
+ return fn;
+ }
+ },
+
+ pseudos: {
+ // Potentially complex pseudos
+ "not": markFunction(function( selector ) {
+ // Trim the selector passed to compile
+ // to avoid treating leading and trailing
+ // spaces as combinators
+ var input = [],
+ results = [],
+ matcher = compile( selector.replace( rtrim, "$1" ) );
+
+ return matcher[ expando ] ?
+ markFunction(function( seed, matches, context, xml ) {
+ var elem,
+ unmatched = matcher( seed, null, xml, [] ),
+ i = seed.length;
+
+ // Match elements unmatched by `matcher`
+ while ( i-- ) {
+ if ( (elem = unmatched[i]) ) {
+ seed[i] = !(matches[i] = elem);
+ }
+ }
+ }) :
+ function( elem, context, xml ) {
+ input[0] = elem;
+ matcher( input, null, xml, results );
+ return !results.pop();
+ };
+ }),
+
+ "has": markFunction(function( selector ) {
+ return function( elem ) {
+ return Sizzle( selector, elem ).length > 0;
+ };
+ }),
+
+ "contains": markFunction(function( text ) {
+ return function( elem ) {
+ return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+ };
+ }),
+
+ // "Whether an element is represented by a :lang() selector
+ // is based solely on the element's language value
+ // being equal to the identifier C,
+ // or beginning with the identifier C immediately followed by "-".
+ // The matching of C against the element's language value is performed case-insensitively.
+ // The identifier C does not have to be a valid language name."
+ // http://www.w3.org/TR/selectors/#lang-pseudo
+ "lang": markFunction( function( lang ) {
+ // lang value must be a valid identifier
+ if ( !ridentifier.test(lang || "") ) {
+ Sizzle.error( "unsupported lang: " + lang );
+ }
+ lang = lang.replace( runescape, funescape ).toLowerCase();
+ return function( elem ) {
+ var elemLang;
+ do {
+ if ( (elemLang = documentIsHTML ?
+ elem.lang :
+ elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+
+ elemLang = elemLang.toLowerCase();
+ return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+ }
+ } while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+ return false;
+ };
+ }),
+
+ // Miscellaneous
+ "target": function( elem ) {
+ var hash = window.location && window.location.hash;
+ return hash && hash.slice( 1 ) === elem.id;
+ },
+
+ "root": function( elem ) {
+ return elem === docElem;
+ },
+
+ "focus": function( elem ) {
+ return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+ },
+
+ // Boolean properties
+ "enabled": function( elem ) {
+ return elem.disabled === false;
+ },
+
+ "disabled": function( elem ) {
+ return elem.disabled === true;
+ },
+
+ "checked": function( elem ) {
+ // In CSS3, :checked should return both checked and selected elements
+ // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+ var nodeName = elem.nodeName.toLowerCase();
+ return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+ },
+
+ "selected": function( elem ) {
+ // Accessing this property makes selected-by-default
+ // options in Safari work properly
+ if ( elem.parentNode ) {
+ elem.parentNode.selectedIndex;
+ }
+
+ return elem.selected === true;
+ },
+
+ // Contents
+ "empty": function( elem ) {
+ // http://www.w3.org/TR/selectors/#empty-pseudo
+ // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+ // but not by others (comment: 8; processing instruction: 7; etc.)
+ // nodeType < 6 works because attributes (2) do not appear as children
+ for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+ if ( elem.nodeType < 6 ) {
+ return false;
+ }
+ }
+ return true;
+ },
+
+ "parent": function( elem ) {
+ return !Expr.pseudos["empty"]( elem );
+ },
+
+ // Element/input types
+ "header": function( elem ) {
+ return rheader.test( elem.nodeName );
+ },
+
+ "input": function( elem ) {
+ return rinputs.test( elem.nodeName );
+ },
+
+ "button": function( elem ) {
+ var name = elem.nodeName.toLowerCase();
+ return name === "input" && elem.type === "button" || name === "button";
+ },
+
+ "text": function( elem ) {
+ var attr;
+ return elem.nodeName.toLowerCase() === "input" &&
+ elem.type === "text" &&
+
+ // Support: IE<8
+ // New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+ ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+ },
+
+ // Position-in-collection
+ "first": createPositionalPseudo(function() {
+ return [ 0 ];
+ }),
+
+ "last": createPositionalPseudo(function( matchIndexes, length ) {
+ return [ length - 1 ];
+ }),
+
+ "eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+ return [ argument < 0 ? argument + length : argument ];
+ }),
+
+ "even": createPositionalPseudo(function( matchIndexes, length ) {
+ var i = 0;
+ for ( ; i < length; i += 2 ) {
+ matchIndexes.push( i );
+ }
+ return matchIndexes;
+ }),
+
+ "odd": createPositionalPseudo(function( matchIndexes, length ) {
+ var i = 1;
+ for ( ; i < length; i += 2 ) {
+ matchIndexes.push( i );
+ }
+ return matchIndexes;
+ }),
+
+ "lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+ var i = argument < 0 ? argument + length : argument;
+ for ( ; --i >= 0; ) {
+ matchIndexes.push( i );
+ }
+ return matchIndexes;
+ }),
+
+ "gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+ var i = argument < 0 ? argument + length : argument;
+ for ( ; ++i < length; ) {
+ matchIndexes.push( i );
+ }
+ return matchIndexes;
+ })
+ }
+};
+
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+ Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+ Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+// Easy API for creating new setFilters
+function setFilters() {}
+setFilters.prototype = Expr.filters = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
+ var matched, match, tokens, type,
+ soFar, groups, preFilters,
+ cached = tokenCache[ selector + " " ];
+
+ if ( cached ) {
+ return parseOnly ? 0 : cached.slice( 0 );
+ }
+
+ soFar = selector;
+ groups = [];
+ preFilters = Expr.preFilter;
+
+ while ( soFar ) {
+
+ // Comma and first run
+ if ( !matched || (match = rcomma.exec( soFar )) ) {
+ if ( match ) {
+ // Don't consume trailing commas as valid
+ soFar = soFar.slice( match[0].length ) || soFar;
+ }
+ groups.push( (tokens = []) );
+ }
+
+ matched = false;
+
+ // Combinators
+ if ( (match = rcombinators.exec( soFar )) ) {
+ matched = match.shift();
+ tokens.push({
+ value: matched,
+ // Cast descendant combinators to space
+ type: match[0].replace( rtrim, " " )
+ });
+ soFar = soFar.slice( matched.length );
+ }
+
+ // Filters
+ for ( type in Expr.filter ) {
+ if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+ (match = preFilters[ type ]( match ))) ) {
+ matched = match.shift();
+ tokens.push({
+ value: matched,
+ type: type,
+ matches: match
+ });
+ soFar = soFar.slice( matched.length );
+ }
+ }
+
+ if ( !matched ) {
+ break;
+ }
+ }
+
+ // Return the length of the invalid excess
+ // if we're just parsing
+ // Otherwise, throw an error or return tokens
+ return parseOnly ?
+ soFar.length :
+ soFar ?
+ Sizzle.error( selector ) :
+ // Cache the tokens
+ tokenCache( selector, groups ).slice( 0 );
+};
+
+function toSelector( tokens ) {
+ var i = 0,
+ len = tokens.length,
+ selector = "";
+ for ( ; i < len; i++ ) {
+ selector += tokens[i].value;
+ }
+ return selector;
+}
+
+function addCombinator( matcher, combinator, base ) {
+ var dir = combinator.dir,
+ checkNonElements = base && dir === "parentNode",
+ doneName = done++;
+
+ return combinator.first ?
+ // Check against closest ancestor/preceding element
+ function( elem, context, xml ) {
+ while ( (elem = elem[ dir ]) ) {
+ if ( elem.nodeType === 1 || checkNonElements ) {
+ return matcher( elem, context, xml );
+ }
+ }
+ } :
+
+ // Check against all ancestor/preceding elements
+ function( elem, context, xml ) {
+ var oldCache, outerCache,
+ newCache = [ dirruns, doneName ];
+
+ // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+ if ( xml ) {
+ while ( (elem = elem[ dir ]) ) {
+ if ( elem.nodeType === 1 || checkNonElements ) {
+ if ( matcher( elem, context, xml ) ) {
+ return true;
+ }
+ }
+ }
+ } else {
+ while ( (elem = elem[ dir ]) ) {
+ if ( elem.nodeType === 1 || checkNonElements ) {
+ outerCache = elem[ expando ] || (elem[ expando ] = {});
+ if ( (oldCache = outerCache[ dir ]) &&
+ oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+
+ // Assign to newCache so results back-propagate to previous elements
+ return (newCache[ 2 ] = oldCache[ 2 ]);
+ } else {
+ // Reuse newcache so results back-propagate to previous elements
+ outerCache[ dir ] = newCache;
+
+ // A match means we're done; a fail means we have to keep checking
+ if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ };
+}
+
+function elementMatcher( matchers ) {
+ return matchers.length > 1 ?
+ function( elem, context, xml ) {
+ var i = matchers.length;
+ while ( i-- ) {
+ if ( !matchers[i]( elem, context, xml ) ) {
+ return false;
+ }
+ }
+ return true;
+ } :
+ matchers[0];
+}
+
+function multipleContexts( selector, contexts, results ) {
+ var i = 0,
+ len = contexts.length;
+ for ( ; i < len; i++ ) {
+ Sizzle( selector, contexts[i], results );
+ }
+ return results;
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+ var elem,
+ newUnmatched = [],
+ i = 0,
+ len = unmatched.length,
+ mapped = map != null;
+
+ for ( ; i < len; i++ ) {
+ if ( (elem = unmatched[i]) ) {
+ if ( !filter || filter( elem, context, xml ) ) {
+ newUnmatched.push( elem );
+ if ( mapped ) {
+ map.push( i );
+ }
+ }
+ }
+ }
+
+ return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+ if ( postFilter && !postFilter[ expando ] ) {
+ postFilter = setMatcher( postFilter );
+ }
+ if ( postFinder && !postFinder[ expando ] ) {
+ postFinder = setMatcher( postFinder, postSelector );
+ }
+ return markFunction(function( seed, results, context, xml ) {
+ var temp, i, elem,
+ preMap = [],
+ postMap = [],
+ preexisting = results.length,
+
+ // Get initial elements from seed or context
+ elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+ // Prefilter to get matcher input, preserving a map for seed-results synchronization
+ matcherIn = preFilter && ( seed || !selector ) ?
+ condense( elems, preMap, preFilter, context, xml ) :
+ elems,
+
+ matcherOut = matcher ?
+ // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+ postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+ // ...intermediate processing is necessary
+ [] :
+
+ // ...otherwise use results directly
+ results :
+ matcherIn;
+
+ // Find primary matches
+ if ( matcher ) {
+ matcher( matcherIn, matcherOut, context, xml );
+ }
+
+ // Apply postFilter
+ if ( postFilter ) {
+ temp = condense( matcherOut, postMap );
+ postFilter( temp, [], context, xml );
+
+ // Un-match failing elements by moving them back to matcherIn
+ i = temp.length;
+ while ( i-- ) {
+ if ( (elem = temp[i]) ) {
+ matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+ }
+ }
+ }
+
+ if ( seed ) {
+ if ( postFinder || preFilter ) {
+ if ( postFinder ) {
+ // Get the final matcherOut by condensing this intermediate into postFinder contexts
+ temp = [];
+ i = matcherOut.length;
+ while ( i-- ) {
+ if ( (elem = matcherOut[i]) ) {
+ // Restore matcherIn since elem is not yet a final match
+ temp.push( (matcherIn[i] = elem) );
+ }
+ }
+ postFinder( null, (matcherOut = []), temp, xml );
+ }
+
+ // Move matched elements from seed to results to keep them synchronized
+ i = matcherOut.length;
+ while ( i-- ) {
+ if ( (elem = matcherOut[i]) &&
+ (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+
+ seed[temp] = !(results[temp] = elem);
+ }
+ }
+ }
+
+ // Add elements to results, through postFinder if defined
+ } else {
+ matcherOut = condense(
+ matcherOut === results ?
+ matcherOut.splice( preexisting, matcherOut.length ) :
+ matcherOut
+ );
+ if ( postFinder ) {
+ postFinder( null, results, matcherOut, xml );
+ } else {
+ push.apply( results, matcherOut );
+ }
+ }
+ });
+}
+
+function matcherFromTokens( tokens ) {
+ var checkContext, matcher, j,
+ len = tokens.length,
+ leadingRelative = Expr.relative[ tokens[0].type ],
+ implicitRelative = leadingRelative || Expr.relative[" "],
+ i = leadingRelative ? 1 : 0,
+
+ // The foundational matcher ensures that elements are reachable from top-level context(s)
+ matchContext = addCombinator( function( elem ) {
+ return elem === checkContext;
+ }, implicitRelative, true ),
+ matchAnyContext = addCombinator( function( elem ) {
+ return indexOf.call( checkContext, elem ) > -1;
+ }, implicitRelative, true ),
+ matchers = [ function( elem, context, xml ) {
+ return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+ (checkContext = context).nodeType ?
+ matchContext( elem, context, xml ) :
+ matchAnyContext( elem, context, xml ) );
+ } ];
+
+ for ( ; i < len; i++ ) {
+ if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+ matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+ } else {
+ matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+ // Return special upon seeing a positional matcher
+ if ( matcher[ expando ] ) {
+ // Find the next relative operator (if any) for proper handling
+ j = ++i;
+ for ( ; j < len; j++ ) {
+ if ( Expr.relative[ tokens[j].type ] ) {
+ break;
+ }
+ }
+ return setMatcher(
+ i > 1 && elementMatcher( matchers ),
+ i > 1 && toSelector(
+ // If the preceding token was a descendant combinator, insert an implicit any-element `*`
+ tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+ ).replace( rtrim, "$1" ),
+ matcher,
+ i < j && matcherFromTokens( tokens.slice( i, j ) ),
+ j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+ j < len && toSelector( tokens )
+ );
+ }
+ matchers.push( matcher );
+ }
+ }
+
+ return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+ var bySet = setMatchers.length > 0,
+ byElement = elementMatchers.length > 0,
+ superMatcher = function( seed, context, xml, results, outermost ) {
+ var elem, j, matcher,
+ matchedCount = 0,
+ i = "0",
+ unmatched = seed && [],
+ setMatched = [],
+ contextBackup = outermostContext,
+ // We must always have either seed elements or outermost context
+ elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+ // Use integer dirruns iff this is the outermost matcher
+ dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+ len = elems.length;
+
+ if ( outermost ) {
+ outermostContext = context !== document && context;
+ }
+
+ // Add elements passing elementMatchers directly to results
+ // Keep `i` a string if there are no elements so `matchedCount` will be "00" below
+ // Support: IE<9, Safari
+ // Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+ for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+ if ( byElement && elem ) {
+ j = 0;
+ while ( (matcher = elementMatchers[j++]) ) {
+ if ( matcher( elem, context, xml ) ) {
+ results.push( elem );
+ break;
+ }
+ }
+ if ( outermost ) {
+ dirruns = dirrunsUnique;
+ }
+ }
+
+ // Track unmatched elements for set filters
+ if ( bySet ) {
+ // They will have gone through all possible matchers
+ if ( (elem = !matcher && elem) ) {
+ matchedCount--;
+ }
+
+ // Lengthen the array for every element, matched or not
+ if ( seed ) {
+ unmatched.push( elem );
+ }
+ }
+ }
+
+ // Apply set filters to unmatched elements
+ matchedCount += i;
+ if ( bySet && i !== matchedCount ) {
+ j = 0;
+ while ( (matcher = setMatchers[j++]) ) {
+ matcher( unmatched, setMatched, context, xml );
+ }
+
+ if ( seed ) {
+ // Reintegrate element matches to eliminate the need for sorting
+ if ( matchedCount > 0 ) {
+ while ( i-- ) {
+ if ( !(unmatched[i] || setMatched[i]) ) {
+ setMatched[i] = pop.call( results );
+ }
+ }
+ }
+
+ // Discard index placeholder values to get only actual matches
+ setMatched = condense( setMatched );
+ }
+
+ // Add matches to results
+ push.apply( results, setMatched );
+
+ // Seedless set matches succeeding multiple successful matchers stipulate sorting
+ if ( outermost && !seed && setMatched.length > 0 &&
+ ( matchedCount + setMatchers.length ) > 1 ) {
+
+ Sizzle.uniqueSort( results );
+ }
+ }
+
+ // Override manipulation of globals by nested matchers
+ if ( outermost ) {
+ dirruns = dirrunsUnique;
+ outermostContext = contextBackup;
+ }
+
+ return unmatched;
+ };
+
+ return bySet ?
+ markFunction( superMatcher ) :
+ superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
+ var i,
+ setMatchers = [],
+ elementMatchers = [],
+ cached = compilerCache[ selector + " " ];
+
+ if ( !cached ) {
+ // Generate a function of recursive functions that can be used to check each element
+ if ( !match ) {
+ match = tokenize( selector );
+ }
+ i = match.length;
+ while ( i-- ) {
+ cached = matcherFromTokens( match[i] );
+ if ( cached[ expando ] ) {
+ setMatchers.push( cached );
+ } else {
+ elementMatchers.push( cached );
+ }
+ }
+
+ // Cache the compiled function
+ cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+
+ // Save selector and tokenization
+ cached.selector = selector;
+ }
+ return cached;
+};
+
+/**
+ * A low-level selection function that works with Sizzle's compiled
+ * selector functions
+ * @param {String|Function} selector A selector or a pre-compiled
+ * selector function built with Sizzle.compile
+ * @param {Element} context
+ * @param {Array} [results]
+ * @param {Array} [seed] A set of elements to match against
+ */
+select = Sizzle.select = function( selector, context, results, seed ) {
+ var i, tokens, token, type, find,
+ compiled = typeof selector === "function" && selector,
+ match = !seed && tokenize( (selector = compiled.selector || selector) );
+
+ results = results || [];
+
+ // Try to minimize operations if there is no seed and only one group
+ if ( match.length === 1 ) {
+
+ // Take a shortcut and set the context if the root selector is an ID
+ tokens = match[0] = match[0].slice( 0 );
+ if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+ support.getById && context.nodeType === 9 && documentIsHTML &&
+ Expr.relative[ tokens[1].type ] ) {
+
+ context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+ if ( !context ) {
+ return results;
+
+ // Precompiled matchers will still verify ancestry, so step up a level
+ } else if ( compiled ) {
+ context = context.parentNode;
+ }
+
+ selector = selector.slice( tokens.shift().value.length );
+ }
+
+ // Fetch a seed set for right-to-left matching
+ i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+ while ( i-- ) {
+ token = tokens[i];
+
+ // Abort if we hit a combinator
+ if ( Expr.relative[ (type = token.type) ] ) {
+ break;
+ }
+ if ( (find = Expr.find[ type ]) ) {
+ // Search, expanding context for leading sibling combinators
+ if ( (seed = find(
+ token.matches[0].replace( runescape, funescape ),
+ rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
+ )) ) {
+
+ // If seed is empty or no tokens remain, we can return early
+ tokens.splice( i, 1 );
+ selector = seed.length && toSelector( tokens );
+ if ( !selector ) {
+ push.apply( results, seed );
+ return results;
+ }
+
+ break;
+ }
+ }
+ }
+ }
+
+ // Compile and execute a filtering function if one is not provided
+ // Provide `match` to avoid retokenization if we modified the selector above
+ ( compiled || compile( selector, match ) )(
+ seed,
+ context,
+ !documentIsHTML,
+ results,
+ rsibling.test( selector ) && testContext( context.parentNode ) || context
+ );
+ return results;
+};
+
+// One-time assignments
+
+// Sort stability
+support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+
+// Support: Chrome<14
+// Always assume duplicates if they aren't passed to the comparison function
+support.detectDuplicates = !!hasDuplicate;
+
+// Initialize against the default document
+setDocument();
+
+// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Detached nodes confoundingly follow *each other*
+support.sortDetached = assert(function( div1 ) {
+ // Should return 1, but returns 4 (following)
+ return div1.compareDocumentPosition( document.createElement("div") ) & 1;
+});
+
+// Support: IE<8
+// Prevent attribute/property "interpolation"
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( div ) {
+ div.innerHTML = "<a href='#'></a>";
+ return div.firstChild.getAttribute("href") === "#" ;
+}) ) {
+ addHandle( "type|href|height|width", function( elem, name, isXML ) {
+ if ( !isXML ) {
+ return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+ }
+ });
+}
+
+// Support: IE<9
+// Use defaultValue in place of getAttribute("value")
+if ( !support.attributes || !assert(function( div ) {
+ div.innerHTML = "<input/>";
+ div.firstChild.setAttribute( "value", "" );
+ return div.firstChild.getAttribute( "value" ) === "";
+}) ) {
+ addHandle( "value", function( elem, name, isXML ) {
+ if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+ return elem.defaultValue;
+ }
+ });
+}
+
+// Support: IE<9
+// Use getAttributeNode to fetch booleans when getAttribute lies
+if ( !assert(function( div ) {
+ return div.getAttribute("disabled") == null;
+}) ) {
+ addHandle( booleans, function( elem, name, isXML ) {
+ var val;
+ if ( !isXML ) {
+ return elem[ name ] === true ? name.toLowerCase() :
+ (val = elem.getAttributeNode( name )) && val.specified ?
+ val.value :
+ null;
+ }
+ });
+}
+
+return Sizzle;
+
+})( window );
+
+
+
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+
+var rneedsContext = jQuery.expr.match.needsContext;
+
+var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
+
+
+
+var risSimple = /^.[^:#\[\.,]*$/;
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, not ) {
+ if ( jQuery.isFunction( qualifier ) ) {
+ return jQuery.grep( elements, function( elem, i ) {
+ /* jshint -W018 */
+ return !!qualifier.call( elem, i, elem ) !== not;
+ });
+
+ }
+
+ if ( qualifier.nodeType ) {
+ return jQuery.grep( elements, function( elem ) {
+ return ( elem === qualifier ) !== not;
+ });
+
+ }
+
+ if ( typeof qualifier === "string" ) {
+ if ( risSimple.test( qualifier ) ) {
+ return jQuery.filter( qualifier, elements, not );
+ }
+
+ qualifier = jQuery.filter( qualifier, elements );
+ }
+
+ return jQuery.grep( elements, function( elem ) {
+ return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
+ });
+}
+
+jQuery.filter = function( expr, elems, not ) {
+ var elem = elems[ 0 ];
+
+ if ( not ) {
+ expr = ":not(" + expr + ")";
+ }
+
+ return elems.length === 1 && elem.nodeType === 1 ?
+ jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
+ jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+ return elem.nodeType === 1;
+ }));
+};
+
+jQuery.fn.extend({
+ find: function( selector ) {
+ var i,
+ ret = [],
+ self = this,
+ len = self.length;
+
+ if ( typeof selector !== "string" ) {
+ return this.pushStack( jQuery( selector ).filter(function() {
+ for ( i = 0; i < len; i++ ) {
+ if ( jQuery.contains( self[ i ], this ) ) {
+ return true;
+ }
+ }
+ }) );
+ }
+
+ for ( i = 0; i < len; i++ ) {
+ jQuery.find( selector, self[ i ], ret );
+ }
+
+ // Needed because $( selector, context ) becomes $( context ).find( selector )
+ ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+ ret.selector = this.selector ? this.selector + " " + selector : selector;
+ return ret;
+ },
+ filter: function( selector ) {
+ return this.pushStack( winnow(this, selector || [], false) );
+ },
+ not: function( selector ) {
+ return this.pushStack( winnow(this, selector || [], true) );
+ },
+ is: function( selector ) {
+ return !!winnow(
+ this,
+
+ // If this is a positional/relative selector, check membership in the returned set
+ // so $("p:first").is("p:last") won't return true for a doc with two "p".
+ typeof selector === "string" && rneedsContext.test( selector ) ?
+ jQuery( selector ) :
+ selector || [],
+ false
+ ).length;
+ }
+});
+
+
+// Initialize a jQuery object
+
+
+// A central reference to the root jQuery(document)
+var rootjQuery,
+
+ // Use the correct document accordingly with window argument (sandbox)
+ document = window.document,
+
+ // A simple way to check for HTML strings
+ // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+ // Strict HTML recognition (#11290: must start with <)
+ rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+ init = jQuery.fn.init = function( selector, context ) {
+ var match, elem;
+
+ // HANDLE: $(""), $(null), $(undefined), $(false)
+ if ( !selector ) {
+ return this;
+ }
+
+ // Handle HTML strings
+ if ( typeof selector === "string" ) {
+ if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+ // Assume that strings that start and end with <> are HTML and skip the regex check
+ match = [ null, selector, null ];
+
+ } else {
+ match = rquickExpr.exec( selector );
+ }
+
+ // Match html or make sure no context is specified for #id
+ if ( match && (match[1] || !context) ) {
+
+ // HANDLE: $(html) -> $(array)
+ if ( match[1] ) {
+ context = context instanceof jQuery ? context[0] : context;
+
+ // scripts is true for back-compat
+ // Intentionally let the error be thrown if parseHTML is not present
+ jQuery.merge( this, jQuery.parseHTML(
+ match[1],
+ context && context.nodeType ? context.ownerDocument || context : document,
+ true
+ ) );
+
+ // HANDLE: $(html, props)
+ if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+ for ( match in context ) {
+ // Properties of context are called as methods if possible
+ if ( jQuery.isFunction( this[ match ] ) ) {
+ this[ match ]( context[ match ] );
+
+ // ...and otherwise set as attributes
+ } else {
+ this.attr( match, context[ match ] );
+ }
+ }
+ }
+
+ return this;
+
+ // HANDLE: $(#id)
+ } else {
+ elem = document.getElementById( match[2] );
+
+ // Check parentNode to catch when Blackberry 4.6 returns
+ // nodes that are no longer in the document #6963
+ if ( elem && elem.parentNode ) {
+ // Handle the case where IE and Opera return items
+ // by name instead of ID
+ if ( elem.id !== match[2] ) {
+ return rootjQuery.find( selector );
+ }
+
+ // Otherwise, we inject the element directly into the jQuery object
+ this.length = 1;
+ this[0] = elem;
+ }
+
+ this.context = document;
+ this.selector = selector;
+ return this;
+ }
+
+ // HANDLE: $(expr, $(...))
+ } else if ( !context || context.jquery ) {
+ return ( context || rootjQuery ).find( selector );
+
+ // HANDLE: $(expr, context)
+ // (which is just equivalent to: $(context).find(expr)
+ } else {
+ return this.constructor( context ).find( selector );
+ }
+
+ // HANDLE: $(DOMElement)
+ } else if ( selector.nodeType ) {
+ this.context = this[0] = selector;
+ this.length = 1;
+ return this;
+
+ // HANDLE: $(function)
+ // Shortcut for document ready
+ } else if ( jQuery.isFunction( selector ) ) {
+ return typeof rootjQuery.ready !== "undefined" ?
+ rootjQuery.ready( selector ) :
+ // Execute immediately if ready is not present
+ selector( jQuery );
+ }
+
+ if ( selector.selector !== undefined ) {
+ this.selector = selector.selector;
+ this.context = selector.context;
+ }
+
+ return jQuery.makeArray( selector, this );
+ };
+
+// Give the init function the jQuery prototype for later instantiation
+init.prototype = jQuery.fn;
+
+// Initialize central reference
+rootjQuery = jQuery( document );
+
+
+var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+ // methods guaranteed to produce a unique set when starting from a unique set
+ guaranteedUnique = {
+ children: true,
+ contents: true,
+ next: true,
+ prev: true
+ };
+
+jQuery.extend({
+ dir: function( elem, dir, until ) {
+ var matched = [],
+ cur = elem[ dir ];
+
+ while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+ if ( cur.nodeType === 1 ) {
+ matched.push( cur );
+ }
+ cur = cur[dir];
+ }
+ return matched;
+ },
+
+ sibling: function( n, elem ) {
+ var r = [];
+
+ for ( ; n; n = n.nextSibling ) {
+ if ( n.nodeType === 1 && n !== elem ) {
+ r.push( n );
+ }
+ }
+
+ return r;
+ }
+});
+
+jQuery.fn.extend({
+ has: function( target ) {
+ var i,
+ targets = jQuery( target, this ),
+ len = targets.length;
+
+ return this.filter(function() {
+ for ( i = 0; i < len; i++ ) {
+ if ( jQuery.contains( this, targets[i] ) ) {
+ return true;
+ }
+ }
+ });
+ },
+
+ closest: function( selectors, context ) {
+ var cur,
+ i = 0,
+ l = this.length,
+ matched = [],
+ pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+ jQuery( selectors, context || this.context ) :
+ 0;
+
+ for ( ; i < l; i++ ) {
+ for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
+ // Always skip document fragments
+ if ( cur.nodeType < 11 && (pos ?
+ pos.index(cur) > -1 :
+
+ // Don't pass non-elements to Sizzle
+ cur.nodeType === 1 &&
+ jQuery.find.matchesSelector(cur, selectors)) ) {
+
+ matched.push( cur );
+ break;
+ }
+ }
+ }
+
+ return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
+ },
+
+ // Determine the position of an element within
+ // the matched set of elements
+ index: function( elem ) {
+
+ // No argument, return index in parent
+ if ( !elem ) {
+ return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
+ }
+
+ // index in selector
+ if ( typeof elem === "string" ) {
+ return jQuery.inArray( this[0], jQuery( elem ) );
+ }
+
+ // Locate the position of the desired element
+ return jQuery.inArray(
+ // If it receives a jQuery object, the first element is used
+ elem.jquery ? elem[0] : elem, this );
+ },
+
+ add: function( selector, context ) {
+ return this.pushStack(
+ jQuery.unique(
+ jQuery.merge( this.get(), jQuery( selector, context ) )
+ )
+ );
+ },
+
+ addBack: function( selector ) {
+ return this.add( selector == null ?
+ this.prevObject : this.prevObject.filter(selector)
+ );
+ }
+});
+
+function sibling( cur, dir ) {
+ do {
+ cur = cur[ dir ];
+ } while ( cur && cur.nodeType !== 1 );
+
+ return cur;
+}
+
+jQuery.each({
+ parent: function( elem ) {
+ var parent = elem.parentNode;
+ return parent && parent.nodeType !== 11 ? parent : null;
+ },
+ parents: function( elem ) {
+ return jQuery.dir( elem, "parentNode" );
+ },
+ parentsUntil: function( elem, i, until ) {
+ return jQuery.dir( elem, "parentNode", until );
+ },
+ next: function( elem ) {
+ return sibling( elem, "nextSibling" );
+ },
+ prev: function( elem ) {
+ return sibling( elem, "previousSibling" );
+ },
+ nextAll: function( elem ) {
+ return jQuery.dir( elem, "nextSibling" );
+ },
+ prevAll: function( elem ) {
+ return jQuery.dir( elem, "previousSibling" );
+ },
+ nextUntil: function( elem, i, until ) {
+ return jQuery.dir( elem, "nextSibling", until );
+ },
+ prevUntil: function( elem, i, until ) {
+ return jQuery.dir( elem, "previousSibling", until );
+ },
+ siblings: function( elem ) {
+ return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+ },
+ children: function( elem ) {
+ return jQuery.sibling( elem.firstChild );
+ },
+ contents: function( elem ) {
+ return jQuery.nodeName( elem, "iframe" ) ?
+ elem.contentDocument || elem.contentWindow.document :
+ jQuery.merge( [], elem.childNodes );
+ }
+}, function( name, fn ) {
+ jQuery.fn[ name ] = function( until, selector ) {
+ var ret = jQuery.map( this, fn, until );
+
+ if ( name.slice( -5 ) !== "Until" ) {
+ selector = until;
+ }
+
+ if ( selector && typeof selector === "string" ) {
+ ret = jQuery.filter( selector, ret );
+ }
+
+ if ( this.length > 1 ) {
+ // Remove duplicates
+ if ( !guaranteedUnique[ name ] ) {
+ ret = jQuery.unique( ret );
+ }
+
+ // Reverse order for parents* and prev-derivatives
+ if ( rparentsprev.test( name ) ) {
+ ret = ret.reverse();
+ }
+ }
+
+ return this.pushStack( ret );
+ };
+});
+var rnotwhite = (/\S+/g);
+
+
+
+// String to Object options format cache
+var optionsCache = {};
+
+// Convert String-formatted options into Object-formatted ones and store in cache
+function createOptions( options ) {
+ var object = optionsCache[ options ] = {};
+ jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
+ object[ flag ] = true;
+ });
+ return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ * options: an optional list of space-separated options that will change how
+ * the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ * once: will ensure the callback list can only be fired once (like a Deferred)
+ *
+ * memory: will keep track of previous values and will call any callback added
+ * after the list has been fired right away with the latest "memorized"
+ * values (like a Deferred)
+ *
+ * unique: will ensure a callback can only be added once (no duplicate in the list)
+ *
+ * stopOnFalse: interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+ // Convert options from String-formatted to Object-formatted if needed
+ // (we check in cache first)
+ options = typeof options === "string" ?
+ ( optionsCache[ options ] || createOptions( options ) ) :
+ jQuery.extend( {}, options );
+
+ var // Flag to know if list is currently firing
+ firing,
+ // Last fire value (for non-forgettable lists)
+ memory,
+ // Flag to know if list was already fired
+ fired,
+ // End of the loop when firing
+ firingLength,
+ // Index of currently firing callback (modified by remove if needed)
+ firingIndex,
+ // First callback to fire (used internally by add and fireWith)
+ firingStart,
+ // Actual callback list
+ list = [],
+ // Stack of fire calls for repeatable lists
+ stack = !options.once && [],
+ // Fire callbacks
+ fire = function( data ) {
+ memory = options.memory && data;
+ fired = true;
+ firingIndex = firingStart || 0;
+ firingStart = 0;
+ firingLength = list.length;
+ firing = true;
+ for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+ if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
+ memory = false; // To prevent further calls using add
+ break;
+ }
+ }
+ firing = false;
+ if ( list ) {
+ if ( stack ) {
+ if ( stack.length ) {
+ fire( stack.shift() );
+ }
+ } else if ( memory ) {
+ list = [];
+ } else {
+ self.disable();
+ }
+ }
+ },
+ // Actual Callbacks object
+ self = {
+ // Add a callback or a collection of callbacks to the list
+ add: function() {
+ if ( list ) {
+ // First, we save the current length
+ var start = list.length;
+ (function add( args ) {
+ jQuery.each( args, function( _, arg ) {
+ var type = jQuery.type( arg );
+ if ( type === "function" ) {
+ if ( !options.unique || !self.has( arg ) ) {
+ list.push( arg );
+ }
+ } else if ( arg && arg.length && type !== "string" ) {
+ // Inspect recursively
+ add( arg );
+ }
+ });
+ })( arguments );
+ // Do we need to add the callbacks to the
+ // current firing batch?
+ if ( firing ) {
+ firingLength = list.length;
+ // With memory, if we're not firing then
+ // we should call right away
+ } else if ( memory ) {
+ firingStart = start;
+ fire( memory );
+ }
+ }
+ return this;
+ },
+ // Remove a callback from the list
+ remove: function() {
+ if ( list ) {
+ jQuery.each( arguments, function( _, arg ) {
+ var index;
+ while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+ list.splice( index, 1 );
+ // Handle firing indexes
+ if ( firing ) {
+ if ( index <= firingLength ) {
+ firingLength--;
+ }
+ if ( index <= firingIndex ) {
+ firingIndex--;
+ }
+ }
+ }
+ });
+ }
+ return this;
+ },
+ // Check if a given callback is in the list.
+ // If no argument is given, return whether or not list has callbacks attached.
+ has: function( fn ) {
+ return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
+ },
+ // Remove all callbacks from the list
+ empty: function() {
+ list = [];
+ firingLength = 0;
+ return this;
+ },
+ // Have the list do nothing anymore
+ disable: function() {
+ list = stack = memory = undefined;
+ return this;
+ },
+ // Is it disabled?
+ disabled: function() {
+ return !list;
+ },
+ // Lock the list in its current state
+ lock: function() {
+ stack = undefined;
+ if ( !memory ) {
+ self.disable();
+ }
+ return this;
+ },
+ // Is it locked?
+ locked: function() {
+ return !stack;
+ },
+ // Call all callbacks with the given context and arguments
+ fireWith: function( context, args ) {
+ if ( list && ( !fired || stack ) ) {
+ args = args || [];
+ args = [ context, args.slice ? args.slice() : args ];
+ if ( firing ) {
+ stack.push( args );
+ } else {
+ fire( args );
+ }
+ }
+ return this;
+ },
+ // Call all the callbacks with the given arguments
+ fire: function() {
+ self.fireWith( this, arguments );
+ return this;
+ },
+ // To know if the callbacks have already been called at least once
+ fired: function() {
+ return !!fired;
+ }
+ };
+
+ return self;
+};
+
+
+jQuery.extend({
+
+ Deferred: function( func ) {
+ var tuples = [
+ // action, add listener, listener list, final state
+ [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
+ [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
+ [ "notify", "progress", jQuery.Callbacks("memory") ]
+ ],
+ state = "pending",
+ promise = {
+ state: function() {
+ return state;
+ },
+ always: function() {
+ deferred.done( arguments ).fail( arguments );
+ return this;
+ },
+ then: function( /* fnDone, fnFail, fnProgress */ ) {
+ var fns = arguments;
+ return jQuery.Deferred(function( newDefer ) {
+ jQuery.each( tuples, function( i, tuple ) {
+ var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+ // deferred[ done | fail | progress ] for forwarding actions to newDefer
+ deferred[ tuple[1] ](function() {
+ var returned = fn && fn.apply( this, arguments );
+ if ( returned && jQuery.isFunction( returned.promise ) ) {
+ returned.promise()
+ .done( newDefer.resolve )
+ .fail( newDefer.reject )
+ .progress( newDefer.notify );
+ } else {
+ newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+ }
+ });
+ });
+ fns = null;
+ }).promise();
+ },
+ // Get a promise for this deferred
+ // If obj is provided, the promise aspect is added to the object
+ promise: function( obj ) {
+ return obj != null ? jQuery.extend( obj, promise ) : promise;
+ }
+ },
+ deferred = {};
+
+ // Keep pipe for back-compat
+ promise.pipe = promise.then;
+
+ // Add list-specific methods
+ jQuery.each( tuples, function( i, tuple ) {
+ var list = tuple[ 2 ],
+ stateString = tuple[ 3 ];
+
+ // promise[ done | fail | progress ] = list.add
+ promise[ tuple[1] ] = list.add;
+
+ // Handle state
+ if ( stateString ) {
+ list.add(function() {
+ // state = [ resolved | rejected ]
+ state = stateString;
+
+ // [ reject_list | resolve_list ].disable; progress_list.lock
+ }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+ }
+
+ // deferred[ resolve | reject | notify ]
+ deferred[ tuple[0] ] = function() {
+ deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
+ return this;
+ };
+ deferred[ tuple[0] + "With" ] = list.fireWith;
+ });
+
+ // Make the deferred a promise
+ promise.promise( deferred );
+
+ // Call given func if any
+ if ( func ) {
+ func.call( deferred, deferred );
+ }
+
+ // All done!
+ return deferred;
+ },
+
+ // Deferred helper
+ when: function( subordinate /* , ..., subordinateN */ ) {
+ var i = 0,
+ resolveValues = slice.call( arguments ),
+ length = resolveValues.length,
+
+ // the count of uncompleted subordinates
+ remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+
+ // the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+ deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+ // Update function for both resolve and progress values
+ updateFunc = function( i, contexts, values ) {
+ return function( value ) {
+ contexts[ i ] = this;
+ values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+ if ( values === progressValues ) {
+ deferred.notifyWith( contexts, values );
+
+ } else if ( !(--remaining) ) {
+ deferred.resolveWith( contexts, values );
+ }
+ };
+ },
+
+ progressValues, progressContexts, resolveContexts;
+
+ // add listeners to Deferred subordinates; treat others as resolved
+ if ( length > 1 ) {
+ progressValues = new Array( length );
+ progressContexts = new Array( length );
+ resolveContexts = new Array( length );
+ for ( ; i < length; i++ ) {
+ if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
+ resolveValues[ i ].promise()
+ .done( updateFunc( i, resolveContexts, resolveValues ) )
+ .fail( deferred.reject )
+ .progress( updateFunc( i, progressContexts, progressValues ) );
+ } else {
+ --remaining;
+ }
+ }
+ }
+
+ // if we're not waiting on anything, resolve the master
+ if ( !remaining ) {
+ deferred.resolveWith( resolveContexts, resolveValues );
+ }
+
+ return deferred.promise();
+ }
+});
+
+
+// The deferred used on DOM ready
+var readyList;
+
+jQuery.fn.ready = function( fn ) {
+ // Add the callback
+ jQuery.ready.promise().done( fn );
+
+ return this;
+};
+
+jQuery.extend({
+ // Is the DOM ready to be used? Set to true once it occurs.
+ isReady: false,
+
+ // A counter to track how many items to wait for before
+ // the ready event fires. See #6781
+ readyWait: 1,
+
+ // Hold (or release) the ready event
+ holdReady: function( hold ) {
+ if ( hold ) {
+ jQuery.readyWait++;
+ } else {
+ jQuery.ready( true );
+ }
+ },
+
+ // Handle when the DOM is ready
+ ready: function( wait ) {
+
+ // Abort if there are pending holds or we're already ready
+ if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+ return;
+ }
+
+ // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+ if ( !document.body ) {
+ return setTimeout( jQuery.ready );
+ }
+
+ // Remember that the DOM is ready
+ jQuery.isReady = true;
+
+ // If a normal DOM Ready event fired, decrement, and wait if need be
+ if ( wait !== true && --jQuery.readyWait > 0 ) {
+ return;
+ }
+
+ // If there are functions bound, to execute
+ readyList.resolveWith( document, [ jQuery ] );
+
+ // Trigger any bound ready events
+ if ( jQuery.fn.triggerHandler ) {
+ jQuery( document ).triggerHandler( "ready" );
+ jQuery( document ).off( "ready" );
+ }
+ }
+});
+
+/**
+ * Clean-up method for dom ready events
+ */
+function detach() {
+ if ( document.addEventListener ) {
+ document.removeEventListener( "DOMContentLoaded", completed, false );
+ window.removeEventListener( "load", completed, false );
+
+ } else {
+ document.detachEvent( "onreadystatechange", completed );
+ window.detachEvent( "onload", completed );
+ }
+}
+
+/**
+ * The ready event handler and self cleanup method
+ */
+function completed() {
+ // readyState === "complete" is good enough for us to call the dom ready in oldIE
+ if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
+ detach();
+ jQuery.ready();
+ }
+}
+
+jQuery.ready.promise = function( obj ) {
+ if ( !readyList ) {
+
+ readyList = jQuery.Deferred();
+
+ // Catch cases where $(document).ready() is called after the browser event has already occurred.
+ // we once tried to use readyState "interactive" here, but it caused issues like the one
+ // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
+ if ( document.readyState === "complete" ) {
+ // Handle it asynchronously to allow scripts the opportunity to delay ready
+ setTimeout( jQuery.ready );
+
+ // Standards-based browsers support DOMContentLoaded
+ } else if ( document.addEventListener ) {
+ // Use the handy event callback
+ document.addEventListener( "DOMContentLoaded", completed, false );
+
+ // A fallback to window.onload, that will always work
+ window.addEventListener( "load", completed, false );
+
+ // If IE event model is used
+ } else {
+ // Ensure firing before onload, maybe late but safe also for iframes
+ document.attachEvent( "onreadystatechange", completed );
+
+ // A fallback to window.onload, that will always work
+ window.attachEvent( "onload", completed );
+
+ // If IE and not a frame
+ // continually check to see if the document is ready
+ var top = false;
+
+ try {
+ top = window.frameElement == null && document.documentElement;
+ } catch(e) {}
+
+ if ( top && top.doScroll ) {
+ (function doScrollCheck() {
+ if ( !jQuery.isReady ) {
+
+ try {
+ // Use the trick by Diego Perini
+ // http://javascript.nwbox.com/IEContentLoaded/
+ top.doScroll("left");
+ } catch(e) {
+ return setTimeout( doScrollCheck, 50 );
+ }
+
+ // detach all dom ready events
+ detach();
+
+ // and execute any waiting functions
+ jQuery.ready();
+ }
+ })();
+ }
+ }
+ }
+ return readyList.promise( obj );
+};
+
+
+var strundefined = typeof undefined;
+
+
+
+// Support: IE<9
+// Iteration over object's inherited properties before its own
+var i;
+for ( i in jQuery( support ) ) {
+ break;
+}
+support.ownLast = i !== "0";
+
+// Note: most support tests are defined in their respective modules.
+// false until the test is run
+support.inlineBlockNeedsLayout = false;
+
+// Execute ASAP in case we need to set body.style.zoom
+jQuery(function() {
+ // Minified: var a,b,c,d
+ var val, div, body, container;
+
+ body = document.getElementsByTagName( "body" )[ 0 ];
+ if ( !body || !body.style ) {
+ // Return for frameset docs that don't have a body
+ return;
+ }
+
+ // Setup
+ div = document.createElement( "div" );
+ container = document.createElement( "div" );
+ container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+ body.appendChild( container ).appendChild( div );
+
+ if ( typeof div.style.zoom !== strundefined ) {
+ // Support: IE<8
+ // Check if natively block-level elements act like inline-block
+ // elements when setting their display to 'inline' and giving
+ // them layout
+ div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
+
+ support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
+ if ( val ) {
+ // Prevent IE 6 from affecting layout for positioned elements #11048
+ // Prevent IE from shrinking the body in IE 7 mode #12869
+ // Support: IE<8
+ body.style.zoom = 1;
+ }
+ }
+
+ body.removeChild( container );
+});
+
+
+
+
+(function() {
+ var div = document.createElement( "div" );
+
+ // Execute the test only if not already executed in another module.
+ if (support.deleteExpando == null) {
+ // Support: IE<9
+ support.deleteExpando = true;
+ try {
+ delete div.test;
+ } catch( e ) {
+ support.deleteExpando = false;
+ }
+ }
+
+ // Null elements to avoid leaks in IE.
+ div = null;
+})();
+
+
+/**
+ * Determines whether an object can have data
+ */
+jQuery.acceptData = function( elem ) {
+ var noData = jQuery.noData[ (elem.nodeName + " ").toLowerCase() ],
+ nodeType = +elem.nodeType || 1;
+
+ // Do not set data on non-element DOM nodes because it will not be cleared (#8335).
+ return nodeType !== 1 && nodeType !== 9 ?
+ false :
+
+ // Nodes accept data unless otherwise specified; rejection can be conditional
+ !noData || noData !== true && elem.getAttribute("classid") === noData;
+};
+
+
+var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
+ rmultiDash = /([A-Z])/g;
+
+function dataAttr( elem, key, data ) {
+ // If nothing was found internally, try to fetch any
+ // data from the HTML5 data-* attribute
+ if ( data === undefined && elem.nodeType === 1 ) {
+
+ var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+ data = elem.getAttribute( name );
+
+ if ( typeof data === "string" ) {
+ try {
+ data = data === "true" ? true :
+ data === "false" ? false :
+ data === "null" ? null :
+ // Only convert to a number if it doesn't change the string
+ +data + "" === data ? +data :
+ rbrace.test( data ) ? jQuery.parseJSON( data ) :
+ data;
+ } catch( e ) {}
+
+ // Make sure we set the data so it isn't changed later
+ jQuery.data( elem, key, data );
+
+ } else {
+ data = undefined;
+ }
+ }
+
+ return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+ var name;
+ for ( name in obj ) {
+
+ // if the public data object is empty, the private is still empty
+ if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
+ continue;
+ }
+ if ( name !== "toJSON" ) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
+ if ( !jQuery.acceptData( elem ) ) {
+ return;
+ }
+
+ var ret, thisCache,
+ internalKey = jQuery.expando,
+
+ // We have to handle DOM nodes and JS objects differently because IE6-7
+ // can't GC object references properly across the DOM-JS boundary
+ isNode = elem.nodeType,
+
+ // Only DOM nodes need the global jQuery cache; JS object data is
+ // attached directly to the object so GC can occur automatically
+ cache = isNode ? jQuery.cache : elem,
+
+ // Only defining an ID for JS objects if its cache already exists allows
+ // the code to shortcut on the same path as a DOM node with no cache
+ id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
+
+ // Avoid doing any more work than we need to when trying to get data on an
+ // object that has no data at all
+ if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
+ return;
+ }
+
+ if ( !id ) {
+ // Only DOM nodes need a new unique ID for each element since their data
+ // ends up in the global cache
+ if ( isNode ) {
+ id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
+ } else {
+ id = internalKey;
+ }
+ }
+
+ if ( !cache[ id ] ) {
+ // Avoid exposing jQuery metadata on plain JS objects when the object
+ // is serialized using JSON.stringify
+ cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
+ }
+
+ // An object can be passed to jQuery.data instead of a key/value pair; this gets
+ // shallow copied over onto the existing cache
+ if ( typeof name === "object" || typeof name === "function" ) {
+ if ( pvt ) {
+ cache[ id ] = jQuery.extend( cache[ id ], name );
+ } else {
+ cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+ }
+ }
+
+ thisCache = cache[ id ];
+
+ // jQuery data() is stored in a separate object inside the object's internal data
+ // cache in order to avoid key collisions between internal data and user-defined
+ // data.
+ if ( !pvt ) {
+ if ( !thisCache.data ) {
+ thisCache.data = {};
+ }
+
+ thisCache = thisCache.data;
+ }
+
+ if ( data !== undefined ) {
+ thisCache[ jQuery.camelCase( name ) ] = data;
+ }
+
+ // Check for both converted-to-camel and non-converted data property names
+ // If a data property was specified
+ if ( typeof name === "string" ) {
+
+ // First Try to find as-is property data
+ ret = thisCache[ name ];
+
+ // Test for null|undefined property data
+ if ( ret == null ) {
+
+ // Try to find the camelCased property
+ ret = thisCache[ jQuery.camelCase( name ) ];
+ }
+ } else {
+ ret = thisCache;
+ }
+
+ return ret;
+}
+
+function internalRemoveData( elem, name, pvt ) {
+ if ( !jQuery.acceptData( elem ) ) {
+ return;
+ }
+
+ var thisCache, i,
+ isNode = elem.nodeType,
+
+ // See jQuery.data for more information
+ cache = isNode ? jQuery.cache : elem,
+ id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+ // If there is already no cache entry for this object, there is no
+ // purpose in continuing
+ if ( !cache[ id ] ) {
+ return;
+ }
+
+ if ( name ) {
+
+ thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+ if ( thisCache ) {
+
+ // Support array or space separated string names for data keys
+ if ( !jQuery.isArray( name ) ) {
+
+ // try the string as a key before any manipulation
+ if ( name in thisCache ) {
+ name = [ name ];
+ } else {
+
+ // split the camel cased version by spaces unless a key with the spaces exists
+ name = jQuery.camelCase( name );
+ if ( name in thisCache ) {
+ name = [ name ];
+ } else {
+ name = name.split(" ");
+ }
+ }
+ } else {
+ // If "name" is an array of keys...
+ // When data is initially created, via ("key", "val") signature,
+ // keys will be converted to camelCase.
+ // Since there is no way to tell _how_ a key was added, remove
+ // both plain key and camelCase key. #12786
+ // This will only penalize the array argument path.
+ name = name.concat( jQuery.map( name, jQuery.camelCase ) );
+ }
+
+ i = name.length;
+ while ( i-- ) {
+ delete thisCache[ name[i] ];
+ }
+
+ // If there is no data left in the cache, we want to continue
+ // and let the cache object itself get destroyed
+ if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
+ return;
+ }
+ }
+ }
+
+ // See jQuery.data for more information
+ if ( !pvt ) {
+ delete cache[ id ].data;
+
+ // Don't destroy the parent cache unless the internal data object
+ // had been the only thing left in it
+ if ( !isEmptyDataObject( cache[ id ] ) ) {
+ return;
+ }
+ }
+
+ // Destroy the cache
+ if ( isNode ) {
+ jQuery.cleanData( [ elem ], true );
+
+ // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
+ /* jshint eqeqeq: false */
+ } else if ( support.deleteExpando || cache != cache.window ) {
+ /* jshint eqeqeq: true */
+ delete cache[ id ];
+
+ // When all else fails, null
+ } else {
+ cache[ id ] = null;
+ }
+}
+
+jQuery.extend({
+ cache: {},
+
+ // The following elements (space-suffixed to avoid Object.prototype collisions)
+ // throw uncatchable exceptions if you attempt to set expando properties
+ noData: {
+ "applet ": true,
+ "embed ": true,
+ // ...but Flash objects (which have this classid) *can* handle expandos
+ "object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+ },
+
+ hasData: function( elem ) {
+ elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+ return !!elem && !isEmptyDataObject( elem );
+ },
+
+ data: function( elem, name, data ) {
+ return internalData( elem, name, data );
+ },
+
+ removeData: function( elem, name ) {
+ return internalRemoveData( elem, name );
+ },
+
+ // For internal use only.
+ _data: function( elem, name, data ) {
+ return internalData( elem, name, data, true );
+ },
+
+ _removeData: function( elem, name ) {
+ return internalRemoveData( elem, name, true );
+ }
+});
+
+jQuery.fn.extend({
+ data: function( key, value ) {
+ var i, name, data,
+ elem = this[0],
+ attrs = elem && elem.attributes;
+
+ // Special expections of .data basically thwart jQuery.access,
+ // so implement the relevant behavior ourselves
+
+ // Gets all values
+ if ( key === undefined ) {
+ if ( this.length ) {
+ data = jQuery.data( elem );
+
+ if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+ i = attrs.length;
+ while ( i-- ) {
+
+ // Support: IE11+
+ // The attrs elements can be null (#14894)
+ if ( attrs[ i ] ) {
+ name = attrs[ i ].name;
+ if ( name.indexOf( "data-" ) === 0 ) {
+ name = jQuery.camelCase( name.slice(5) );
+ dataAttr( elem, name, data[ name ] );
+ }
+ }
+ }
+ jQuery._data( elem, "parsedAttrs", true );
+ }
+ }
+
+ return data;
+ }
+
+ // Sets multiple values
+ if ( typeof key === "object" ) {
+ return this.each(function() {
+ jQuery.data( this, key );
+ });
+ }
+
+ return arguments.length > 1 ?
+
+ // Sets one value
+ this.each(function() {
+ jQuery.data( this, key, value );
+ }) :
+
+ // Gets one value
+ // Try to fetch any internally stored data first
+ elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
+ },
+
+ removeData: function( key ) {
+ return this.each(function() {
+ jQuery.removeData( this, key );
+ });
+ }
+});
+
+
+jQuery.extend({
+ queue: function( elem, type, data ) {
+ var queue;
+
+ if ( elem ) {
+ type = ( type || "fx" ) + "queue";
+ queue = jQuery._data( elem, type );
+
+ // Speed up dequeue by getting out quickly if this is just a lookup
+ if ( data ) {
+ if ( !queue || jQuery.isArray(data) ) {
+ queue = jQuery._data( elem, type, jQuery.makeArray(data) );
+ } else {
+ queue.push( data );
+ }
+ }
+ return queue || [];
+ }
+ },
+
+ dequeue: function( elem, type ) {
+ type = type || "fx";
+
+ var queue = jQuery.queue( elem, type ),
+ startLength = queue.length,
+ fn = queue.shift(),
+ hooks = jQuery._queueHooks( elem, type ),
+ next = function() {
+ jQuery.dequeue( elem, type );
+ };
+
+ // If the fx queue is dequeued, always remove the progress sentinel
+ if ( fn === "inprogress" ) {
+ fn = queue.shift();
+ startLength--;
+ }
+
+ if ( fn ) {
+
+ // Add a progress sentinel to prevent the fx queue from being
+ // automatically dequeued
+ if ( type === "fx" ) {
+ queue.unshift( "inprogress" );
+ }
+
+ // clear up the last queue stop function
+ delete hooks.stop;
+ fn.call( elem, next, hooks );
+ }
+
+ if ( !startLength && hooks ) {
+ hooks.empty.fire();
+ }
+ },
+
+ // not intended for public consumption - generates a queueHooks object, or returns the current one
+ _queueHooks: function( elem, type ) {
+ var key = type + "queueHooks";
+ return jQuery._data( elem, key ) || jQuery._data( elem, key, {
+ empty: jQuery.Callbacks("once memory").add(function() {
+ jQuery._removeData( elem, type + "queue" );
+ jQuery._removeData( elem, key );
+ })
+ });
+ }
+});
+
+jQuery.fn.extend({
+ queue: function( type, data ) {
+ var setter = 2;
+
+ if ( typeof type !== "string" ) {
+ data = type;
+ type = "fx";
+ setter--;
+ }
+
+ if ( arguments.length < setter ) {
+ return jQuery.queue( this[0], type );
+ }
+
+ return data === undefined ?
+ this :
+ this.each(function() {
+ var queue = jQuery.queue( this, type, data );
+
+ // ensure a hooks for this queue
+ jQuery._queueHooks( this, type );
+
+ if ( type === "fx" && queue[0] !== "inprogress" ) {
+ jQuery.dequeue( this, type );
+ }
+ });
+ },
+ dequeue: function( type ) {
+ return this.each(function() {
+ jQuery.dequeue( this, type );
+ });
+ },
+ clearQueue: function( type ) {
+ return this.queue( type || "fx", [] );
+ },
+ // Get a promise resolved when queues of a certain type
+ // are emptied (fx is the type by default)
+ promise: function( type, obj ) {
+ var tmp,
+ count = 1,
+ defer = jQuery.Deferred(),
+ elements = this,
+ i = this.length,
+ resolve = function() {
+ if ( !( --count ) ) {
+ defer.resolveWith( elements, [ elements ] );
+ }
+ };
+
+ if ( typeof type !== "string" ) {
+ obj = type;
+ type = undefined;
+ }
+ type = type || "fx";
+
+ while ( i-- ) {
+ tmp = jQuery._data( elements[ i ], type + "queueHooks" );
+ if ( tmp && tmp.empty ) {
+ count++;
+ tmp.empty.add( resolve );
+ }
+ }
+ resolve();
+ return defer.promise( obj );
+ }
+});
+var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
+
+var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
+
+var isHidden = function( elem, el ) {
+ // isHidden might be called from jQuery#filter function;
+ // in that case, element will be second argument
+ elem = el || elem;
+ return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
+ };
+
+
+
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+ var i = 0,
+ length = elems.length,
+ bulk = key == null;
+
+ // Sets many values
+ if ( jQuery.type( key ) === "object" ) {
+ chainable = true;
+ for ( i in key ) {
+ jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
+ }
+
+ // Sets one value
+ } else if ( value !== undefined ) {
+ chainable = true;
+
+ if ( !jQuery.isFunction( value ) ) {
+ raw = true;
+ }
+
+ if ( bulk ) {
+ // Bulk operations run against the entire set
+ if ( raw ) {
+ fn.call( elems, value );
+ fn = null;
+
+ // ...except when executing function values
+ } else {
+ bulk = fn;
+ fn = function( elem, key, value ) {
+ return bulk.call( jQuery( elem ), value );
+ };
+ }
+ }
+
+ if ( fn ) {
+ for ( ; i < length; i++ ) {
+ fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
+ }
+ }
+ }
+
+ return chainable ?
+ elems :
+
+ // Gets
+ bulk ?
+ fn.call( elems ) :
+ length ? fn( elems[0], key ) : emptyGet;
+};
+var rcheckableType = (/^(?:checkbox|radio)$/i);
+
+
+
+(function() {
+ // Minified: var a,b,c
+ var input = document.createElement( "input" ),
+ div = document.createElement( "div" ),
+ fragment = document.createDocumentFragment();
+
+ // Setup
+ div.innerHTML = " <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+
+ // IE strips leading whitespace when .innerHTML is used
+ support.leadingWhitespace = div.firstChild.nodeType === 3;
+
+ // Make sure that tbody elements aren't automatically inserted
+ // IE will insert them into empty tables
+ support.tbody = !div.getElementsByTagName( "tbody" ).length;
+
+ // Make sure that link elements get serialized correctly by innerHTML
+ // This requires a wrapper element in IE
+ support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
+
+ // Makes sure cloning an html5 element does not cause problems
+ // Where outerHTML is undefined, this still works
+ support.html5Clone =
+ document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav></:nav>";
+
+ // Check if a disconnected checkbox will retain its checked
+ // value of true after appended to the DOM (IE6/7)
+ input.type = "checkbox";
+ input.checked = true;
+ fragment.appendChild( input );
+ support.appendChecked = input.checked;
+
+ // Make sure textarea (and checkbox) defaultValue is properly cloned
+ // Support: IE6-IE11+
+ div.innerHTML = "<textarea>x</textarea>";
+ support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
+
+ // #11217 - WebKit loses check when the name is after the checked attribute
+ fragment.appendChild( div );
+ div.innerHTML = "<input type='radio' checked='checked' name='t'/>";
+
+ // Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
+ // old WebKit doesn't clone checked state correctly in fragments
+ support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+ // Support: IE<9
+ // Opera does not clone events (and typeof div.attachEvent === undefined).
+ // IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
+ support.noCloneEvent = true;
+ if ( div.attachEvent ) {
+ div.attachEvent( "onclick", function() {
+ support.noCloneEvent = false;
+ });
+
+ div.cloneNode( true ).click();
+ }
+
+ // Execute the test only if not already executed in another module.
+ if (support.deleteExpando == null) {
+ // Support: IE<9
+ support.deleteExpando = true;
+ try {
+ delete div.test;
+ } catch( e ) {
+ support.deleteExpando = false;
+ }
+ }
+})();
+
+
+(function() {
+ var i, eventName,
+ div = document.createElement( "div" );
+
+ // Support: IE<9 (lack submit/change bubble), Firefox 23+ (lack focusin event)
+ for ( i in { submit: true, change: true, focusin: true }) {
+ eventName = "on" + i;
+
+ if ( !(support[ i + "Bubbles" ] = eventName in window) ) {
+ // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
+ div.setAttribute( eventName, "t" );
+ support[ i + "Bubbles" ] = div.attributes[ eventName ].expando === false;
+ }
+ }
+
+ // Null elements to avoid leaks in IE.
+ div = null;
+})();
+
+
+var rformElems = /^(?:input|select|textarea)$/i,
+ rkeyEvent = /^key/,
+ rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
+ rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+ rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+
+function returnTrue() {
+ return true;
+}
+
+function returnFalse() {
+ return false;
+}
+
+function safeActiveElement() {
+ try {
+ return document.activeElement;
+ } catch ( err ) { }
+}
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+ global: {},
+
+ add: function( elem, types, handler, data, selector ) {
+ var tmp, events, t, handleObjIn,
+ special, eventHandle, handleObj,
+ handlers, type, namespaces, origType,
+ elemData = jQuery._data( elem );
+
+ // Don't attach events to noData or text/comment nodes (but allow plain objects)
+ if ( !elemData ) {
+ return;
+ }
+
+ // Caller can pass in an object of custom data in lieu of the handler
+ if ( handler.handler ) {
+ handleObjIn = handler;
+ handler = handleObjIn.handler;
+ selector = handleObjIn.selector;
+ }
+
+ // Make sure that the handler has a unique ID, used to find/remove it later
+ if ( !handler.guid ) {
+ handler.guid = jQuery.guid++;
+ }
+
+ // Init the element's event structure and main handler, if this is the first
+ if ( !(events = elemData.events) ) {
+ events = elemData.events = {};
+ }
+ if ( !(eventHandle = elemData.handle) ) {
+ eventHandle = elemData.handle = function( e ) {
+ // Discard the second event of a jQuery.event.trigger() and
+ // when an event is called after a page has unloaded
+ return typeof jQuery !== strundefined && (!e || jQuery.event.triggered !== e.type) ?
+ jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+ undefined;
+ };
+ // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+ eventHandle.elem = elem;
+ }
+
+ // Handle multiple events separated by a space
+ types = ( types || "" ).match( rnotwhite ) || [ "" ];
+ t = types.length;
+ while ( t-- ) {
+ tmp = rtypenamespace.exec( types[t] ) || [];
+ type = origType = tmp[1];
+ namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+ // There *must* be a type, no attaching namespace-only handlers
+ if ( !type ) {
+ continue;
+ }
+
+ // If event changes its type, use the special event handlers for the changed type
+ special = jQuery.event.special[ type ] || {};
+
+ // If selector defined, determine special event api type, otherwise given type
+ type = ( selector ? special.delegateType : special.bindType ) || type;
+
+ // Update special based on newly reset type
+ special = jQuery.event.special[ type ] || {};
+
+ // handleObj is passed to all event handlers
+ handleObj = jQuery.extend({
+ type: type,
+ origType: origType,
+ data: data,
+ handler: handler,
+ guid: handler.guid,
+ selector: selector,
+ needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+ namespace: namespaces.join(".")
+ }, handleObjIn );
+
+ // Init the event handler queue if we're the first
+ if ( !(handlers = events[ type ]) ) {
+ handlers = events[ type ] = [];
+ handlers.delegateCount = 0;
+
+ // Only use addEventListener/attachEvent if the special events handler returns false
+ if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+ // Bind the global event handler to the element
+ if ( elem.addEventListener ) {
+ elem.addEventListener( type, eventHandle, false );
+
+ } else if ( elem.attachEvent ) {
+ elem.attachEvent( "on" + type, eventHandle );
+ }
+ }
+ }
+
+ if ( special.add ) {
+ special.add.call( elem, handleObj );
+
+ if ( !handleObj.handler.guid ) {
+ handleObj.handler.guid = handler.guid;
+ }
+ }
+
+ // Add to the element's handler list, delegates in front
+ if ( selector ) {
+ handlers.splice( handlers.delegateCount++, 0, handleObj );
+ } else {
+ handlers.push( handleObj );
+ }
+
+ // Keep track of which events have ever been used, for event optimization
+ jQuery.event.global[ type ] = true;
+ }
+
+ // Nullify elem to prevent memory leaks in IE
+ elem = null;
+ },
+
+ // Detach an event or set of events from an element
+ remove: function( elem, types, handler, selector, mappedTypes ) {
+ var j, handleObj, tmp,
+ origCount, t, events,
+ special, handlers, type,
+ namespaces, origType,
+ elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+
+ if ( !elemData || !(events = elemData.events) ) {
+ return;
+ }
+
+ // Once for each type.namespace in types; type may be omitted
+ types = ( types || "" ).match( rnotwhite ) || [ "" ];
+ t = types.length;
+ while ( t-- ) {
+ tmp = rtypenamespace.exec( types[t] ) || [];
+ type = origType = tmp[1];
+ namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+ // Unbind all events (on this namespace, if provided) for the element
+ if ( !type ) {
+ for ( type in events ) {
+ jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+ }
+ continue;
+ }
+
+ special = jQuery.event.special[ type ] || {};
+ type = ( selector ? special.delegateType : special.bindType ) || type;
+ handlers = events[ type ] || [];
+ tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
+
+ // Remove matching events
+ origCount = j = handlers.length;
+ while ( j-- ) {
+ handleObj = handlers[ j ];
+
+ if ( ( mappedTypes || origType === handleObj.origType ) &&
+ ( !handler || handler.guid === handleObj.guid ) &&
+ ( !tmp || tmp.test( handleObj.namespace ) ) &&
+ ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+ handlers.splice( j, 1 );
+
+ if ( handleObj.selector ) {
+ handlers.delegateCount--;
+ }
+ if ( special.remove ) {
+ special.remove.call( elem, handleObj );
+ }
+ }
+ }
+
+ // Remove generic event handler if we removed something and no more handlers exist
+ // (avoids potential for endless recursion during removal of special event handlers)
+ if ( origCount && !handlers.length ) {
+ if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+ jQuery.removeEvent( elem, type, elemData.handle );
+ }
+
+ delete events[ type ];
+ }
+ }
+
+ // Remove the expando if it's no longer used
+ if ( jQuery.isEmptyObject( events ) ) {
+ delete elemData.handle;
+
+ // removeData also checks for emptiness and clears the expando if empty
+ // so use it instead of delete
+ jQuery._removeData( elem, "events" );
+ }
+ },
+
+ trigger: function( event, data, elem, onlyHandlers ) {
+ var handle, ontype, cur,
+ bubbleType, special, tmp, i,
+ eventPath = [ elem || document ],
+ type = hasOwn.call( event, "type" ) ? event.type : event,
+ namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
+
+ cur = tmp = elem = elem || document;
+
+ // Don't do events on text and comment nodes
+ if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+ return;
+ }
+
+ // focus/blur morphs to focusin/out; ensure we're not firing them right now
+ if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+ return;
+ }
+
+ if ( type.indexOf(".") >= 0 ) {
+ // Namespaced trigger; create a regexp to match event type in handle()
+ namespaces = type.split(".");
+ type = namespaces.shift();
+ namespaces.sort();
+ }
+ ontype = type.indexOf(":") < 0 && "on" + type;
+
+ // Caller can pass in a jQuery.Event object, Object, or just an event type string
+ event = event[ jQuery.expando ] ?
+ event :
+ new jQuery.Event( type, typeof event === "object" && event );
+
+ // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+ event.isTrigger = onlyHandlers ? 2 : 3;
+ event.namespace = namespaces.join(".");
+ event.namespace_re = event.namespace ?
+ new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+ null;
+
+ // Clean up the event in case it is being reused
+ event.result = undefined;
+ if ( !event.target ) {
+ event.target = elem;
+ }
+
+ // Clone any incoming data and prepend the event, creating the handler arg list
+ data = data == null ?
+ [ event ] :
+ jQuery.makeArray( data, [ event ] );
+
+ // Allow special events to draw outside the lines
+ special = jQuery.event.special[ type ] || {};
+ if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+ return;
+ }
+
+ // Determine event propagation path in advance, per W3C events spec (#9951)
+ // Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+ if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+ bubbleType = special.delegateType || type;
+ if ( !rfocusMorph.test( bubbleType + type ) ) {
+ cur = cur.parentNode;
+ }
+ for ( ; cur; cur = cur.parentNode ) {
+ eventPath.push( cur );
+ tmp = cur;
+ }
+
+ // Only add window if we got to document (e.g., not plain obj or detached DOM)
+ if ( tmp === (elem.ownerDocument || document) ) {
+ eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+ }
+ }
+
+ // Fire handlers on the event path
+ i = 0;
+ while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+
+ event.type = i > 1 ?
+ bubbleType :
+ special.bindType || type;
+
+ // jQuery handler
+ handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+ if ( handle ) {
+ handle.apply( cur, data );
+ }
+
+ // Native handler
+ handle = ontype && cur[ ontype ];
+ if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
+ event.result = handle.apply( cur, data );
+ if ( event.result === false ) {
+ event.preventDefault();
+ }
+ }
+ }
+ event.type = type;
+
+ // If nobody prevented the default action, do it now
+ if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+ if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
+ jQuery.acceptData( elem ) ) {
+
+ // Call a native DOM method on the target with the same name name as the event.
+ // Can't use an .isFunction() check here because IE6/7 fails that test.
+ // Don't do default actions on window, that's where global variables be (#6170)
+ if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
+
+ // Don't re-trigger an onFOO event when we call its FOO() method
+ tmp = elem[ ontype ];
+
+ if ( tmp ) {
+ elem[ ontype ] = null;
+ }
+
+ // Prevent re-triggering of the same event, since we already bubbled it above
+ jQuery.event.triggered = type;
+ try {
+ elem[ type ]();
+ } catch ( e ) {
+ // IE<9 dies on focus/blur to hidden element (#1486,#12518)
+ // only reproducible on winXP IE8 native, not IE9 in IE8 mode
+ }
+ jQuery.event.triggered = undefined;
+
+ if ( tmp ) {
+ elem[ ontype ] = tmp;
+ }
+ }
+ }
+ }
+
+ return event.result;
+ },
+
+ dispatch: function( event ) {
+
+ // Make a writable jQuery.Event from the native event object
+ event = jQuery.event.fix( event );
+
+ var i, ret, handleObj, matched, j,
+ handlerQueue = [],
+ args = slice.call( arguments ),
+ handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
+ special = jQuery.event.special[ event.type ] || {};
+
+ // Use the fix-ed jQuery.Event rather than the (read-only) native event
+ args[0] = event;
+ event.delegateTarget = this;
+
+ // Call the preDispatch hook for the mapped type, and let it bail if desired
+ if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+ return;
+ }
+
+ // Determine handlers
+ handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+ // Run delegates first; they may want to stop propagation beneath us
+ i = 0;
+ while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
+ event.currentTarget = matched.elem;
+
+ j = 0;
+ while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+
+ // Triggered event must either 1) have no namespace, or
+ // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+ if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+
+ event.handleObj = handleObj;
+ event.data = handleObj.data;
+
+ ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+ .apply( matched.elem, args );
+
+ if ( ret !== undefined ) {
+ if ( (event.result = ret) === false ) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ }
+ }
+ }
+ }
+
+ // Call the postDispatch hook for the mapped type
+ if ( special.postDispatch ) {
+ special.postDispatch.call( this, event );
+ }
+
+ return event.result;
+ },
+
+ handlers: function( event, handlers ) {
+ var sel, handleObj, matches, i,
+ handlerQueue = [],
+ delegateCount = handlers.delegateCount,
+ cur = event.target;
+
+ // Find delegate handlers
+ // Black-hole SVG <use> instance trees (#13180)
+ // Avoid non-left-click bubbling in Firefox (#3861)
+ if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+
+ /* jshint eqeqeq: false */
+ for ( ; cur != this; cur = cur.parentNode || this ) {
+ /* jshint eqeqeq: true */
+
+ // Don't check non-elements (#13208)
+ // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+ if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
+ matches = [];
+ for ( i = 0; i < delegateCount; i++ ) {
+ handleObj = handlers[ i ];
+
+ // Don't conflict with Object.prototype properties (#13203)
+ sel = handleObj.selector + " ";
+
+ if ( matches[ sel ] === undefined ) {
+ matches[ sel ] = handleObj.needsContext ?
+ jQuery( sel, this ).index( cur ) >= 0 :
+ jQuery.find( sel, this, null, [ cur ] ).length;
+ }
+ if ( matches[ sel ] ) {
+ matches.push( handleObj );
+ }
+ }
+ if ( matches.length ) {
+ handlerQueue.push({ elem: cur, handlers: matches });
+ }
+ }
+ }
+ }
+
+ // Add the remaining (directly-bound) handlers
+ if ( delegateCount < handlers.length ) {
+ handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
+ }
+
+ return handlerQueue;
+ },
+
+ fix: function( event ) {
+ if ( event[ jQuery.expando ] ) {
+ return event;
+ }
+
+ // Create a writable copy of the event object and normalize some properties
+ var i, prop, copy,
+ type = event.type,
+ originalEvent = event,
+ fixHook = this.fixHooks[ type ];
+
+ if ( !fixHook ) {
+ this.fixHooks[ type ] = fixHook =
+ rmouseEvent.test( type ) ? this.mouseHooks :
+ rkeyEvent.test( type ) ? this.keyHooks :
+ {};
+ }
+ copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+ event = new jQuery.Event( originalEvent );
+
+ i = copy.length;
+ while ( i-- ) {
+ prop = copy[ i ];
+ event[ prop ] = originalEvent[ prop ];
+ }
+
+ // Support: IE<9
+ // Fix target property (#1925)
+ if ( !event.target ) {
+ event.target = originalEvent.srcElement || document;
+ }
+
+ // Support: Chrome 23+, Safari?
+ // Target should not be a text node (#504, #13143)
+ if ( event.target.nodeType === 3 ) {
+ event.target = event.target.parentNode;
+ }
+
+ // Support: IE<9
+ // For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
+ event.metaKey = !!event.metaKey;
+
+ return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+ },
+
+ // Includes some event props shared by KeyEvent and MouseEvent
+ props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+
+ fixHooks: {},
+
+ keyHooks: {
+ props: "char charCode key keyCode".split(" "),
+ filter: function( event, original ) {
+
+ // Add which for key events
+ if ( event.which == null ) {
+ event.which = original.charCode != null ? original.charCode : original.keyCode;
+ }
+
+ return event;
+ }
+ },
+
+ mouseHooks: {
+ props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+ filter: function( event, original ) {
+ var body, eventDoc, doc,
+ button = original.button,
+ fromElement = original.fromElement;
+
+ // Calculate pageX/Y if missing and clientX/Y available
+ if ( event.pageX == null && original.clientX != null ) {
+ eventDoc = event.target.ownerDocument || document;
+ doc = eventDoc.documentElement;
+ body = eventDoc.body;
+
+ event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+ event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 );
+ }
+
+ // Add relatedTarget, if necessary
+ if ( !event.relatedTarget && fromElement ) {
+ event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+ }
+
+ // Add which for click: 1 === left; 2 === middle; 3 === right
+ // Note: button is not normalized, so don't use it
+ if ( !event.which && button !== undefined ) {
+ event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+ }
+
+ return event;
+ }
+ },
+
+ special: {
+ load: {
+ // Prevent triggered image.load events from bubbling to window.load
+ noBubble: true
+ },
+ focus: {
+ // Fire native event if possible so blur/focus sequence is correct
+ trigger: function() {
+ if ( this !== safeActiveElement() && this.focus ) {
+ try {
+ this.focus();
+ return false;
+ } catch ( e ) {
+ // Support: IE<9
+ // If we error on focus to hidden element (#1486, #12518),
+ // let .trigger() run the handlers
+ }
+ }
+ },
+ delegateType: "focusin"
+ },
+ blur: {
+ trigger: function() {
+ if ( this === safeActiveElement() && this.blur ) {
+ this.blur();
+ return false;
+ }
+ },
+ delegateType: "focusout"
+ },
+ click: {
+ // For checkbox, fire native event so checked state will be right
+ trigger: function() {
+ if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
+ this.click();
+ return false;
+ }
+ },
+
+ // For cross-browser consistency, don't fire native .click() on links
+ _default: function( event ) {
+ return jQuery.nodeName( event.target, "a" );
+ }
+ },
+
+ beforeunload: {
+ postDispatch: function( event ) {
+
+ // Support: Firefox 20+
+ // Firefox doesn't alert if the returnValue field is not set.
+ if ( event.result !== undefined && event.originalEvent ) {
+ event.originalEvent.returnValue = event.result;
+ }
+ }
+ }
+ },
+
+ simulate: function( type, elem, event, bubble ) {
+ // Piggyback on a donor event to simulate a different one.
+ // Fake originalEvent to avoid donor's stopPropagation, but if the
+ // simulated event prevents default then we do the same on the donor.
+ var e = jQuery.extend(
+ new jQuery.Event(),
+ event,
+ {
+ type: type,
+ isSimulated: true,
+ originalEvent: {}
+ }
+ );
+ if ( bubble ) {
+ jQuery.event.trigger( e, null, elem );
+ } else {
+ jQuery.event.dispatch.call( elem, e );
+ }
+ if ( e.isDefaultPrevented() ) {
+ event.preventDefault();
+ }
+ }
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+ function( elem, type, handle ) {
+ if ( elem.removeEventListener ) {
+ elem.removeEventListener( type, handle, false );
+ }
+ } :
+ function( elem, type, handle ) {
+ var name = "on" + type;
+
+ if ( elem.detachEvent ) {
+
+ // #8545, #7054, preventing memory leaks for custom events in IE6-8
+ // detachEvent needed property on element, by name of that event, to properly expose it to GC
+ if ( typeof elem[ name ] === strundefined ) {
+ elem[ name ] = null;
+ }
+
+ elem.detachEvent( name, handle );
+ }
+ };
+
+jQuery.Event = function( src, props ) {
+ // Allow instantiation without the 'new' keyword
+ if ( !(this instanceof jQuery.Event) ) {
+ return new jQuery.Event( src, props );
+ }
+
+ // Event object
+ if ( src && src.type ) {
+ this.originalEvent = src;
+ this.type = src.type;
+
+ // Events bubbling up the document may have been marked as prevented
+ // by a handler lower down the tree; reflect the correct value.
+ this.isDefaultPrevented = src.defaultPrevented ||
+ src.defaultPrevented === undefined &&
+ // Support: IE < 9, Android < 4.0
+ src.returnValue === false ?
+ returnTrue :
+ returnFalse;
+
+ // Event type
+ } else {
+ this.type = src;
+ }
+
+ // Put explicitly provided properties onto the event object
+ if ( props ) {
+ jQuery.extend( this, props );
+ }
+
+ // Create a timestamp if incoming event doesn't have one
+ this.timeStamp = src && src.timeStamp || jQuery.now();
+
+ // Mark it as fixed
+ this[ jQuery.expando ] = true;
+};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+ isDefaultPrevented: returnFalse,
+ isPropagationStopped: returnFalse,
+ isImmediatePropagationStopped: returnFalse,
+
+ preventDefault: function() {
+ var e = this.originalEvent;
+
+ this.isDefaultPrevented = returnTrue;
+ if ( !e ) {
+ return;
+ }
+
+ // If preventDefault exists, run it on the original event
+ if ( e.preventDefault ) {
+ e.preventDefault();
+
+ // Support: IE
+ // Otherwise set the returnValue property of the original event to false
+ } else {
+ e.returnValue = false;
+ }
+ },
+ stopPropagation: function() {
+ var e = this.originalEvent;
+
+ this.isPropagationStopped = returnTrue;
+ if ( !e ) {
+ return;
+ }
+ // If stopPropagation exists, run it on the original event
+ if ( e.stopPropagation ) {
+ e.stopPropagation();
+ }
+
+ // Support: IE
+ // Set the cancelBubble property of the original event to true
+ e.cancelBubble = true;
+ },
+ stopImmediatePropagation: function() {
+ var e = this.originalEvent;
+
+ this.isImmediatePropagationStopped = returnTrue;
+
+ if ( e && e.stopImmediatePropagation ) {
+ e.stopImmediatePropagation();
+ }
+
+ this.stopPropagation();
+ }
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+jQuery.each({
+ mouseenter: "mouseover",
+ mouseleave: "mouseout",
+ pointerenter: "pointerover",
+ pointerleave: "pointerout"
+}, function( orig, fix ) {
+ jQuery.event.special[ orig ] = {
+ delegateType: fix,
+ bindType: fix,
+
+ handle: function( event ) {
+ var ret,
+ target = this,
+ related = event.relatedTarget,
+ handleObj = event.handleObj;
+
+ // For mousenter/leave call the handler if related is outside the target.
+ // NB: No relatedTarget if the mouse left/entered the browser window
+ if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+ event.type = handleObj.origType;
+ ret = handleObj.handler.apply( this, arguments );
+ event.type = fix;
+ }
+ return ret;
+ }
+ };
+});
+
+// IE submit delegation
+if ( !support.submitBubbles ) {
+
+ jQuery.event.special.submit = {
+ setup: function() {
+ // Only need this for delegated form submit events
+ if ( jQuery.nodeName( this, "form" ) ) {
+ return false;
+ }
+
+ // Lazy-add a submit handler when a descendant form may potentially be submitted
+ jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+ // Node name check avoids a VML-related crash in IE (#9807)
+ var elem = e.target,
+ form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
+ if ( form && !jQuery._data( form, "submitBubbles" ) ) {
+ jQuery.event.add( form, "submit._submit", function( event ) {
+ event._submit_bubble = true;
+ });
+ jQuery._data( form, "submitBubbles", true );
+ }
+ });
+ // return undefined since we don't need an event listener
+ },
+
+ postDispatch: function( event ) {
+ // If form was submitted by the user, bubble the event up the tree
+ if ( event._submit_bubble ) {
+ delete event._submit_bubble;
+ if ( this.parentNode && !event.isTrigger ) {
+ jQuery.event.simulate( "submit", this.parentNode, event, true );
+ }
+ }
+ },
+
+ teardown: function() {
+ // Only need this for delegated form submit events
+ if ( jQuery.nodeName( this, "form" ) ) {
+ return false;
+ }
+
+ // Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+ jQuery.event.remove( this, "._submit" );
+ }
+ };
+}
+
+// IE change delegation and checkbox/radio fix
+if ( !support.changeBubbles ) {
+
+ jQuery.event.special.change = {
+
+ setup: function() {
+
+ if ( rformElems.test( this.nodeName ) ) {
+ // IE doesn't fire change on a check/radio until blur; trigger it on click
+ // after a propertychange. Eat the blur-change in special.change.handle.
+ // This still fires onchange a second time for check/radio after blur.
+ if ( this.type === "checkbox" || this.type === "radio" ) {
+ jQuery.event.add( this, "propertychange._change", function( event ) {
+ if ( event.originalEvent.propertyName === "checked" ) {
+ this._just_changed = true;
+ }
+ });
+ jQuery.event.add( this, "click._change", function( event ) {
+ if ( this._just_changed && !event.isTrigger ) {
+ this._just_changed = false;
+ }
+ // Allow triggered, simulated change events (#11500)
+ jQuery.event.simulate( "change", this, event, true );
+ });
+ }
+ return false;
+ }
+ // Delegated event; lazy-add a change handler on descendant inputs
+ jQuery.event.add( this, "beforeactivate._change", function( e ) {
+ var elem = e.target;
+
+ if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
+ jQuery.event.add( elem, "change._change", function( event ) {
+ if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+ jQuery.event.simulate( "change", this.parentNode, event, true );
+ }
+ });
+ jQuery._data( elem, "changeBubbles", true );
+ }
+ });
+ },
+
+ handle: function( event ) {
+ var elem = event.target;
+
+ // Swallow native change events from checkbox/radio, we already triggered them above
+ if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+ return event.handleObj.handler.apply( this, arguments );
+ }
+ },
+
+ teardown: function() {
+ jQuery.event.remove( this, "._change" );
+
+ return !rformElems.test( this.nodeName );
+ }
+ };
+}
+
+// Create "bubbling" focus and blur events
+if ( !support.focusinBubbles ) {
+ jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+ // Attach a single capturing handler on the document while someone wants focusin/focusout
+ var handler = function( event ) {
+ jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+ };
+
+ jQuery.event.special[ fix ] = {
+ setup: function() {
+ var doc = this.ownerDocument || this,
+ attaches = jQuery._data( doc, fix );
+
+ if ( !attaches ) {
+ doc.addEventListener( orig, handler, true );
+ }
+ jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
+ },
+ teardown: function() {
+ var doc = this.ownerDocument || this,
+ attaches = jQuery._data( doc, fix ) - 1;
+
+ if ( !attaches ) {
+ doc.removeEventListener( orig, handler, true );
+ jQuery._removeData( doc, fix );
+ } else {
+ jQuery._data( doc, fix, attaches );
+ }
+ }
+ };
+ });
+}
+
+jQuery.fn.extend({
+
+ on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+ var type, origFn;
+
+ // Types can be a map of types/handlers
+ if ( typeof types === "object" ) {
+ // ( types-Object, selector, data )
+ if ( typeof selector !== "string" ) {
+ // ( types-Object, data )
+ data = data || selector;
+ selector = undefined;
+ }
+ for ( type in types ) {
+ this.on( type, selector, data, types[ type ], one );
+ }
+ return this;
+ }
+
+ if ( data == null && fn == null ) {
+ // ( types, fn )
+ fn = selector;
+ data = selector = undefined;
+ } else if ( fn == null ) {
+ if ( typeof selector === "string" ) {
+ // ( types, selector, fn )
+ fn = data;
+ data = undefined;
+ } else {
+ // ( types, data, fn )
+ fn = data;
+ data = selector;
+ selector = undefined;
+ }
+ }
+ if ( fn === false ) {
+ fn = returnFalse;
+ } else if ( !fn ) {
+ return this;
+ }
+
+ if ( one === 1 ) {
+ origFn = fn;
+ fn = function( event ) {
+ // Can use an empty set, since event contains the info
+ jQuery().off( event );
+ return origFn.apply( this, arguments );
+ };
+ // Use same guid so caller can remove using origFn
+ fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+ }
+ return this.each( function() {
+ jQuery.event.add( this, types, fn, data, selector );
+ });
+ },
+ one: function( types, selector, data, fn ) {
+ return this.on( types, selector, data, fn, 1 );
+ },
+ off: function( types, selector, fn ) {
+ var handleObj, type;
+ if ( types && types.preventDefault && types.handleObj ) {
+ // ( event ) dispatched jQuery.Event
+ handleObj = types.handleObj;
+ jQuery( types.delegateTarget ).off(
+ handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+ handleObj.selector,
+ handleObj.handler
+ );
+ return this;
+ }
+ if ( typeof types === "object" ) {
+ // ( types-object [, selector] )
+ for ( type in types ) {
+ this.off( type, selector, types[ type ] );
+ }
+ return this;
+ }
+ if ( selector === false || typeof selector === "function" ) {
+ // ( types [, fn] )
+ fn = selector;
+ selector = undefined;
+ }
+ if ( fn === false ) {
+ fn = returnFalse;
+ }
+ return this.each(function() {
+ jQuery.event.remove( this, types, fn, selector );
+ });
+ },
+
+ trigger: function( type, data ) {
+ return this.each(function() {
+ jQuery.event.trigger( type, data, this );
+ });
+ },
+ triggerHandler: function( type, data ) {
+ var elem = this[0];
+ if ( elem ) {
+ return jQuery.event.trigger( type, data, elem, true );
+ }
+ }
+});
+
+
+function createSafeFragment( document ) {
+ var list = nodeNames.split( "|" ),
+ safeFrag = document.createDocumentFragment();
+
+ if ( safeFrag.createElement ) {
+ while ( list.length ) {
+ safeFrag.createElement(
+ list.pop()
+ );
+ }
+ }
+ return safeFrag;
+}
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+ "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+ rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+ rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
+ rleadingWhitespace = /^\s+/,
+ rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+ rtagName = /<([\w:]+)/,
+ rtbody = /<tbody/i,
+ rhtml = /<|&#?\w+;/,
+ rnoInnerhtml = /<(?:script|style|link)/i,
+ // checked="checked" or checked
+ rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+ rscriptType = /^$|\/(?:java|ecma)script/i,
+ rscriptTypeMasked = /^true\/(.*)/,
+ rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
+
+ // We have to close these tags to support XHTML (#13200)
+ wrapMap = {
+ option: [ 1, "<select multiple='multiple'>", "</select>" ],
+ legend: [ 1, "<fieldset>", "</fieldset>" ],
+ area: [ 1, "<map>", "</map>" ],
+ param: [ 1, "<object>", "</object>" ],
+ thead: [ 1, "<table>", "</table>" ],
+ tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+ col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+ td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+ // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+ // unless wrapped in a div with non-breaking characters in front of it.
+ _default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>" ]
+ },
+ safeFragment = createSafeFragment( document ),
+ fragmentDiv = safeFragment.appendChild( document.createElement("div") );
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+function getAll( context, tag ) {
+ var elems, elem,
+ i = 0,
+ found = typeof context.getElementsByTagName !== strundefined ? context.getElementsByTagName( tag || "*" ) :
+ typeof context.querySelectorAll !== strundefined ? context.querySelectorAll( tag || "*" ) :
+ undefined;
+
+ if ( !found ) {
+ for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
+ if ( !tag || jQuery.nodeName( elem, tag ) ) {
+ found.push( elem );
+ } else {
+ jQuery.merge( found, getAll( elem, tag ) );
+ }
+ }
+ }
+
+ return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+ jQuery.merge( [ context ], found ) :
+ found;
+}
+
+// Used in buildFragment, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+ if ( rcheckableType.test( elem.type ) ) {
+ elem.defaultChecked = elem.checked;
+ }
+}
+
+// Support: IE<8
+// Manipulating tables requires a tbody
+function manipulationTarget( elem, content ) {
+ return jQuery.nodeName( elem, "table" ) &&
+ jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
+
+ elem.getElementsByTagName("tbody")[0] ||
+ elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
+ elem;
+}
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+ elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
+ return elem;
+}
+function restoreScript( elem ) {
+ var match = rscriptTypeMasked.exec( elem.type );
+ if ( match ) {
+ elem.type = match[1];
+ } else {
+ elem.removeAttribute("type");
+ }
+ return elem;
+}
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+ var elem,
+ i = 0;
+ for ( ; (elem = elems[i]) != null; i++ ) {
+ jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
+ }
+}
+
+function cloneCopyEvent( src, dest ) {
+
+ if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+ return;
+ }
+
+ var type, i, l,
+ oldData = jQuery._data( src ),
+ curData = jQuery._data( dest, oldData ),
+ events = oldData.events;
+
+ if ( events ) {
+ delete curData.handle;
+ curData.events = {};
+
+ for ( type in events ) {
+ for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+ jQuery.event.add( dest, type, events[ type ][ i ] );
+ }
+ }
+ }
+
+ // make the cloned public data object a copy from the original
+ if ( curData.data ) {
+ curData.data = jQuery.extend( {}, curData.data );
+ }
+}
+
+function fixCloneNodeIssues( src, dest ) {
+ var nodeName, e, data;
+
+ // We do not need to do anything for non-Elements
+ if ( dest.nodeType !== 1 ) {
+ return;
+ }
+
+ nodeName = dest.nodeName.toLowerCase();
+
+ // IE6-8 copies events bound via attachEvent when using cloneNode.
+ if ( !support.noCloneEvent && dest[ jQuery.expando ] ) {
+ data = jQuery._data( dest );
+
+ for ( e in data.events ) {
+ jQuery.removeEvent( dest, e, data.handle );
+ }
+
+ // Event data gets referenced instead of copied if the expando gets copied too
+ dest.removeAttribute( jQuery.expando );
+ }
+
+ // IE blanks contents when cloning scripts, and tries to evaluate newly-set text
+ if ( nodeName === "script" && dest.text !== src.text ) {
+ disableScript( dest ).text = src.text;
+ restoreScript( dest );
+
+ // IE6-10 improperly clones children of object elements using classid.
+ // IE10 throws NoModificationAllowedError if parent is null, #12132.
+ } else if ( nodeName === "object" ) {
+ if ( dest.parentNode ) {
+ dest.outerHTML = src.outerHTML;
+ }
+
+ // This path appears unavoidable for IE9. When cloning an object
+ // element in IE9, the outerHTML strategy above is not sufficient.
+ // If the src has innerHTML and the destination does not,
+ // copy the src.innerHTML into the dest.innerHTML. #10324
+ if ( support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
+ dest.innerHTML = src.innerHTML;
+ }
+
+ } else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+ // IE6-8 fails to persist the checked state of a cloned checkbox
+ // or radio button. Worse, IE6-7 fail to give the cloned element
+ // a checked appearance if the defaultChecked value isn't also set
+
+ dest.defaultChecked = dest.checked = src.checked;
+
+ // IE6-7 get confused and end up setting the value of a cloned
+ // checkbox/radio button to an empty string instead of "on"
+ if ( dest.value !== src.value ) {
+ dest.value = src.value;
+ }
+
+ // IE6-8 fails to return the selected option to the default selected
+ // state when cloning options
+ } else if ( nodeName === "option" ) {
+ dest.defaultSelected = dest.selected = src.defaultSelected;
+
+ // IE6-8 fails to set the defaultValue to the correct value when
+ // cloning other types of input fields
+ } else if ( nodeName === "input" || nodeName === "textarea" ) {
+ dest.defaultValue = src.defaultValue;
+ }
+}
+
+jQuery.extend({
+ clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+ var destElements, node, clone, i, srcElements,
+ inPage = jQuery.contains( elem.ownerDocument, elem );
+
+ if ( support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+ clone = elem.cloneNode( true );
+
+ // IE<=8 does not properly clone detached, unknown element nodes
+ } else {
+ fragmentDiv.innerHTML = elem.outerHTML;
+ fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
+ }
+
+ if ( (!support.noCloneEvent || !support.noCloneChecked) &&
+ (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+
+ // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+ destElements = getAll( clone );
+ srcElements = getAll( elem );
+
+ // Fix all IE cloning issues
+ for ( i = 0; (node = srcElements[i]) != null; ++i ) {
+ // Ensure that the destination node is not null; Fixes #9587
+ if ( destElements[i] ) {
+ fixCloneNodeIssues( node, destElements[i] );
+ }
+ }
+ }
+
+ // Copy the events from the original to the clone
+ if ( dataAndEvents ) {
+ if ( deepDataAndEvents ) {
+ srcElements = srcElements || getAll( elem );
+ destElements = destElements || getAll( clone );
+
+ for ( i = 0; (node = srcElements[i]) != null; i++ ) {
+ cloneCopyEvent( node, destElements[i] );
+ }
+ } else {
+ cloneCopyEvent( elem, clone );
+ }
+ }
+
+ // Preserve script evaluation history
+ destElements = getAll( clone, "script" );
+ if ( destElements.length > 0 ) {
+ setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+ }
+
+ destElements = srcElements = node = null;
+
+ // Return the cloned set
+ return clone;
+ },
+
+ buildFragment: function( elems, context, scripts, selection ) {
+ var j, elem, contains,
+ tmp, tag, tbody, wrap,
+ l = elems.length,
+
+ // Ensure a safe fragment
+ safe = createSafeFragment( context ),
+
+ nodes = [],
+ i = 0;
+
+ for ( ; i < l; i++ ) {
+ elem = elems[ i ];
+
+ if ( elem || elem === 0 ) {
+
+ // Add nodes directly
+ if ( jQuery.type( elem ) === "object" ) {
+ jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+ // Convert non-html into a text node
+ } else if ( !rhtml.test( elem ) ) {
+ nodes.push( context.createTextNode( elem ) );
+
+ // Convert html into DOM nodes
+ } else {
+ tmp = tmp || safe.appendChild( context.createElement("div") );
+
+ // Deserialize a standard representation
+ tag = (rtagName.exec( elem ) || [ "", "" ])[ 1 ].toLowerCase();
+ wrap = wrapMap[ tag ] || wrapMap._default;
+
+ tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
+
+ // Descend through wrappers to the right content
+ j = wrap[0];
+ while ( j-- ) {
+ tmp = tmp.lastChild;
+ }
+
+ // Manually add leading whitespace removed by IE
+ if ( !support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+ nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
+ }
+
+ // Remove IE's autoinserted <tbody> from table fragments
+ if ( !support.tbody ) {
+
+ // String was a <table>, *may* have spurious <tbody>
+ elem = tag === "table" && !rtbody.test( elem ) ?
+ tmp.firstChild :
+
+ // String was a bare <thead> or <tfoot>
+ wrap[1] === "<table>" && !rtbody.test( elem ) ?
+ tmp :
+ 0;
+
+ j = elem && elem.childNodes.length;
+ while ( j-- ) {
+ if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
+ elem.removeChild( tbody );
+ }
+ }
+ }
+
+ jQuery.merge( nodes, tmp.childNodes );
+
+ // Fix #12392 for WebKit and IE > 9
+ tmp.textContent = "";
+
+ // Fix #12392 for oldIE
+ while ( tmp.firstChild ) {
+ tmp.removeChild( tmp.firstChild );
+ }
+
+ // Remember the top-level container for proper cleanup
+ tmp = safe.lastChild;
+ }
+ }
+ }
+
+ // Fix #11356: Clear elements from fragment
+ if ( tmp ) {
+ safe.removeChild( tmp );
+ }
+
+ // Reset defaultChecked for any radios and checkboxes
+ // about to be appended to the DOM in IE 6/7 (#8060)
+ if ( !support.appendChecked ) {
+ jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
+ }
+
+ i = 0;
+ while ( (elem = nodes[ i++ ]) ) {
+
+ // #4087 - If origin and destination elements are the same, and this is
+ // that element, do not do anything
+ if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
+ continue;
+ }
+
+ contains = jQuery.contains( elem.ownerDocument, elem );
+
+ // Append to fragment
+ tmp = getAll( safe.appendChild( elem ), "script" );
+
+ // Preserve script evaluation history
+ if ( contains ) {
+ setGlobalEval( tmp );
+ }
+
+ // Capture executables
+ if ( scripts ) {
+ j = 0;
+ while ( (elem = tmp[ j++ ]) ) {
+ if ( rscriptType.test( elem.type || "" ) ) {
+ scripts.push( elem );
+ }
+ }
+ }
+ }
+
+ tmp = null;
+
+ return safe;
+ },
+
+ cleanData: function( elems, /* internal */ acceptData ) {
+ var elem, type, id, data,
+ i = 0,
+ internalKey = jQuery.expando,
+ cache = jQuery.cache,
+ deleteExpando = support.deleteExpando,
+ special = jQuery.event.special;
+
+ for ( ; (elem = elems[i]) != null; i++ ) {
+ if ( acceptData || jQuery.acceptData( elem ) ) {
+
+ id = elem[ internalKey ];
+ data = id && cache[ id ];
+
+ if ( data ) {
+ if ( data.events ) {
+ for ( type in data.events ) {
+ if ( special[ type ] ) {
+ jQuery.event.remove( elem, type );
+
+ // This is a shortcut to avoid jQuery.event.remove's overhead
+ } else {
+ jQuery.removeEvent( elem, type, data.handle );
+ }
+ }
+ }
+
+ // Remove cache only if it was not already removed by jQuery.event.remove
+ if ( cache[ id ] ) {
+
+ delete cache[ id ];
+
+ // IE does not allow us to delete expando properties from nodes,
+ // nor does it have a removeAttribute function on Document nodes;
+ // we must handle all of these cases
+ if ( deleteExpando ) {
+ delete elem[ internalKey ];
+
+ } else if ( typeof elem.removeAttribute !== strundefined ) {
+ elem.removeAttribute( internalKey );
+
+ } else {
+ elem[ internalKey ] = null;
+ }
+
+ deletedIds.push( id );
+ }
+ }
+ }
+ }
+ }
+});
+
+jQuery.fn.extend({
+ text: function( value ) {
+ return access( this, function( value ) {
+ return value === undefined ?
+ jQuery.text( this ) :
+ this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+ }, null, value, arguments.length );
+ },
+
+ append: function() {
+ return this.domManip( arguments, function( elem ) {
+ if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+ var target = manipulationTarget( this, elem );
+ target.appendChild( elem );
+ }
+ });
+ },
+
+ prepend: function() {
+ return this.domManip( arguments, function( elem ) {
+ if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+ var target = manipulationTarget( this, elem );
+ target.insertBefore( elem, target.firstChild );
+ }
+ });
+ },
+
+ before: function() {
+ return this.domManip( arguments, function( elem ) {
+ if ( this.parentNode ) {
+ this.parentNode.insertBefore( elem, this );
+ }
+ });
+ },
+
+ after: function() {
+ return this.domManip( arguments, function( elem ) {
+ if ( this.parentNode ) {
+ this.parentNode.insertBefore( elem, this.nextSibling );
+ }
+ });
+ },
+
+ remove: function( selector, keepData /* Internal Use Only */ ) {
+ var elem,
+ elems = selector ? jQuery.filter( selector, this ) : this,
+ i = 0;
+
+ for ( ; (elem = elems[i]) != null; i++ ) {
+
+ if ( !keepData && elem.nodeType === 1 ) {
+ jQuery.cleanData( getAll( elem ) );
+ }
+
+ if ( elem.parentNode ) {
+ if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
+ setGlobalEval( getAll( elem, "script" ) );
+ }
+ elem.parentNode.removeChild( elem );
+ }
+ }
+
+ return this;
+ },
+
+ empty: function() {
+ var elem,
+ i = 0;
+
+ for ( ; (elem = this[i]) != null; i++ ) {
+ // Remove element nodes and prevent memory leaks
+ if ( elem.nodeType === 1 ) {
+ jQuery.cleanData( getAll( elem, false ) );
+ }
+
+ // Remove any remaining nodes
+ while ( elem.firstChild ) {
+ elem.removeChild( elem.firstChild );
+ }
+
+ // If this is a select, ensure that it displays empty (#12336)
+ // Support: IE<9
+ if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
+ elem.options.length = 0;
+ }
+ }
+
+ return this;
+ },
+
+ clone: function( dataAndEvents, deepDataAndEvents ) {
+ dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+ deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+ return this.map(function() {
+ return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+ });
+ },
+
+ html: function( value ) {
+ return access( this, function( value ) {
+ var elem = this[ 0 ] || {},
+ i = 0,
+ l = this.length;
+
+ if ( value === undefined ) {
+ return elem.nodeType === 1 ?
+ elem.innerHTML.replace( rinlinejQuery, "" ) :
+ undefined;
+ }
+
+ // See if we can take a shortcut and just use innerHTML
+ if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+ ( support.htmlSerialize || !rnoshimcache.test( value ) ) &&
+ ( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+ !wrapMap[ (rtagName.exec( value ) || [ "", "" ])[ 1 ].toLowerCase() ] ) {
+
+ value = value.replace( rxhtmlTag, "<$1></$2>" );
+
+ try {
+ for (; i < l; i++ ) {
+ // Remove element nodes and prevent memory leaks
+ elem = this[i] || {};
+ if ( elem.nodeType === 1 ) {
+ jQuery.cleanData( getAll( elem, false ) );
+ elem.innerHTML = value;
+ }
+ }
+
+ elem = 0;
+
+ // If using innerHTML throws an exception, use the fallback method
+ } catch(e) {}
+ }
+
+ if ( elem ) {
+ this.empty().append( value );
+ }
+ }, null, value, arguments.length );
+ },
+
+ replaceWith: function() {
+ var arg = arguments[ 0 ];
+
+ // Make the changes, replacing each context element with the new content
+ this.domManip( arguments, function( elem ) {
+ arg = this.parentNode;
+
+ jQuery.cleanData( getAll( this ) );
+
+ if ( arg ) {
+ arg.replaceChild( elem, this );
+ }
+ });
+
+ // Force removal if there was no new content (e.g., from empty arguments)
+ return arg && (arg.length || arg.nodeType) ? this : this.remove();
+ },
+
+ detach: function( selector ) {
+ return this.remove( selector, true );
+ },
+
+ domManip: function( args, callback ) {
+
+ // Flatten any nested arrays
+ args = concat.apply( [], args );
+
+ var first, node, hasScripts,
+ scripts, doc, fragment,
+ i = 0,
+ l = this.length,
+ set = this,
+ iNoClone = l - 1,
+ value = args[0],
+ isFunction = jQuery.isFunction( value );
+
+ // We can't cloneNode fragments that contain checked, in WebKit
+ if ( isFunction ||
+ ( l > 1 && typeof value === "string" &&
+ !support.checkClone && rchecked.test( value ) ) ) {
+ return this.each(function( index ) {
+ var self = set.eq( index );
+ if ( isFunction ) {
+ args[0] = value.call( this, index, self.html() );
+ }
+ self.domManip( args, callback );
+ });
+ }
+
+ if ( l ) {
+ fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
+ first = fragment.firstChild;
+
+ if ( fragment.childNodes.length === 1 ) {
+ fragment = first;
+ }
+
+ if ( first ) {
+ scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+ hasScripts = scripts.length;
+
+ // Use the original fragment for the last item instead of the first because it can end up
+ // being emptied incorrectly in certain situations (#8070).
+ for ( ; i < l; i++ ) {
+ node = fragment;
+
+ if ( i !== iNoClone ) {
+ node = jQuery.clone( node, true, true );
+
+ // Keep references to cloned scripts for later restoration
+ if ( hasScripts ) {
+ jQuery.merge( scripts, getAll( node, "script" ) );
+ }
+ }
+
+ callback.call( this[i], node, i );
+ }
+
+ if ( hasScripts ) {
+ doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+ // Reenable scripts
+ jQuery.map( scripts, restoreScript );
+
+ // Evaluate executable scripts on first document insertion
+ for ( i = 0; i < hasScripts; i++ ) {
+ node = scripts[ i ];
+ if ( rscriptType.test( node.type || "" ) &&
+ !jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
+
+ if ( node.src ) {
+ // Optional AJAX dependency, but won't run scripts if not present
+ if ( jQuery._evalUrl ) {
+ jQuery._evalUrl( node.src );
+ }
+ } else {
+ jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
+ }
+ }
+ }
+ }
+
+ // Fix #11809: Avoid leaking memory
+ fragment = first = null;
+ }
+ }
+
+ return this;
+ }
+});
+
+jQuery.each({
+ appendTo: "append",
+ prependTo: "prepend",
+ insertBefore: "before",
+ insertAfter: "after",
+ replaceAll: "replaceWith"
+}, function( name, original ) {
+ jQuery.fn[ name ] = function( selector ) {
+ var elems,
+ i = 0,
+ ret = [],
+ insert = jQuery( selector ),
+ last = insert.length - 1;
+
+ for ( ; i <= last; i++ ) {
+ elems = i === last ? this : this.clone(true);
+ jQuery( insert[i] )[ original ]( elems );
+
+ // Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+ push.apply( ret, elems.get() );
+ }
+
+ return this.pushStack( ret );
+ };
+});
+
+
+var iframe,
+ elemdisplay = {};
+
+/**
+ * Retrieve the actual display of a element
+ * @param {String} name nodeName of the element
+ * @param {Object} doc Document object
+ */
+// Called only from within defaultDisplay
+function actualDisplay( name, doc ) {
+ var style,
+ elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+
+ // getDefaultComputedStyle might be reliably used only on attached element
+ display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
+
+ // Use of this method is a temporary fix (more like optmization) until something better comes along,
+ // since it was removed from specification and supported only in FF
+ style.display : jQuery.css( elem[ 0 ], "display" );
+
+ // We don't have any data stored on the element,
+ // so use "detach" method as fast way to get rid of the element
+ elem.detach();
+
+ return display;
+}
+
+/**
+ * Try to determine the default display value of an element
+ * @param {String} nodeName
+ */
+function defaultDisplay( nodeName ) {
+ var doc = document,
+ display = elemdisplay[ nodeName ];
+
+ if ( !display ) {
+ display = actualDisplay( nodeName, doc );
+
+ // If the simple way fails, read from inside an iframe
+ if ( display === "none" || !display ) {
+
+ // Use the already-created iframe if possible
+ iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement );
+
+ // Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+ doc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
+
+ // Support: IE
+ doc.write();
+ doc.close();
+
+ display = actualDisplay( nodeName, doc );
+ iframe.detach();
+ }
+
+ // Store the correct default display
+ elemdisplay[ nodeName ] = display;
+ }
+
+ return display;
+}
+
+
+(function() {
+ var shrinkWrapBlocksVal;
+
+ support.shrinkWrapBlocks = function() {
+ if ( shrinkWrapBlocksVal != null ) {
+ return shrinkWrapBlocksVal;
+ }
+
+ // Will be changed later if needed.
+ shrinkWrapBlocksVal = false;
+
+ // Minified: var b,c,d
+ var div, body, container;
+
+ body = document.getElementsByTagName( "body" )[ 0 ];
+ if ( !body || !body.style ) {
+ // Test fired too early or in an unsupported environment, exit.
+ return;
+ }
+
+ // Setup
+ div = document.createElement( "div" );
+ container = document.createElement( "div" );
+ container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+ body.appendChild( container ).appendChild( div );
+
+ // Support: IE6
+ // Check if elements with layout shrink-wrap their children
+ if ( typeof div.style.zoom !== strundefined ) {
+ // Reset CSS: box-sizing; display; margin; border
+ div.style.cssText =
+ // Support: Firefox<29, Android 2.3
+ // Vendor-prefix box-sizing
+ "-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+ "box-sizing:content-box;display:block;margin:0;border:0;" +
+ "padding:1px;width:1px;zoom:1";
+ div.appendChild( document.createElement( "div" ) ).style.width = "5px";
+ shrinkWrapBlocksVal = div.offsetWidth !== 3;
+ }
+
+ body.removeChild( container );
+
+ return shrinkWrapBlocksVal;
+ };
+
+})();
+var rmargin = (/^margin/);
+
+var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+
+
+
+var getStyles, curCSS,
+ rposition = /^(top|right|bottom|left)$/;
+
+if ( window.getComputedStyle ) {
+ getStyles = function( elem ) {
+ return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+ };
+
+ curCSS = function( elem, name, computed ) {
+ var width, minWidth, maxWidth, ret,
+ style = elem.style;
+
+ computed = computed || getStyles( elem );
+
+ // getPropertyValue is only needed for .css('filter') in IE9, see #12537
+ ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
+
+ if ( computed ) {
+
+ if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+ ret = jQuery.style( elem, name );
+ }
+
+ // A tribute to the "awesome hack by Dean Edwards"
+ // Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
+ // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
+ // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+ if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+ // Remember the original values
+ width = style.width;
+ minWidth = style.minWidth;
+ maxWidth = style.maxWidth;
+
+ // Put in the new values to get a computed value out
+ style.minWidth = style.maxWidth = style.width = ret;
+ ret = computed.width;
+
+ // Revert the changed values
+ style.width = width;
+ style.minWidth = minWidth;
+ style.maxWidth = maxWidth;
+ }
+ }
+
+ // Support: IE
+ // IE returns zIndex value as an integer.
+ return ret === undefined ?
+ ret :
+ ret + "";
+ };
+} else if ( document.documentElement.currentStyle ) {
+ getStyles = function( elem ) {
+ return elem.currentStyle;
+ };
+
+ curCSS = function( elem, name, computed ) {
+ var left, rs, rsLeft, ret,
+ style = elem.style;
+
+ computed = computed || getStyles( elem );
+ ret = computed ? computed[ name ] : undefined;
+
+ // Avoid setting ret to empty string here
+ // so we don't default to auto
+ if ( ret == null && style && style[ name ] ) {
+ ret = style[ name ];
+ }
+
+ // From the awesome hack by Dean Edwards
+ // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+ // If we're not dealing with a regular pixel number
+ // but a number that has a weird ending, we need to convert it to pixels
+ // but not position css attributes, as those are proportional to the parent element instead
+ // and we can't measure the parent instead because it might trigger a "stacking dolls" problem
+ if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+ // Remember the original values
+ left = style.left;
+ rs = elem.runtimeStyle;
+ rsLeft = rs && rs.left;
+
+ // Put in the new values to get a computed value out
+ if ( rsLeft ) {
+ rs.left = elem.currentStyle.left;
+ }
+ style.left = name === "fontSize" ? "1em" : ret;
+ ret = style.pixelLeft + "px";
+
+ // Revert the changed values
+ style.left = left;
+ if ( rsLeft ) {
+ rs.left = rsLeft;
+ }
+ }
+
+ // Support: IE
+ // IE returns zIndex value as an integer.
+ return ret === undefined ?
+ ret :
+ ret + "" || "auto";
+ };
+}
+
+
+
+
+function addGetHookIf( conditionFn, hookFn ) {
+ // Define the hook, we'll check on the first run if it's really needed.
+ return {
+ get: function() {
+ var condition = conditionFn();
+
+ if ( condition == null ) {
+ // The test was not ready at this point; screw the hook this time
+ // but check again when needed next time.
+ return;
+ }
+
+ if ( condition ) {
+ // Hook not needed (or it's not possible to use it due to missing dependency),
+ // remove it.
+ // Since there are no other hooks for marginRight, remove the whole object.
+ delete this.get;
+ return;
+ }
+
+ // Hook needed; redefine it so that the support test is not executed again.
+
+ return (this.get = hookFn).apply( this, arguments );
+ }
+ };
+}
+
+
+(function() {
+ // Minified: var b,c,d,e,f,g, h,i
+ var div, style, a, pixelPositionVal, boxSizingReliableVal,
+ reliableHiddenOffsetsVal, reliableMarginRightVal;
+
+ // Setup
+ div = document.createElement( "div" );
+ div.innerHTML = " <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+ a = div.getElementsByTagName( "a" )[ 0 ];
+ style = a && a.style;
+
+ // Finish early in limited (non-browser) environments
+ if ( !style ) {
+ return;
+ }
+
+ style.cssText = "float:left;opacity:.5";
+
+ // Support: IE<9
+ // Make sure that element opacity exists (as opposed to filter)
+ support.opacity = style.opacity === "0.5";
+
+ // Verify style float existence
+ // (IE uses styleFloat instead of cssFloat)
+ support.cssFloat = !!style.cssFloat;
+
+ div.style.backgroundClip = "content-box";
+ div.cloneNode( true ).style.backgroundClip = "";
+ support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+ // Support: Firefox<29, Android 2.3
+ // Vendor-prefix box-sizing
+ support.boxSizing = style.boxSizing === "" || style.MozBoxSizing === "" ||
+ style.WebkitBoxSizing === "";
+
+ jQuery.extend(support, {
+ reliableHiddenOffsets: function() {
+ if ( reliableHiddenOffsetsVal == null ) {
+ computeStyleTests();
+ }
+ return reliableHiddenOffsetsVal;
+ },
+
+ boxSizingReliable: function() {
+ if ( boxSizingReliableVal == null ) {
+ computeStyleTests();
+ }
+ return boxSizingReliableVal;
+ },
+
+ pixelPosition: function() {
+ if ( pixelPositionVal == null ) {
+ computeStyleTests();
+ }
+ return pixelPositionVal;
+ },
+
+ // Support: Android 2.3
+ reliableMarginRight: function() {
+ if ( reliableMarginRightVal == null ) {
+ computeStyleTests();
+ }
+ return reliableMarginRightVal;
+ }
+ });
+
+ function computeStyleTests() {
+ // Minified: var b,c,d,j
+ var div, body, container, contents;
+
+ body = document.getElementsByTagName( "body" )[ 0 ];
+ if ( !body || !body.style ) {
+ // Test fired too early or in an unsupported environment, exit.
+ return;
+ }
+
+ // Setup
+ div = document.createElement( "div" );
+ container = document.createElement( "div" );
+ container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+ body.appendChild( container ).appendChild( div );
+
+ div.style.cssText =
+ // Support: Firefox<29, Android 2.3
+ // Vendor-prefix box-sizing
+ "-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" +
+ "box-sizing:border-box;display:block;margin-top:1%;top:1%;" +
+ "border:1px;padding:1px;width:4px;position:absolute";
+
+ // Support: IE<9
+ // Assume reasonable values in the absence of getComputedStyle
+ pixelPositionVal = boxSizingReliableVal = false;
+ reliableMarginRightVal = true;
+
+ // Check for getComputedStyle so that this code is not run in IE<9.
+ if ( window.getComputedStyle ) {
+ pixelPositionVal = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
+ boxSizingReliableVal =
+ ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
+
+ // Support: Android 2.3
+ // Div with explicit width and no margin-right incorrectly
+ // gets computed margin-right based on width of container (#3333)
+ // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+ contents = div.appendChild( document.createElement( "div" ) );
+
+ // Reset CSS: box-sizing; display; margin; border; padding
+ contents.style.cssText = div.style.cssText =
+ // Support: Firefox<29, Android 2.3
+ // Vendor-prefix box-sizing
+ "-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+ "box-sizing:content-box;display:block;margin:0;border:0;padding:0";
+ contents.style.marginRight = contents.style.width = "0";
+ div.style.width = "1px";
+
+ reliableMarginRightVal =
+ !parseFloat( ( window.getComputedStyle( contents, null ) || {} ).marginRight );
+ }
+
+ // Support: IE8
+ // Check if table cells still have offsetWidth/Height when they are set
+ // to display:none and there are still other visible table cells in a
+ // table row; if so, offsetWidth/Height are not reliable for use when
+ // determining if an element has been hidden directly using
+ // display:none (it is still safe to use offsets if a parent element is
+ // hidden; don safety goggles and see bug #4512 for more information).
+ div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+ contents = div.getElementsByTagName( "td" );
+ contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
+ reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+ if ( reliableHiddenOffsetsVal ) {
+ contents[ 0 ].style.display = "";
+ contents[ 1 ].style.display = "none";
+ reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+ }
+
+ body.removeChild( container );
+ }
+
+})();
+
+
+// A method for quickly swapping in/out CSS properties to get correct calculations.
+jQuery.swap = function( elem, options, callback, args ) {
+ var ret, name,
+ old = {};
+
+ // Remember the old values, and insert the new ones
+ for ( name in options ) {
+ old[ name ] = elem.style[ name ];
+ elem.style[ name ] = options[ name ];
+ }
+
+ ret = callback.apply( elem, args || [] );
+
+ // Revert the old values
+ for ( name in options ) {
+ elem.style[ name ] = old[ name ];
+ }
+
+ return ret;
+};
+
+
+var
+ ralpha = /alpha\([^)]*\)/i,
+ ropacity = /opacity\s*=\s*([^)]*)/,
+
+ // swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
+ // see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+ rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+ rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
+ rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ),
+
+ cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+ cssNormalTransform = {
+ letterSpacing: "0",
+ fontWeight: "400"
+ },
+
+ cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+
+
+// return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( style, name ) {
+
+ // shortcut for names that are not vendor prefixed
+ if ( name in style ) {
+ return name;
+ }
+
+ // check for vendor prefixed names
+ var capName = name.charAt(0).toUpperCase() + name.slice(1),
+ origName = name,
+ i = cssPrefixes.length;
+
+ while ( i-- ) {
+ name = cssPrefixes[ i ] + capName;
+ if ( name in style ) {
+ return name;
+ }
+ }
+
+ return origName;
+}
+
+function showHide( elements, show ) {
+ var display, elem, hidden,
+ values = [],
+ index = 0,
+ length = elements.length;
+
+ for ( ; index < length; index++ ) {
+ elem = elements[ index ];
+ if ( !elem.style ) {
+ continue;
+ }
+
+ values[ index ] = jQuery._data( elem, "olddisplay" );
+ display = elem.style.display;
+ if ( show ) {
+ // Reset the inline display of this element to learn if it is
+ // being hidden by cascaded rules or not
+ if ( !values[ index ] && display === "none" ) {
+ elem.style.display = "";
+ }
+
+ // Set elements which have been overridden with display: none
+ // in a stylesheet to whatever the default browser style is
+ // for such an element
+ if ( elem.style.display === "" && isHidden( elem ) ) {
+ values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
+ }
+ } else {
+ hidden = isHidden( elem );
+
+ if ( display && display !== "none" || !hidden ) {
+ jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
+ }
+ }
+ }
+
+ // Set the display of most of the elements in a second loop
+ // to avoid the constant reflow
+ for ( index = 0; index < length; index++ ) {
+ elem = elements[ index ];
+ if ( !elem.style ) {
+ continue;
+ }
+ if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+ elem.style.display = show ? values[ index ] || "" : "none";
+ }
+ }
+
+ return elements;
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+ var matches = rnumsplit.exec( value );
+ return matches ?
+ // Guard against undefined "subtract", e.g., when used as in cssHooks
+ Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+ value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+ var i = extra === ( isBorderBox ? "border" : "content" ) ?
+ // If we already have the right measurement, avoid augmentation
+ 4 :
+ // Otherwise initialize for horizontal or vertical properties
+ name === "width" ? 1 : 0,
+
+ val = 0;
+
+ for ( ; i < 4; i += 2 ) {
+ // both box models exclude margin, so add it if we want it
+ if ( extra === "margin" ) {
+ val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+ }
+
+ if ( isBorderBox ) {
+ // border-box includes padding, so remove it if we want content
+ if ( extra === "content" ) {
+ val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+ }
+
+ // at this point, extra isn't border nor margin, so remove border
+ if ( extra !== "margin" ) {
+ val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+ }
+ } else {
+ // at this point, extra isn't content, so add padding
+ val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+ // at this point, extra isn't content nor padding, so add border
+ if ( extra !== "padding" ) {
+ val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+ }
+ }
+ }
+
+ return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+ // Start with offset property, which is equivalent to the border-box value
+ var valueIsBorderBox = true,
+ val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+ styles = getStyles( elem ),
+ isBorderBox = support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+ // some non-html elements return undefined for offsetWidth, so check for null/undefined
+ // svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+ // MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+ if ( val <= 0 || val == null ) {
+ // Fall back to computed then uncomputed css if necessary
+ val = curCSS( elem, name, styles );
+ if ( val < 0 || val == null ) {
+ val = elem.style[ name ];
+ }
+
+ // Computed unit is not pixels. Stop here and return.
+ if ( rnumnonpx.test(val) ) {
+ return val;
+ }
+
+ // we need the check for style in case a browser which returns unreliable values
+ // for getComputedStyle silently falls back to the reliable elem.style
+ valueIsBorderBox = isBorderBox && ( support.boxSizingReliable() || val === elem.style[ name ] );
+
+ // Normalize "", auto, and prepare for extra
+ val = parseFloat( val ) || 0;
+ }
+
+ // use the active box-sizing model to add/subtract irrelevant styles
+ return ( val +
+ augmentWidthOrHeight(
+ elem,
+ name,
+ extra || ( isBorderBox ? "border" : "content" ),
+ valueIsBorderBox,
+ styles
+ )
+ ) + "px";
+}
+
+jQuery.extend({
+ // Add in style property hooks for overriding the default
+ // behavior of getting and setting a style property
+ cssHooks: {
+ opacity: {
+ get: function( elem, computed ) {
+ if ( computed ) {
+ // We should always get a number back from opacity
+ var ret = curCSS( elem, "opacity" );
+ return ret === "" ? "1" : ret;
+ }
+ }
+ }
+ },
+
+ // Don't automatically add "px" to these possibly-unitless properties
+ cssNumber: {
+ "columnCount": true,
+ "fillOpacity": true,
+ "flexGrow": true,
+ "flexShrink": true,
+ "fontWeight": true,
+ "lineHeight": true,
+ "opacity": true,
+ "order": true,
+ "orphans": true,
+ "widows": true,
+ "zIndex": true,
+ "zoom": true
+ },
+
+ // Add in properties whose names you wish to fix before
+ // setting or getting the value
+ cssProps: {
+ // normalize float css property
+ "float": support.cssFloat ? "cssFloat" : "styleFloat"
+ },
+
+ // Get and set the style property on a DOM Node
+ style: function( elem, name, value, extra ) {
+ // Don't set styles on text and comment nodes
+ if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+ return;
+ }
+
+ // Make sure that we're working with the right name
+ var ret, type, hooks,
+ origName = jQuery.camelCase( name ),
+ style = elem.style;
+
+ name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+
+ // gets hook for the prefixed version
+ // followed by the unprefixed version
+ hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+ // Check if we're setting a value
+ if ( value !== undefined ) {
+ type = typeof value;
+
+ // convert relative number strings (+= or -=) to relative numbers. #7345
+ if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+ value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
+ // Fixes bug #9237
+ type = "number";
+ }
+
+ // Make sure that null and NaN values aren't set. See: #7116
+ if ( value == null || value !== value ) {
+ return;
+ }
+
+ // If a number was passed in, add 'px' to the (except for certain CSS properties)
+ if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+ value += "px";
+ }
+
+ // Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+ // but it would mean to define eight (for every problematic property) identical functions
+ if ( !support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
+ style[ name ] = "inherit";
+ }
+
+ // If a hook was provided, use that value, otherwise just set the specified value
+ if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+
+ // Support: IE
+ // Swallow errors from 'invalid' CSS values (#5509)
+ try {
+ style[ name ] = value;
+ } catch(e) {}
+ }
+
+ } else {
+ // If a hook was provided get the non-computed value from there
+ if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+ return ret;
+ }
+
+ // Otherwise just get the value from the style object
+ return style[ name ];
+ }
+ },
+
+ css: function( elem, name, extra, styles ) {
+ var num, val, hooks,
+ origName = jQuery.camelCase( name );
+
+ // Make sure that we're working with the right name
+ name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
+
+ // gets hook for the prefixed version
+ // followed by the unprefixed version
+ hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+ // If a hook was provided get the computed value from there
+ if ( hooks && "get" in hooks ) {
+ val = hooks.get( elem, true, extra );
+ }
+
+ // Otherwise, if a way to get the computed value exists, use that
+ if ( val === undefined ) {
+ val = curCSS( elem, name, styles );
+ }
+
+ //convert "normal" to computed value
+ if ( val === "normal" && name in cssNormalTransform ) {
+ val = cssNormalTransform[ name ];
+ }
+
+ // Return, converting to number if forced or a qualifier was provided and val looks numeric
+ if ( extra === "" || extra ) {
+ num = parseFloat( val );
+ return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
+ }
+ return val;
+ }
+});
+
+jQuery.each([ "height", "width" ], function( i, name ) {
+ jQuery.cssHooks[ name ] = {
+ get: function( elem, computed, extra ) {
+ if ( computed ) {
+ // certain elements can have dimension info if we invisibly show them
+ // however, it must have a current display style that would benefit from this
+ return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
+ jQuery.swap( elem, cssShow, function() {
+ return getWidthOrHeight( elem, name, extra );
+ }) :
+ getWidthOrHeight( elem, name, extra );
+ }
+ },
+
+ set: function( elem, value, extra ) {
+ var styles = extra && getStyles( elem );
+ return setPositiveNumber( elem, value, extra ?
+ augmentWidthOrHeight(
+ elem,
+ name,
+ extra,
+ support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+ styles
+ ) : 0
+ );
+ }
+ };
+});
+
+if ( !support.opacity ) {
+ jQuery.cssHooks.opacity = {
+ get: function( elem, computed ) {
+ // IE uses filters for opacity
+ return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+ ( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+ computed ? "1" : "";
+ },
+
+ set: function( elem, value ) {
+ var style = elem.style,
+ currentStyle = elem.currentStyle,
+ opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+ filter = currentStyle && currentStyle.filter || style.filter || "";
+
+ // IE has trouble with opacity if it does not have layout
+ // Force it by setting the zoom level
+ style.zoom = 1;
+
+ // if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+ // if value === "", then remove inline opacity #12685
+ if ( ( value >= 1 || value === "" ) &&
+ jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+ style.removeAttribute ) {
+
+ // Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+ // if "filter:" is present at all, clearType is disabled, we want to avoid this
+ // style.removeAttribute is IE Only, but so apparently is this code path...
+ style.removeAttribute( "filter" );
+
+ // if there is no filter style applied in a css rule or unset inline opacity, we are done
+ if ( value === "" || currentStyle && !currentStyle.filter ) {
+ return;
+ }
+ }
+
+ // otherwise, set new filter values
+ style.filter = ralpha.test( filter ) ?
+ filter.replace( ralpha, opacity ) :
+ filter + " " + opacity;
+ }
+ };
+}
+
+jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
+ function( elem, computed ) {
+ if ( computed ) {
+ // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+ // Work around by temporarily setting element display to inline-block
+ return jQuery.swap( elem, { "display": "inline-block" },
+ curCSS, [ elem, "marginRight" ] );
+ }
+ }
+);
+
+// These hooks are used by animate to expand properties
+jQuery.each({
+ margin: "",
+ padding: "",
+ border: "Width"
+}, function( prefix, suffix ) {
+ jQuery.cssHooks[ prefix + suffix ] = {
+ expand: function( value ) {
+ var i = 0,
+ expanded = {},
+
+ // assumes a single number if not a string
+ parts = typeof value === "string" ? value.split(" ") : [ value ];
+
+ for ( ; i < 4; i++ ) {
+ expanded[ prefix + cssExpand[ i ] + suffix ] =
+ parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+ }
+
+ return expanded;
+ }
+ };
+
+ if ( !rmargin.test( prefix ) ) {
+ jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+ }
+});
+
+jQuery.fn.extend({
+ css: function( name, value ) {
+ return access( this, function( elem, name, value ) {
+ var styles, len,
+ map = {},
+ i = 0;
+
+ if ( jQuery.isArray( name ) ) {
+ styles = getStyles( elem );
+ len = name.length;
+
+ for ( ; i < len; i++ ) {
+ map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+ }
+
+ return map;
+ }
+
+ return value !== undefined ?
+ jQuery.style( elem, name, value ) :
+ jQuery.css( elem, name );
+ }, name, value, arguments.length > 1 );
+ },
+ show: function() {
+ return showHide( this, true );
+ },
+ hide: function() {
+ return showHide( this );
+ },
+ toggle: function( state ) {
+ if ( typeof state === "boolean" ) {
+ return state ? this.show() : this.hide();
+ }
+
+ return this.each(function() {
+ if ( isHidden( this ) ) {
+ jQuery( this ).show();
+ } else {
+ jQuery( this ).hide();
+ }
+ });
+ }
+});
+
+
+function Tween( elem, options, prop, end, easing ) {
+ return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+ constructor: Tween,
+ init: function( elem, options, prop, end, easing, unit ) {
+ this.elem = elem;
+ this.prop = prop;
+ this.easing = easing || "swing";
+ this.options = options;
+ this.start = this.now = this.cur();
+ this.end = end;
+ this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+ },
+ cur: function() {
+ var hooks = Tween.propHooks[ this.prop ];
+
+ return hooks && hooks.get ?
+ hooks.get( this ) :
+ Tween.propHooks._default.get( this );
+ },
+ run: function( percent ) {
+ var eased,
+ hooks = Tween.propHooks[ this.prop ];
+
+ if ( this.options.duration ) {
+ this.pos = eased = jQuery.easing[ this.easing ](
+ percent, this.options.duration * percent, 0, 1, this.options.duration
+ );
+ } else {
+ this.pos = eased = percent;
+ }
+ this.now = ( this.end - this.start ) * eased + this.start;
+
+ if ( this.options.step ) {
+ this.options.step.call( this.elem, this.now, this );
+ }
+
+ if ( hooks && hooks.set ) {
+ hooks.set( this );
+ } else {
+ Tween.propHooks._default.set( this );
+ }
+ return this;
+ }
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+ _default: {
+ get: function( tween ) {
+ var result;
+
+ if ( tween.elem[ tween.prop ] != null &&
+ (!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
+ return tween.elem[ tween.prop ];
+ }
+
+ // passing an empty string as a 3rd parameter to .css will automatically
+ // attempt a parseFloat and fallback to a string if the parse fails
+ // so, simple values such as "10px" are parsed to Float.
+ // complex values such as "rotate(1rad)" are returned as is.
+ result = jQuery.css( tween.elem, tween.prop, "" );
+ // Empty strings, null, undefined and "auto" are converted to 0.
+ return !result || result === "auto" ? 0 : result;
+ },
+ set: function( tween ) {
+ // use step hook for back compat - use cssHook if its there - use .style if its
+ // available and use plain properties where available
+ if ( jQuery.fx.step[ tween.prop ] ) {
+ jQuery.fx.step[ tween.prop ]( tween );
+ } else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
+ jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+ } else {
+ tween.elem[ tween.prop ] = tween.now;
+ }
+ }
+ }
+};
+
+// Support: IE <=9
+// Panic based approach to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+ set: function( tween ) {
+ if ( tween.elem.nodeType && tween.elem.parentNode ) {
+ tween.elem[ tween.prop ] = tween.now;
+ }
+ }
+};
+
+jQuery.easing = {
+ linear: function( p ) {
+ return p;
+ },
+ swing: function( p ) {
+ return 0.5 - Math.cos( p * Math.PI ) / 2;
+ }
+};
+
+jQuery.fx = Tween.prototype.init;
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+
+
+
+var
+ fxNow, timerId,
+ rfxtypes = /^(?:toggle|show|hide)$/,
+ rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
+ rrun = /queueHooks$/,
+ animationPrefilters = [ defaultPrefilter ],
+ tweeners = {
+ "*": [ function( prop, value ) {
+ var tween = this.createTween( prop, value ),
+ target = tween.cur(),
+ parts = rfxnum.exec( value ),
+ unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+
+ // Starting value computation is required for potential unit mismatches
+ start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
+ rfxnum.exec( jQuery.css( tween.elem, prop ) ),
+ scale = 1,
+ maxIterations = 20;
+
+ if ( start && start[ 3 ] !== unit ) {
+ // Trust units reported by jQuery.css
+ unit = unit || start[ 3 ];
+
+ // Make sure we update the tween properties later on
+ parts = parts || [];
+
+ // Iteratively approximate from a nonzero starting point
+ start = +target || 1;
+
+ do {
+ // If previous iteration zeroed out, double until we get *something*
+ // Use a string for doubling factor so we don't accidentally see scale as unchanged below
+ scale = scale || ".5";
+
+ // Adjust and apply
+ start = start / scale;
+ jQuery.style( tween.elem, prop, start + unit );
+
+ // Update scale, tolerating zero or NaN from tween.cur()
+ // And breaking the loop if scale is unchanged or perfect, or if we've just had enough
+ } while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+ }
+
+ // Update tween properties
+ if ( parts ) {
+ start = tween.start = +start || +target || 0;
+ tween.unit = unit;
+ // If a +=/-= token was provided, we're doing a relative animation
+ tween.end = parts[ 1 ] ?
+ start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
+ +parts[ 2 ];
+ }
+
+ return tween;
+ } ]
+ };
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+ setTimeout(function() {
+ fxNow = undefined;
+ });
+ return ( fxNow = jQuery.now() );
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+ var which,
+ attrs = { height: type },
+ i = 0;
+
+ // if we include width, step value is 1 to do all cssExpand values,
+ // if we don't include width, step value is 2 to skip over Left and Right
+ includeWidth = includeWidth ? 1 : 0;
+ for ( ; i < 4 ; i += 2 - includeWidth ) {
+ which = cssExpand[ i ];
+ attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+ }
+
+ if ( includeWidth ) {
+ attrs.opacity = attrs.width = type;
+ }
+
+ return attrs;
+}
+
+function createTween( value, prop, animation ) {
+ var tween,
+ collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
+ index = 0,
+ length = collection.length;
+ for ( ; index < length; index++ ) {
+ if ( (tween = collection[ index ].call( animation, prop, value )) ) {
+
+ // we're done with this property
+ return tween;
+ }
+ }
+}
+
+function defaultPrefilter( elem, props, opts ) {
+ /* jshint validthis: true */
+ var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
+ anim = this,
+ orig = {},
+ style = elem.style,
+ hidden = elem.nodeType && isHidden( elem ),
+ dataShow = jQuery._data( elem, "fxshow" );
+
+ // handle queue: false promises
+ if ( !opts.queue ) {
+ hooks = jQuery._queueHooks( elem, "fx" );
+ if ( hooks.unqueued == null ) {
+ hooks.unqueued = 0;
+ oldfire = hooks.empty.fire;
+ hooks.empty.fire = function() {
+ if ( !hooks.unqueued ) {
+ oldfire();
+ }
+ };
+ }
+ hooks.unqueued++;
+
+ anim.always(function() {
+ // doing this makes sure that the complete handler will be called
+ // before this completes
+ anim.always(function() {
+ hooks.unqueued--;
+ if ( !jQuery.queue( elem, "fx" ).length ) {
+ hooks.empty.fire();
+ }
+ });
+ });
+ }
+
+ // height/width overflow pass
+ if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+ // Make sure that nothing sneaks out
+ // Record all 3 overflow attributes because IE does not
+ // change the overflow attribute when overflowX and
+ // overflowY are set to the same value
+ opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+ // Set display property to inline-block for height/width
+ // animations on inline elements that are having width/height animated
+ display = jQuery.css( elem, "display" );
+
+ // Test default display if display is currently "none"
+ checkDisplay = display === "none" ?
+ jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
+
+ if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
+
+ // inline-level elements accept inline-block;
+ // block-level elements need to be inline with layout
+ if ( !support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) {
+ style.display = "inline-block";
+ } else {
+ style.zoom = 1;
+ }
+ }
+ }
+
+ if ( opts.overflow ) {
+ style.overflow = "hidden";
+ if ( !support.shrinkWrapBlocks() ) {
+ anim.always(function() {
+ style.overflow = opts.overflow[ 0 ];
+ style.overflowX = opts.overflow[ 1 ];
+ style.overflowY = opts.overflow[ 2 ];
+ });
+ }
+ }
+
+ // show/hide pass
+ for ( prop in props ) {
+ value = props[ prop ];
+ if ( rfxtypes.exec( value ) ) {
+ delete props[ prop ];
+ toggle = toggle || value === "toggle";
+ if ( value === ( hidden ? "hide" : "show" ) ) {
+
+ // If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
+ if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+ hidden = true;
+ } else {
+ continue;
+ }
+ }
+ orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+
+ // Any non-fx value stops us from restoring the original display value
+ } else {
+ display = undefined;
+ }
+ }
+
+ if ( !jQuery.isEmptyObject( orig ) ) {
+ if ( dataShow ) {
+ if ( "hidden" in dataShow ) {
+ hidden = dataShow.hidden;
+ }
+ } else {
+ dataShow = jQuery._data( elem, "fxshow", {} );
+ }
+
+ // store state if its toggle - enables .stop().toggle() to "reverse"
+ if ( toggle ) {
+ dataShow.hidden = !hidden;
+ }
+ if ( hidden ) {
+ jQuery( elem ).show();
+ } else {
+ anim.done(function() {
+ jQuery( elem ).hide();
+ });
+ }
+ anim.done(function() {
+ var prop;
+ jQuery._removeData( elem, "fxshow" );
+ for ( prop in orig ) {
+ jQuery.style( elem, prop, orig[ prop ] );
+ }
+ });
+ for ( prop in orig ) {
+ tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+
+ if ( !( prop in dataShow ) ) {
+ dataShow[ prop ] = tween.start;
+ if ( hidden ) {
+ tween.end = tween.start;
+ tween.start = prop === "width" || prop === "height" ? 1 : 0;
+ }
+ }
+ }
+
+ // If this is a noop like .hide().hide(), restore an overwritten display value
+ } else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
+ style.display = display;
+ }
+}
+
+function propFilter( props, specialEasing ) {
+ var index, name, easing, value, hooks;
+
+ // camelCase, specialEasing and expand cssHook pass
+ for ( index in props ) {
+ name = jQuery.camelCase( index );
+ easing = specialEasing[ name ];
+ value = props[ index ];
+ if ( jQuery.isArray( value ) ) {
+ easing = value[ 1 ];
+ value = props[ index ] = value[ 0 ];
+ }
+
+ if ( index !== name ) {
+ props[ name ] = value;
+ delete props[ index ];
+ }
+
+ hooks = jQuery.cssHooks[ name ];
+ if ( hooks && "expand" in hooks ) {
+ value = hooks.expand( value );
+ delete props[ name ];
+
+ // not quite $.extend, this wont overwrite keys already present.
+ // also - reusing 'index' from above because we have the correct "name"
+ for ( index in value ) {
+ if ( !( index in props ) ) {
+ props[ index ] = value[ index ];
+ specialEasing[ index ] = easing;
+ }
+ }
+ } else {
+ specialEasing[ name ] = easing;
+ }
+ }
+}
+
+function Animation( elem, properties, options ) {
+ var result,
+ stopped,
+ index = 0,
+ length = animationPrefilters.length,
+ deferred = jQuery.Deferred().always( function() {
+ // don't match elem in the :animated selector
+ delete tick.elem;
+ }),
+ tick = function() {
+ if ( stopped ) {
+ return false;
+ }
+ var currentTime = fxNow || createFxNow(),
+ remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+ // archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+ temp = remaining / animation.duration || 0,
+ percent = 1 - temp,
+ index = 0,
+ length = animation.tweens.length;
+
+ for ( ; index < length ; index++ ) {
+ animation.tweens[ index ].run( percent );
+ }
+
+ deferred.notifyWith( elem, [ animation, percent, remaining ]);
+
+ if ( percent < 1 && length ) {
+ return remaining;
+ } else {
+ deferred.resolveWith( elem, [ animation ] );
+ return false;
+ }
+ },
+ animation = deferred.promise({
+ elem: elem,
+ props: jQuery.extend( {}, properties ),
+ opts: jQuery.extend( true, { specialEasing: {} }, options ),
+ originalProperties: properties,
+ originalOptions: options,
+ startTime: fxNow || createFxNow(),
+ duration: options.duration,
+ tweens: [],
+ createTween: function( prop, end ) {
+ var tween = jQuery.Tween( elem, animation.opts, prop, end,
+ animation.opts.specialEasing[ prop ] || animation.opts.easing );
+ animation.tweens.push( tween );
+ return tween;
+ },
+ stop: function( gotoEnd ) {
+ var index = 0,
+ // if we are going to the end, we want to run all the tweens
+ // otherwise we skip this part
+ length = gotoEnd ? animation.tweens.length : 0;
+ if ( stopped ) {
+ return this;
+ }
+ stopped = true;
+ for ( ; index < length ; index++ ) {
+ animation.tweens[ index ].run( 1 );
+ }
+
+ // resolve when we played the last frame
+ // otherwise, reject
+ if ( gotoEnd ) {
+ deferred.resolveWith( elem, [ animation, gotoEnd ] );
+ } else {
+ deferred.rejectWith( elem, [ animation, gotoEnd ] );
+ }
+ return this;
+ }
+ }),
+ props = animation.props;
+
+ propFilter( props, animation.opts.specialEasing );
+
+ for ( ; index < length ; index++ ) {
+ result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
+ if ( result ) {
+ return result;
+ }
+ }
+
+ jQuery.map( props, createTween, animation );
+
+ if ( jQuery.isFunction( animation.opts.start ) ) {
+ animation.opts.start.call( elem, animation );
+ }
+
+ jQuery.fx.timer(
+ jQuery.extend( tick, {
+ elem: elem,
+ anim: animation,
+ queue: animation.opts.queue
+ })
+ );
+
+ // attach callbacks from options
+ return animation.progress( animation.opts.progress )
+ .done( animation.opts.done, animation.opts.complete )
+ .fail( animation.opts.fail )
+ .always( animation.opts.always );
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+ tweener: function( props, callback ) {
+ if ( jQuery.isFunction( props ) ) {
+ callback = props;
+ props = [ "*" ];
+ } else {
+ props = props.split(" ");
+ }
+
+ var prop,
+ index = 0,
+ length = props.length;
+
+ for ( ; index < length ; index++ ) {
+ prop = props[ index ];
+ tweeners[ prop ] = tweeners[ prop ] || [];
+ tweeners[ prop ].unshift( callback );
+ }
+ },
+
+ prefilter: function( callback, prepend ) {
+ if ( prepend ) {
+ animationPrefilters.unshift( callback );
+ } else {
+ animationPrefilters.push( callback );
+ }
+ }
+});
+
+jQuery.speed = function( speed, easing, fn ) {
+ var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+ complete: fn || !fn && easing ||
+ jQuery.isFunction( speed ) && speed,
+ duration: speed,
+ easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+ };
+
+ opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+ opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+ // normalize opt.queue - true/undefined/null -> "fx"
+ if ( opt.queue == null || opt.queue === true ) {
+ opt.queue = "fx";
+ }
+
+ // Queueing
+ opt.old = opt.complete;
+
+ opt.complete = function() {
+ if ( jQuery.isFunction( opt.old ) ) {
+ opt.old.call( this );
+ }
+
+ if ( opt.queue ) {
+ jQuery.dequeue( this, opt.queue );
+ }
+ };
+
+ return opt;
+};
+
+jQuery.fn.extend({
+ fadeTo: function( speed, to, easing, callback ) {
+
+ // show any hidden elements after setting opacity to 0
+ return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+ // animate to the value specified
+ .end().animate({ opacity: to }, speed, easing, callback );
+ },
+ animate: function( prop, speed, easing, callback ) {
+ var empty = jQuery.isEmptyObject( prop ),
+ optall = jQuery.speed( speed, easing, callback ),
+ doAnimation = function() {
+ // Operate on a copy of prop so per-property easing won't be lost
+ var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+ // Empty animations, or finishing resolves immediately
+ if ( empty || jQuery._data( this, "finish" ) ) {
+ anim.stop( true );
+ }
+ };
+ doAnimation.finish = doAnimation;
+
+ return empty || optall.queue === false ?
+ this.each( doAnimation ) :
+ this.queue( optall.queue, doAnimation );
+ },
+ stop: function( type, clearQueue, gotoEnd ) {
+ var stopQueue = function( hooks ) {
+ var stop = hooks.stop;
+ delete hooks.stop;
+ stop( gotoEnd );
+ };
+
+ if ( typeof type !== "string" ) {
+ gotoEnd = clearQueue;
+ clearQueue = type;
+ type = undefined;
+ }
+ if ( clearQueue && type !== false ) {
+ this.queue( type || "fx", [] );
+ }
+
+ return this.each(function() {
+ var dequeue = true,
+ index = type != null && type + "queueHooks",
+ timers = jQuery.timers,
+ data = jQuery._data( this );
+
+ if ( index ) {
+ if ( data[ index ] && data[ index ].stop ) {
+ stopQueue( data[ index ] );
+ }
+ } else {
+ for ( index in data ) {
+ if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+ stopQueue( data[ index ] );
+ }
+ }
+ }
+
+ for ( index = timers.length; index--; ) {
+ if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+ timers[ index ].anim.stop( gotoEnd );
+ dequeue = false;
+ timers.splice( index, 1 );
+ }
+ }
+
+ // start the next in the queue if the last step wasn't forced
+ // timers currently will call their complete callbacks, which will dequeue
+ // but only if they were gotoEnd
+ if ( dequeue || !gotoEnd ) {
+ jQuery.dequeue( this, type );
+ }
+ });
+ },
+ finish: function( type ) {
+ if ( type !== false ) {
+ type = type || "fx";
+ }
+ return this.each(function() {
+ var index,
+ data = jQuery._data( this ),
+ queue = data[ type + "queue" ],
+ hooks = data[ type + "queueHooks" ],
+ timers = jQuery.timers,
+ length = queue ? queue.length : 0;
+
+ // enable finishing flag on private data
+ data.finish = true;
+
+ // empty the queue first
+ jQuery.queue( this, type, [] );
+
+ if ( hooks && hooks.stop ) {
+ hooks.stop.call( this, true );
+ }
+
+ // look for any active animations, and finish them
+ for ( index = timers.length; index--; ) {
+ if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+ timers[ index ].anim.stop( true );
+ timers.splice( index, 1 );
+ }
+ }
+
+ // look for any animations in the old queue and finish them
+ for ( index = 0; index < length; index++ ) {
+ if ( queue[ index ] && queue[ index ].finish ) {
+ queue[ index ].finish.call( this );
+ }
+ }
+
+ // turn off finishing flag
+ delete data.finish;
+ });
+ }
+});
+
+jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
+ var cssFn = jQuery.fn[ name ];
+ jQuery.fn[ name ] = function( speed, easing, callback ) {
+ return speed == null || typeof speed === "boolean" ?
+ cssFn.apply( this, arguments ) :
+ this.animate( genFx( name, true ), speed, easing, callback );
+ };
+});
+
+// Generate shortcuts for custom animations
+jQuery.each({
+ slideDown: genFx("show"),
+ slideUp: genFx("hide"),
+ slideToggle: genFx("toggle"),
+ fadeIn: { opacity: "show" },
+ fadeOut: { opacity: "hide" },
+ fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+ jQuery.fn[ name ] = function( speed, easing, callback ) {
+ return this.animate( props, speed, easing, callback );
+ };
+});
+
+jQuery.timers = [];
+jQuery.fx.tick = function() {
+ var timer,
+ timers = jQuery.timers,
+ i = 0;
+
+ fxNow = jQuery.now();
+
+ for ( ; i < timers.length; i++ ) {
+ timer = timers[ i ];
+ // Checks the timer has not already been removed
+ if ( !timer() && timers[ i ] === timer ) {
+ timers.splice( i--, 1 );
+ }
+ }
+
+ if ( !timers.length ) {
+ jQuery.fx.stop();
+ }
+ fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+ jQuery.timers.push( timer );
+ if ( timer() ) {
+ jQuery.fx.start();
+ } else {
+ jQuery.timers.pop();
+ }
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+ if ( !timerId ) {
+ timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+ }
+};
+
+jQuery.fx.stop = function() {
+ clearInterval( timerId );
+ timerId = null;
+};
+
+jQuery.fx.speeds = {
+ slow: 600,
+ fast: 200,
+ // Default speed
+ _default: 400
+};
+
+
+// Based off of the plugin by Clint Helfers, with permission.
+// http://blindsignals.com/index.php/2009/07/jquery-delay/
+jQuery.fn.delay = function( time, type ) {
+ time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+ type = type || "fx";
+
+ return this.queue( type, function( next, hooks ) {
+ var timeout = setTimeout( next, time );
+ hooks.stop = function() {
+ clearTimeout( timeout );
+ };
+ });
+};
+
+
+(function() {
+ // Minified: var a,b,c,d,e
+ var input, div, select, a, opt;
+
+ // Setup
+ div = document.createElement( "div" );
+ div.setAttribute( "className", "t" );
+ div.innerHTML = " <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+ a = div.getElementsByTagName("a")[ 0 ];
+
+ // First batch of tests.
+ select = document.createElement("select");
+ opt = select.appendChild( document.createElement("option") );
+ input = div.getElementsByTagName("input")[ 0 ];
+
+ a.style.cssText = "top:1px";
+
+ // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+ support.getSetAttribute = div.className !== "t";
+
+ // Get the style information from getAttribute
+ // (IE uses .cssText instead)
+ support.style = /top/.test( a.getAttribute("style") );
+
+ // Make sure that URLs aren't manipulated
+ // (IE normalizes it by default)
+ support.hrefNormalized = a.getAttribute("href") === "/a";
+
+ // Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+ support.checkOn = !!input.value;
+
+ // Make sure that a selected-by-default option has a working selected property.
+ // (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+ support.optSelected = opt.selected;
+
+ // Tests for enctype support on a form (#6743)
+ support.enctype = !!document.createElement("form").enctype;
+
+ // Make sure that the options inside disabled selects aren't marked as disabled
+ // (WebKit marks them as disabled)
+ select.disabled = true;
+ support.optDisabled = !opt.disabled;
+
+ // Support: IE8 only
+ // Check if we can trust getAttribute("value")
+ input = document.createElement( "input" );
+ input.setAttribute( "value", "" );
+ support.input = input.getAttribute( "value" ) === "";
+
+ // Check if an input maintains its value after becoming a radio
+ input.value = "t";
+ input.setAttribute( "type", "radio" );
+ support.radioValue = input.value === "t";
+})();
+
+
+var rreturn = /\r/g;
+
+jQuery.fn.extend({
+ val: function( value ) {
+ var hooks, ret, isFunction,
+ elem = this[0];
+
+ if ( !arguments.length ) {
+ if ( elem ) {
+ hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+ if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+ return ret;
+ }
+
+ ret = elem.value;
+
+ return typeof ret === "string" ?
+ // handle most common string cases
+ ret.replace(rreturn, "") :
+ // handle cases where value is null/undef or number
+ ret == null ? "" : ret;
+ }
+
+ return;
+ }
+
+ isFunction = jQuery.isFunction( value );
+
+ return this.each(function( i ) {
+ var val;
+
+ if ( this.nodeType !== 1 ) {
+ return;
+ }
+
+ if ( isFunction ) {
+ val = value.call( this, i, jQuery( this ).val() );
+ } else {
+ val = value;
+ }
+
+ // Treat null/undefined as ""; convert numbers to string
+ if ( val == null ) {
+ val = "";
+ } else if ( typeof val === "number" ) {
+ val += "";
+ } else if ( jQuery.isArray( val ) ) {
+ val = jQuery.map( val, function( value ) {
+ return value == null ? "" : value + "";
+ });
+ }
+
+ hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+ // If set returns undefined, fall back to normal setting
+ if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+ this.value = val;
+ }
+ });
+ }
+});
+
+jQuery.extend({
+ valHooks: {
+ option: {
+ get: function( elem ) {
+ var val = jQuery.find.attr( elem, "value" );
+ return val != null ?
+ val :
+ // Support: IE10-11+
+ // option.text throws exceptions (#14686, #14858)
+ jQuery.trim( jQuery.text( elem ) );
+ }
+ },
+ select: {
+ get: function( elem ) {
+ var value, option,
+ options = elem.options,
+ index = elem.selectedIndex,
+ one = elem.type === "select-one" || index < 0,
+ values = one ? null : [],
+ max = one ? index + 1 : options.length,
+ i = index < 0 ?
+ max :
+ one ? index : 0;
+
+ // Loop through all the selected options
+ for ( ; i < max; i++ ) {
+ option = options[ i ];
+
+ // oldIE doesn't update selected after form reset (#2551)
+ if ( ( option.selected || i === index ) &&
+ // Don't return options that are disabled or in a disabled optgroup
+ ( support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
+ ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+ // Get the specific value for the option
+ value = jQuery( option ).val();
+
+ // We don't need an array for one selects
+ if ( one ) {
+ return value;
+ }
+
+ // Multi-Selects return an array
+ values.push( value );
+ }
+ }
+
+ return values;
+ },
+
+ set: function( elem, value ) {
+ var optionSet, option,
+ options = elem.options,
+ values = jQuery.makeArray( value ),
+ i = options.length;
+
+ while ( i-- ) {
+ option = options[ i ];
+
+ if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0 ) {
+
+ // Support: IE6
+ // When new option element is added to select box we need to
+ // force reflow of newly added node in order to workaround delay
+ // of initialization properties
+ try {
+ option.selected = optionSet = true;
+
+ } catch ( _ ) {
+
+ // Will be executed only in IE6
+ option.scrollHeight;
+ }
+
+ } else {
+ option.selected = false;
+ }
+ }
+
+ // Force browsers to behave consistently when non-matching value is set
+ if ( !optionSet ) {
+ elem.selectedIndex = -1;
+ }
+
+ return options;
+ }
+ }
+ }
+});
+
+// Radios and checkboxes getter/setter
+jQuery.each([ "radio", "checkbox" ], function() {
+ jQuery.valHooks[ this ] = {
+ set: function( elem, value ) {
+ if ( jQuery.isArray( value ) ) {
+ return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+ }
+ }
+ };
+ if ( !support.checkOn ) {
+ jQuery.valHooks[ this ].get = function( elem ) {
+ // Support: Webkit
+ // "" is returned instead of "on" if a value isn't specified
+ return elem.getAttribute("value") === null ? "on" : elem.value;
+ };
+ }
+});
+
+
+
+
+var nodeHook, boolHook,
+ attrHandle = jQuery.expr.attrHandle,
+ ruseDefault = /^(?:checked|selected)$/i,
+ getSetAttribute = support.getSetAttribute,
+ getSetInput = support.input;
+
+jQuery.fn.extend({
+ attr: function( name, value ) {
+ return access( this, jQuery.attr, name, value, arguments.length > 1 );
+ },
+
+ removeAttr: function( name ) {
+ return this.each(function() {
+ jQuery.removeAttr( this, name );
+ });
+ }
+});
+
+jQuery.extend({
+ attr: function( elem, name, value ) {
+ var hooks, ret,
+ nType = elem.nodeType;
+
+ // don't get/set attributes on text, comment and attribute nodes
+ if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+ return;
+ }
+
+ // Fallback to prop when attributes are not supported
+ if ( typeof elem.getAttribute === strundefined ) {
+ return jQuery.prop( elem, name, value );
+ }
+
+ // All attributes are lowercase
+ // Grab necessary hook if one is defined
+ if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+ name = name.toLowerCase();
+ hooks = jQuery.attrHooks[ name ] ||
+ ( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
+ }
+
+ if ( value !== undefined ) {
+
+ if ( value === null ) {
+ jQuery.removeAttr( elem, name );
+
+ } else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+ return ret;
+
+ } else {
+ elem.setAttribute( name, value + "" );
+ return value;
+ }
+
+ } else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+ return ret;
+
+ } else {
+ ret = jQuery.find.attr( elem, name );
+
+ // Non-existent attributes return null, we normalize to undefined
+ return ret == null ?
+ undefined :
+ ret;
+ }
+ },
+
+ removeAttr: function( elem, value ) {
+ var name, propName,
+ i = 0,
+ attrNames = value && value.match( rnotwhite );
+
+ if ( attrNames && elem.nodeType === 1 ) {
+ while ( (name = attrNames[i++]) ) {
+ propName = jQuery.propFix[ name ] || name;
+
+ // Boolean attributes get special treatment (#10870)
+ if ( jQuery.expr.match.bool.test( name ) ) {
+ // Set corresponding property to false
+ if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+ elem[ propName ] = false;
+ // Support: IE<9
+ // Also clear defaultChecked/defaultSelected (if appropriate)
+ } else {
+ elem[ jQuery.camelCase( "default-" + name ) ] =
+ elem[ propName ] = false;
+ }
+
+ // See #9699 for explanation of this approach (setting first, then removal)
+ } else {
+ jQuery.attr( elem, name, "" );
+ }
+
+ elem.removeAttribute( getSetAttribute ? name : propName );
+ }
+ }
+ },
+
+ attrHooks: {
+ type: {
+ set: function( elem, value ) {
+ if ( !support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+ // Setting the type on a radio button after the value resets the value in IE6-9
+ // Reset value to default in case type is set after value during creation
+ var val = elem.value;
+ elem.setAttribute( "type", value );
+ if ( val ) {
+ elem.value = val;
+ }
+ return value;
+ }
+ }
+ }
+ }
+});
+
+// Hook for boolean attributes
+boolHook = {
+ set: function( elem, value, name ) {
+ if ( value === false ) {
+ // Remove boolean attributes when set to false
+ jQuery.removeAttr( elem, name );
+ } else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+ // IE<8 needs the *property* name
+ elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+
+ // Use defaultChecked and defaultSelected for oldIE
+ } else {
+ elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
+ }
+
+ return name;
+ }
+};
+
+// Retrieve booleans specially
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+
+ var getter = attrHandle[ name ] || jQuery.find.attr;
+
+ attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
+ function( elem, name, isXML ) {
+ var ret, handle;
+ if ( !isXML ) {
+ // Avoid an infinite loop by temporarily removing this function from the getter
+ handle = attrHandle[ name ];
+ attrHandle[ name ] = ret;
+ ret = getter( elem, name, isXML ) != null ?
+ name.toLowerCase() :
+ null;
+ attrHandle[ name ] = handle;
+ }
+ return ret;
+ } :
+ function( elem, name, isXML ) {
+ if ( !isXML ) {
+ return elem[ jQuery.camelCase( "default-" + name ) ] ?
+ name.toLowerCase() :
+ null;
+ }
+ };
+});
+
+// fix oldIE attroperties
+if ( !getSetInput || !getSetAttribute ) {
+ jQuery.attrHooks.value = {
+ set: function( elem, value, name ) {
+ if ( jQuery.nodeName( elem, "input" ) ) {
+ // Does not return so that setAttribute is also used
+ elem.defaultValue = value;
+ } else {
+ // Use nodeHook if defined (#1954); otherwise setAttribute is fine
+ return nodeHook && nodeHook.set( elem, value, name );
+ }
+ }
+ };
+}
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+ // Use this for any attribute in IE6/7
+ // This fixes almost every IE6/7 issue
+ nodeHook = {
+ set: function( elem, value, name ) {
+ // Set the existing or create a new attribute node
+ var ret = elem.getAttributeNode( name );
+ if ( !ret ) {
+ elem.setAttributeNode(
+ (ret = elem.ownerDocument.createAttribute( name ))
+ );
+ }
+
+ ret.value = value += "";
+
+ // Break association with cloned elements by also using setAttribute (#9646)
+ if ( name === "value" || value === elem.getAttribute( name ) ) {
+ return value;
+ }
+ }
+ };
+
+ // Some attributes are constructed with empty-string values when not defined
+ attrHandle.id = attrHandle.name = attrHandle.coords =
+ function( elem, name, isXML ) {
+ var ret;
+ if ( !isXML ) {
+ return (ret = elem.getAttributeNode( name )) && ret.value !== "" ?
+ ret.value :
+ null;
+ }
+ };
+
+ // Fixing value retrieval on a button requires this module
+ jQuery.valHooks.button = {
+ get: function( elem, name ) {
+ var ret = elem.getAttributeNode( name );
+ if ( ret && ret.specified ) {
+ return ret.value;
+ }
+ },
+ set: nodeHook.set
+ };
+
+ // Set contenteditable to false on removals(#10429)
+ // Setting to empty string throws an error as an invalid value
+ jQuery.attrHooks.contenteditable = {
+ set: function( elem, value, name ) {
+ nodeHook.set( elem, value === "" ? false : value, name );
+ }
+ };
+
+ // Set width and height to auto instead of 0 on empty string( Bug #8150 )
+ // This is for removals
+ jQuery.each([ "width", "height" ], function( i, name ) {
+ jQuery.attrHooks[ name ] = {
+ set: function( elem, value ) {
+ if ( value === "" ) {
+ elem.setAttribute( name, "auto" );
+ return value;
+ }
+ }
+ };
+ });
+}
+
+if ( !support.style ) {
+ jQuery.attrHooks.style = {
+ get: function( elem ) {
+ // Return undefined in the case of empty string
+ // Note: IE uppercases css property names, but if we were to .toLowerCase()
+ // .cssText, that would destroy case senstitivity in URL's, like in "background"
+ return elem.style.cssText || undefined;
+ },
+ set: function( elem, value ) {
+ return ( elem.style.cssText = value + "" );
+ }
+ };
+}
+
+
+
+
+var rfocusable = /^(?:input|select|textarea|button|object)$/i,
+ rclickable = /^(?:a|area)$/i;
+
+jQuery.fn.extend({
+ prop: function( name, value ) {
+ return access( this, jQuery.prop, name, value, arguments.length > 1 );
+ },
+
+ removeProp: function( name ) {
+ name = jQuery.propFix[ name ] || name;
+ return this.each(function() {
+ // try/catch handles cases where IE balks (such as removing a property on window)
+ try {
+ this[ name ] = undefined;
+ delete this[ name ];
+ } catch( e ) {}
+ });
+ }
+});
+
+jQuery.extend({
+ propFix: {
+ "for": "htmlFor",
+ "class": "className"
+ },
+
+ prop: function( elem, name, value ) {
+ var ret, hooks, notxml,
+ nType = elem.nodeType;
+
+ // don't get/set properties on text, comment and attribute nodes
+ if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+ return;
+ }
+
+ notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+ if ( notxml ) {
+ // Fix name and attach hooks
+ name = jQuery.propFix[ name ] || name;
+ hooks = jQuery.propHooks[ name ];
+ }
+
+ if ( value !== undefined ) {
+ return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
+ ret :
+ ( elem[ name ] = value );
+
+ } else {
+ return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
+ ret :
+ elem[ name ];
+ }
+ },
+
+ propHooks: {
+ tabIndex: {
+ get: function( elem ) {
+ // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+ // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+ // Use proper attribute retrieval(#12072)
+ var tabindex = jQuery.find.attr( elem, "tabindex" );
+
+ return tabindex ?
+ parseInt( tabindex, 10 ) :
+ rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+ 0 :
+ -1;
+ }
+ }
+ }
+});
+
+// Some attributes require a special call on IE
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !support.hrefNormalized ) {
+ // href/src property should get the full normalized URL (#10299/#12915)
+ jQuery.each([ "href", "src" ], function( i, name ) {
+ jQuery.propHooks[ name ] = {
+ get: function( elem ) {
+ return elem.getAttribute( name, 4 );
+ }
+ };
+ });
+}
+
+// Support: Safari, IE9+
+// mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !support.optSelected ) {
+ jQuery.propHooks.selected = {
+ get: function( elem ) {
+ var parent = elem.parentNode;
+
+ if ( parent ) {
+ parent.selectedIndex;
+
+ // Make sure that it also works with optgroups, see #5701
+ if ( parent.parentNode ) {
+ parent.parentNode.selectedIndex;
+ }
+ }
+ return null;
+ }
+ };
+}
+
+jQuery.each([
+ "tabIndex",
+ "readOnly",
+ "maxLength",
+ "cellSpacing",
+ "cellPadding",
+ "rowSpan",
+ "colSpan",
+ "useMap",
+ "frameBorder",
+ "contentEditable"
+], function() {
+ jQuery.propFix[ this.toLowerCase() ] = this;
+});
+
+// IE6/7 call enctype encoding
+if ( !support.enctype ) {
+ jQuery.propFix.enctype = "encoding";
+}
+
+
+
+
+var rclass = /[\t\r\n\f]/g;
+
+jQuery.fn.extend({
+ addClass: function( value ) {
+ var classes, elem, cur, clazz, j, finalValue,
+ i = 0,
+ len = this.length,
+ proceed = typeof value === "string" && value;
+
+ if ( jQuery.isFunction( value ) ) {
+ return this.each(function( j ) {
+ jQuery( this ).addClass( value.call( this, j, this.className ) );
+ });
+ }
+
+ if ( proceed ) {
+ // The disjunction here is for better compressibility (see removeClass)
+ classes = ( value || "" ).match( rnotwhite ) || [];
+
+ for ( ; i < len; i++ ) {
+ elem = this[ i ];
+ cur = elem.nodeType === 1 && ( elem.className ?
+ ( " " + elem.className + " " ).replace( rclass, " " ) :
+ " "
+ );
+
+ if ( cur ) {
+ j = 0;
+ while ( (clazz = classes[j++]) ) {
+ if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+ cur += clazz + " ";
+ }
+ }
+
+ // only assign if different to avoid unneeded rendering.
+ finalValue = jQuery.trim( cur );
+ if ( elem.className !== finalValue ) {
+ elem.className = finalValue;
+ }
+ }
+ }
+ }
+
+ return this;
+ },
+
+ removeClass: function( value ) {
+ var classes, elem, cur, clazz, j, finalValue,
+ i = 0,
+ len = this.length,
+ proceed = arguments.length === 0 || typeof value === "string" && value;
+
+ if ( jQuery.isFunction( value ) ) {
+ return this.each(function( j ) {
+ jQuery( this ).removeClass( value.call( this, j, this.className ) );
+ });
+ }
+ if ( proceed ) {
+ classes = ( value || "" ).match( rnotwhite ) || [];
+
+ for ( ; i < len; i++ ) {
+ elem = this[ i ];
+ // This expression is here for better compressibility (see addClass)
+ cur = elem.nodeType === 1 && ( elem.className ?
+ ( " " + elem.className + " " ).replace( rclass, " " ) :
+ ""
+ );
+
+ if ( cur ) {
+ j = 0;
+ while ( (clazz = classes[j++]) ) {
+ // Remove *all* instances
+ while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
+ cur = cur.replace( " " + clazz + " ", " " );
+ }
+ }
+
+ // only assign if different to avoid unneeded rendering.
+ finalValue = value ? jQuery.trim( cur ) : "";
+ if ( elem.className !== finalValue ) {
+ elem.className = finalValue;
+ }
+ }
+ }
+ }
+
+ return this;
+ },
+
+ toggleClass: function( value, stateVal ) {
+ var type = typeof value;
+
+ if ( typeof stateVal === "boolean" && type === "string" ) {
+ return stateVal ? this.addClass( value ) : this.removeClass( value );
+ }
+
+ if ( jQuery.isFunction( value ) ) {
+ return this.each(function( i ) {
+ jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+ });
+ }
+
+ return this.each(function() {
+ if ( type === "string" ) {
+ // toggle individual class names
+ var className,
+ i = 0,
+ self = jQuery( this ),
+ classNames = value.match( rnotwhite ) || [];
+
+ while ( (className = classNames[ i++ ]) ) {
+ // check each className given, space separated list
+ if ( self.hasClass( className ) ) {
+ self.removeClass( className );
+ } else {
+ self.addClass( className );
+ }
+ }
+
+ // Toggle whole class name
+ } else if ( type === strundefined || type === "boolean" ) {
+ if ( this.className ) {
+ // store className if set
+ jQuery._data( this, "__className__", this.className );
+ }
+
+ // If the element has a class name or if we're passed "false",
+ // then remove the whole classname (if there was one, the above saved it).
+ // Otherwise bring back whatever was previously saved (if anything),
+ // falling back to the empty string if nothing was stored.
+ this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+ }
+ });
+ },
+
+ hasClass: function( selector ) {
+ var className = " " + selector + " ",
+ i = 0,
+ l = this.length;
+ for ( ; i < l; i++ ) {
+ if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+});
+
+
+
+
+// Return jQuery for attributes-only inclusion
+
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+ "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+ "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+ // Handle event binding
+ jQuery.fn[ name ] = function( data, fn ) {
+ return arguments.length > 0 ?
+ this.on( name, null, data, fn ) :
+ this.trigger( name );
+ };
+});
+
+jQuery.fn.extend({
+ hover: function( fnOver, fnOut ) {
+ return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+ },
+
+ bind: function( types, data, fn ) {
+ return this.on( types, null, data, fn );
+ },
+ unbind: function( types, fn ) {
+ return this.off( types, null, fn );
+ },
+
+ delegate: function( selector, types, data, fn ) {
+ return this.on( types, selector, data, fn );
+ },
+ undelegate: function( selector, types, fn ) {
+ // ( namespace ) or ( selector, types [, fn] )
+ return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
+ }
+});
+
+
+var nonce = jQuery.now();
+
+var rquery = (/\?/);
+
+
+
+var rvalidtokens = /(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;
+
+jQuery.parseJSON = function( data ) {
+ // Attempt to parse using the native JSON parser first
+ if ( window.JSON && window.JSON.parse ) {
+ // Support: Android 2.3
+ // Workaround failure to string-cast null input
+ return window.JSON.parse( data + "" );
+ }
+
+ var requireNonComma,
+ depth = null,
+ str = jQuery.trim( data + "" );
+
+ // Guard against invalid (and possibly dangerous) input by ensuring that nothing remains
+ // after removing valid tokens
+ return str && !jQuery.trim( str.replace( rvalidtokens, function( token, comma, open, close ) {
+
+ // Force termination if we see a misplaced comma
+ if ( requireNonComma && comma ) {
+ depth = 0;
+ }
+
+ // Perform no more replacements after returning to outermost depth
+ if ( depth === 0 ) {
+ return token;
+ }
+
+ // Commas must not follow "[", "{", or ","
+ requireNonComma = open || comma;
+
+ // Determine new depth
+ // array/object open ("[" or "{"): depth += true - false (increment)
+ // array/object close ("]" or "}"): depth += false - true (decrement)
+ // other cases ("," or primitive): depth += true - true (numeric cast)
+ depth += !close - !open;
+
+ // Remove this token
+ return "";
+ }) ) ?
+ ( Function( "return " + str ) )() :
+ jQuery.error( "Invalid JSON: " + data );
+};
+
+
+// Cross-browser xml parsing
+jQuery.parseXML = function( data ) {
+ var xml, tmp;
+ if ( !data || typeof data !== "string" ) {
+ return null;
+ }
+ try {
+ if ( window.DOMParser ) { // Standard
+ tmp = new DOMParser();
+ xml = tmp.parseFromString( data, "text/xml" );
+ } else { // IE
+ xml = new ActiveXObject( "Microsoft.XMLDOM" );
+ xml.async = "false";
+ xml.loadXML( data );
+ }
+ } catch( e ) {
+ xml = undefined;
+ }
+ if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+ jQuery.error( "Invalid XML: " + data );
+ }
+ return xml;
+};
+
+
+var
+ // Document location
+ ajaxLocParts,
+ ajaxLocation,
+
+ rhash = /#.*$/,
+ rts = /([?&])_=[^&]*/,
+ rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+ // #7653, #8125, #8152: local protocol detection
+ rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+ rnoContent = /^(?:GET|HEAD)$/,
+ rprotocol = /^\/\//,
+ rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
+
+ /* Prefilters
+ * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+ * 2) These are called:
+ * - BEFORE asking for a transport
+ * - AFTER param serialization (s.data is a string if s.processData is true)
+ * 3) key is the dataType
+ * 4) the catchall symbol "*" can be used
+ * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+ */
+ prefilters = {},
+
+ /* Transports bindings
+ * 1) key is the dataType
+ * 2) the catchall symbol "*" can be used
+ * 3) selection will start with transport dataType and THEN go to "*" if needed
+ */
+ transports = {},
+
+ // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+ allTypes = "*/".concat("*");
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+ ajaxLocation = location.href;
+} catch( e ) {
+ // Use the href attribute of an A element
+ // since IE will modify it given document.location
+ ajaxLocation = document.createElement( "a" );
+ ajaxLocation.href = "";
+ ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+ // dataTypeExpression is optional and defaults to "*"
+ return function( dataTypeExpression, func ) {
+
+ if ( typeof dataTypeExpression !== "string" ) {
+ func = dataTypeExpression;
+ dataTypeExpression = "*";
+ }
+
+ var dataType,
+ i = 0,
+ dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
+
+ if ( jQuery.isFunction( func ) ) {
+ // For each dataType in the dataTypeExpression
+ while ( (dataType = dataTypes[i++]) ) {
+ // Prepend if requested
+ if ( dataType.charAt( 0 ) === "+" ) {
+ dataType = dataType.slice( 1 ) || "*";
+ (structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+
+ // Otherwise append
+ } else {
+ (structure[ dataType ] = structure[ dataType ] || []).push( func );
+ }
+ }
+ }
+ };
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+ var inspected = {},
+ seekingTransport = ( structure === transports );
+
+ function inspect( dataType ) {
+ var selected;
+ inspected[ dataType ] = true;
+ jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+ var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+ if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+ options.dataTypes.unshift( dataTypeOrTransport );
+ inspect( dataTypeOrTransport );
+ return false;
+ } else if ( seekingTransport ) {
+ return !( selected = dataTypeOrTransport );
+ }
+ });
+ return selected;
+ }
+
+ return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+ var deep, key,
+ flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+ for ( key in src ) {
+ if ( src[ key ] !== undefined ) {
+ ( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+ }
+ }
+ if ( deep ) {
+ jQuery.extend( true, target, deep );
+ }
+
+ return target;
+}
+
+/* Handles responses to an ajax request:
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+ var firstDataType, ct, finalDataType, type,
+ contents = s.contents,
+ dataTypes = s.dataTypes;
+
+ // Remove auto dataType and get content-type in the process
+ while ( dataTypes[ 0 ] === "*" ) {
+ dataTypes.shift();
+ if ( ct === undefined ) {
+ ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+ }
+ }
+
+ // Check if we're dealing with a known content-type
+ if ( ct ) {
+ for ( type in contents ) {
+ if ( contents[ type ] && contents[ type ].test( ct ) ) {
+ dataTypes.unshift( type );
+ break;
+ }
+ }
+ }
+
+ // Check to see if we have a response for the expected dataType
+ if ( dataTypes[ 0 ] in responses ) {
+ finalDataType = dataTypes[ 0 ];
+ } else {
+ // Try convertible dataTypes
+ for ( type in responses ) {
+ if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+ finalDataType = type;
+ break;
+ }
+ if ( !firstDataType ) {
+ firstDataType = type;
+ }
+ }
+ // Or just use first one
+ finalDataType = finalDataType || firstDataType;
+ }
+
+ // If we found a dataType
+ // We add the dataType to the list if needed
+ // and return the corresponding response
+ if ( finalDataType ) {
+ if ( finalDataType !== dataTypes[ 0 ] ) {
+ dataTypes.unshift( finalDataType );
+ }
+ return responses[ finalDataType ];
+ }
+}
+
+/* Chain conversions given the request and the original response
+ * Also sets the responseXXX fields on the jqXHR instance
+ */
+function ajaxConvert( s, response, jqXHR, isSuccess ) {
+ var conv2, current, conv, tmp, prev,
+ converters = {},
+ // Work with a copy of dataTypes in case we need to modify it for conversion
+ dataTypes = s.dataTypes.slice();
+
+ // Create converters map with lowercased keys
+ if ( dataTypes[ 1 ] ) {
+ for ( conv in s.converters ) {
+ converters[ conv.toLowerCase() ] = s.converters[ conv ];
+ }
+ }
+
+ current = dataTypes.shift();
+
+ // Convert to each sequential dataType
+ while ( current ) {
+
+ if ( s.responseFields[ current ] ) {
+ jqXHR[ s.responseFields[ current ] ] = response;
+ }
+
+ // Apply the dataFilter if provided
+ if ( !prev && isSuccess && s.dataFilter ) {
+ response = s.dataFilter( response, s.dataType );
+ }
+
+ prev = current;
+ current = dataTypes.shift();
+
+ if ( current ) {
+
+ // There's only work to do if current dataType is non-auto
+ if ( current === "*" ) {
+
+ current = prev;
+
+ // Convert response if prev dataType is non-auto and differs from current
+ } else if ( prev !== "*" && prev !== current ) {
+
+ // Seek a direct converter
+ conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+ // If none found, seek a pair
+ if ( !conv ) {
+ for ( conv2 in converters ) {
+
+ // If conv2 outputs current
+ tmp = conv2.split( " " );
+ if ( tmp[ 1 ] === current ) {
+
+ // If prev can be converted to accepted input
+ conv = converters[ prev + " " + tmp[ 0 ] ] ||
+ converters[ "* " + tmp[ 0 ] ];
+ if ( conv ) {
+ // Condense equivalence converters
+ if ( conv === true ) {
+ conv = converters[ conv2 ];
+
+ // Otherwise, insert the intermediate dataType
+ } else if ( converters[ conv2 ] !== true ) {
+ current = tmp[ 0 ];
+ dataTypes.unshift( tmp[ 1 ] );
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ // Apply converter (if not an equivalence)
+ if ( conv !== true ) {
+
+ // Unless errors are allowed to bubble, catch and return them
+ if ( conv && s[ "throws" ] ) {
+ response = conv( response );
+ } else {
+ try {
+ response = conv( response );
+ } catch ( e ) {
+ return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return { state: "success", data: response };
+}
+
+jQuery.extend({
+
+ // Counter for holding the number of active queries
+ active: 0,
+
+ // Last-Modified header cache for next request
+ lastModified: {},
+ etag: {},
+
+ ajaxSettings: {
+ url: ajaxLocation,
+ type: "GET",
+ isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+ global: true,
+ processData: true,
+ async: true,
+ contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+ /*
+ timeout: 0,
+ data: null,
+ dataType: null,
+ username: null,
+ password: null,
+ cache: null,
+ throws: false,
+ traditional: false,
+ headers: {},
+ */
+
+ accepts: {
+ "*": allTypes,
+ text: "text/plain",
+ html: "text/html",
+ xml: "application/xml, text/xml",
+ json: "application/json, text/javascript"
+ },
+
+ contents: {
+ xml: /xml/,
+ html: /html/,
+ json: /json/
+ },
+
+ responseFields: {
+ xml: "responseXML",
+ text: "responseText",
+ json: "responseJSON"
+ },
+
+ // Data converters
+ // Keys separate source (or catchall "*") and destination types with a single space
+ converters: {
+
+ // Convert anything to text
+ "* text": String,
+
+ // Text to html (true = no transformation)
+ "text html": true,
+
+ // Evaluate text as a json expression
+ "text json": jQuery.parseJSON,
+
+ // Parse text as xml
+ "text xml": jQuery.parseXML
+ },
+
+ // For options that shouldn't be deep extended:
+ // you can add your own custom options here if
+ // and when you create one that shouldn't be
+ // deep extended (see ajaxExtend)
+ flatOptions: {
+ url: true,
+ context: true
+ }
+ },
+
+ // Creates a full fledged settings object into target
+ // with both ajaxSettings and settings fields.
+ // If target is omitted, writes into ajaxSettings.
+ ajaxSetup: function( target, settings ) {
+ return settings ?
+
+ // Building a settings object
+ ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+ // Extending ajaxSettings
+ ajaxExtend( jQuery.ajaxSettings, target );
+ },
+
+ ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+ ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+ // Main method
+ ajax: function( url, options ) {
+
+ // If url is an object, simulate pre-1.5 signature
+ if ( typeof url === "object" ) {
+ options = url;
+ url = undefined;
+ }
+
+ // Force options to be an object
+ options = options || {};
+
+ var // Cross-domain detection vars
+ parts,
+ // Loop variable
+ i,
+ // URL without anti-cache param
+ cacheURL,
+ // Response headers as string
+ responseHeadersString,
+ // timeout handle
+ timeoutTimer,
+
+ // To know if global events are to be dispatched
+ fireGlobals,
+
+ transport,
+ // Response headers
+ responseHeaders,
+ // Create the final options object
+ s = jQuery.ajaxSetup( {}, options ),
+ // Callbacks context
+ callbackContext = s.context || s,
+ // Context for global events is callbackContext if it is a DOM node or jQuery collection
+ globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
+ jQuery( callbackContext ) :
+ jQuery.event,
+ // Deferreds
+ deferred = jQuery.Deferred(),
+ completeDeferred = jQuery.Callbacks("once memory"),
+ // Status-dependent callbacks
+ statusCode = s.statusCode || {},
+ // Headers (they are sent all at once)
+ requestHeaders = {},
+ requestHeadersNames = {},
+ // The jqXHR state
+ state = 0,
+ // Default abort message
+ strAbort = "canceled",
+ // Fake xhr
+ jqXHR = {
+ readyState: 0,
+
+ // Builds headers hashtable if needed
+ getResponseHeader: function( key ) {
+ var match;
+ if ( state === 2 ) {
+ if ( !responseHeaders ) {
+ responseHeaders = {};
+ while ( (match = rheaders.exec( responseHeadersString )) ) {
+ responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+ }
+ }
+ match = responseHeaders[ key.toLowerCase() ];
+ }
+ return match == null ? null : match;
+ },
+
+ // Raw string
+ getAllResponseHeaders: function() {
+ return state === 2 ? responseHeadersString : null;
+ },
+
+ // Caches the header
+ setRequestHeader: function( name, value ) {
+ var lname = name.toLowerCase();
+ if ( !state ) {
+ name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+ requestHeaders[ name ] = value;
+ }
+ return this;
+ },
+
+ // Overrides response content-type header
+ overrideMimeType: function( type ) {
+ if ( !state ) {
+ s.mimeType = type;
+ }
+ return this;
+ },
+
+ // Status-dependent callbacks
+ statusCode: function( map ) {
+ var code;
+ if ( map ) {
+ if ( state < 2 ) {
+ for ( code in map ) {
+ // Lazy-add the new callback in a way that preserves old ones
+ statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+ }
+ } else {
+ // Execute the appropriate callbacks
+ jqXHR.always( map[ jqXHR.status ] );
+ }
+ }
+ return this;
+ },
+
+ // Cancel the request
+ abort: function( statusText ) {
+ var finalText = statusText || strAbort;
+ if ( transport ) {
+ transport.abort( finalText );
+ }
+ done( 0, finalText );
+ return this;
+ }
+ };
+
+ // Attach deferreds
+ deferred.promise( jqXHR ).complete = completeDeferred.add;
+ jqXHR.success = jqXHR.done;
+ jqXHR.error = jqXHR.fail;
+
+ // Remove hash character (#7531: and string promotion)
+ // Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+ // Handle falsy url in the settings object (#10093: consistency with old signature)
+ // We also use the url parameter if available
+ s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+ // Alias method option to type as per ticket #12004
+ s.type = options.method || options.type || s.method || s.type;
+
+ // Extract dataTypes list
+ s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
+
+ // A cross-domain request is in order when we have a protocol:host:port mismatch
+ if ( s.crossDomain == null ) {
+ parts = rurl.exec( s.url.toLowerCase() );
+ s.crossDomain = !!( parts &&
+ ( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+ ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
+ ( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
+ );
+ }
+
+ // Convert data if not already a string
+ if ( s.data && s.processData && typeof s.data !== "string" ) {
+ s.data = jQuery.param( s.data, s.traditional );
+ }
+
+ // Apply prefilters
+ inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+ // If request was aborted inside a prefilter, stop there
+ if ( state === 2 ) {
+ return jqXHR;
+ }
+
+ // We can fire global events as of now if asked to
+ fireGlobals = s.global;
+
+ // Watch for a new set of requests
+ if ( fireGlobals && jQuery.active++ === 0 ) {
+ jQuery.event.trigger("ajaxStart");
+ }
+
+ // Uppercase the type
+ s.type = s.type.toUpperCase();
+
+ // Determine if request has content
+ s.hasContent = !rnoContent.test( s.type );
+
+ // Save the URL in case we're toying with the If-Modified-Since
+ // and/or If-None-Match header later on
+ cacheURL = s.url;
+
+ // More options handling for requests with no content
+ if ( !s.hasContent ) {
+
+ // If data is available, append data to url
+ if ( s.data ) {
+ cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+ // #9682: remove data so that it's not used in an eventual retry
+ delete s.data;
+ }
+
+ // Add anti-cache in url if needed
+ if ( s.cache === false ) {
+ s.url = rts.test( cacheURL ) ?
+
+ // If there is already a '_' parameter, set its value
+ cacheURL.replace( rts, "$1_=" + nonce++ ) :
+
+ // Otherwise add one to the end
+ cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
+ }
+ }
+
+ // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+ if ( s.ifModified ) {
+ if ( jQuery.lastModified[ cacheURL ] ) {
+ jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+ }
+ if ( jQuery.etag[ cacheURL ] ) {
+ jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+ }
+ }
+
+ // Set the correct header, if data is being sent
+ if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+ jqXHR.setRequestHeader( "Content-Type", s.contentType );
+ }
+
+ // Set the Accepts header for the server, depending on the dataType
+ jqXHR.setRequestHeader(
+ "Accept",
+ s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+ s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+ s.accepts[ "*" ]
+ );
+
+ // Check for headers option
+ for ( i in s.headers ) {
+ jqXHR.setRequestHeader( i, s.headers[ i ] );
+ }
+
+ // Allow custom headers/mimetypes and early abort
+ if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+ // Abort if not done already and return
+ return jqXHR.abort();
+ }
+
+ // aborting is no longer a cancellation
+ strAbort = "abort";
+
+ // Install callbacks on deferreds
+ for ( i in { success: 1, error: 1, complete: 1 } ) {
+ jqXHR[ i ]( s[ i ] );
+ }
+
+ // Get transport
+ transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+ // If no transport, we auto-abort
+ if ( !transport ) {
+ done( -1, "No Transport" );
+ } else {
+ jqXHR.readyState = 1;
+
+ // Send global event
+ if ( fireGlobals ) {
+ globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+ }
+ // Timeout
+ if ( s.async && s.timeout > 0 ) {
+ timeoutTimer = setTimeout(function() {
+ jqXHR.abort("timeout");
+ }, s.timeout );
+ }
+
+ try {
+ state = 1;
+ transport.send( requestHeaders, done );
+ } catch ( e ) {
+ // Propagate exception as error if not done
+ if ( state < 2 ) {
+ done( -1, e );
+ // Simply rethrow otherwise
+ } else {
+ throw e;
+ }
+ }
+ }
+
+ // Callback for when everything is done
+ function done( status, nativeStatusText, responses, headers ) {
+ var isSuccess, success, error, response, modified,
+ statusText = nativeStatusText;
+
+ // Called once
+ if ( state === 2 ) {
+ return;
+ }
+
+ // State is "done" now
+ state = 2;
+
+ // Clear timeout if it exists
+ if ( timeoutTimer ) {
+ clearTimeout( timeoutTimer );
+ }
+
+ // Dereference transport for early garbage collection
+ // (no matter how long the jqXHR object will be used)
+ transport = undefined;
+
+ // Cache response headers
+ responseHeadersString = headers || "";
+
+ // Set readyState
+ jqXHR.readyState = status > 0 ? 4 : 0;
+
+ // Determine if successful
+ isSuccess = status >= 200 && status < 300 || status === 304;
+
+ // Get response data
+ if ( responses ) {
+ response = ajaxHandleResponses( s, jqXHR, responses );
+ }
+
+ // Convert no matter what (that way responseXXX fields are always set)
+ response = ajaxConvert( s, response, jqXHR, isSuccess );
+
+ // If successful, handle type chaining
+ if ( isSuccess ) {
+
+ // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+ if ( s.ifModified ) {
+ modified = jqXHR.getResponseHeader("Last-Modified");
+ if ( modified ) {
+ jQuery.lastModified[ cacheURL ] = modified;
+ }
+ modified = jqXHR.getResponseHeader("etag");
+ if ( modified ) {
+ jQuery.etag[ cacheURL ] = modified;
+ }
+ }
+
+ // if no content
+ if ( status === 204 || s.type === "HEAD" ) {
+ statusText = "nocontent";
+
+ // if not modified
+ } else if ( status === 304 ) {
+ statusText = "notmodified";
+
+ // If we have data, let's convert it
+ } else {
+ statusText = response.state;
+ success = response.data;
+ error = response.error;
+ isSuccess = !error;
+ }
+ } else {
+ // We extract error from statusText
+ // then normalize statusText and status for non-aborts
+ error = statusText;
+ if ( status || !statusText ) {
+ statusText = "error";
+ if ( status < 0 ) {
+ status = 0;
+ }
+ }
+ }
+
+ // Set data for the fake xhr object
+ jqXHR.status = status;
+ jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+ // Success/Error
+ if ( isSuccess ) {
+ deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+ } else {
+ deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+ }
+
+ // Status-dependent callbacks
+ jqXHR.statusCode( statusCode );
+ statusCode = undefined;
+
+ if ( fireGlobals ) {
+ globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+ [ jqXHR, s, isSuccess ? success : error ] );
+ }
+
+ // Complete
+ completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+ if ( fireGlobals ) {
+ globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+ // Handle the global AJAX counter
+ if ( !( --jQuery.active ) ) {
+ jQuery.event.trigger("ajaxStop");
+ }
+ }
+ }
+
+ return jqXHR;
+ },
+
+ getJSON: function( url, data, callback ) {
+ return jQuery.get( url, data, callback, "json" );
+ },
+
+ getScript: function( url, callback ) {
+ return jQuery.get( url, undefined, callback, "script" );
+ }
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+ jQuery[ method ] = function( url, data, callback, type ) {
+ // shift arguments if data argument was omitted
+ if ( jQuery.isFunction( data ) ) {
+ type = type || callback;
+ callback = data;
+ data = undefined;
+ }
+
+ return jQuery.ajax({
+ url: url,
+ type: method,
+ dataType: type,
+ data: data,
+ success: callback
+ });
+ };
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
+ jQuery.fn[ type ] = function( fn ) {
+ return this.on( type, fn );
+ };
+});
+
+
+jQuery._evalUrl = function( url ) {
+ return jQuery.ajax({
+ url: url,
+ type: "GET",
+ dataType: "script",
+ async: false,
+ global: false,
+ "throws": true
+ });
+};
+
+
+jQuery.fn.extend({
+ wrapAll: function( html ) {
+ if ( jQuery.isFunction( html ) ) {
+ return this.each(function(i) {
+ jQuery(this).wrapAll( html.call(this, i) );
+ });
+ }
+
+ if ( this[0] ) {
+ // The elements to wrap the target around
+ var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+ if ( this[0].parentNode ) {
+ wrap.insertBefore( this[0] );
+ }
+
+ wrap.map(function() {
+ var elem = this;
+
+ while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+ elem = elem.firstChild;
+ }
+
+ return elem;
+ }).append( this );
+ }
+
+ return this;
+ },
+
+ wrapInner: function( html ) {
+ if ( jQuery.isFunction( html ) ) {
+ return this.each(function(i) {
+ jQuery(this).wrapInner( html.call(this, i) );
+ });
+ }
+
+ return this.each(function() {
+ var self = jQuery( this ),
+ contents = self.contents();
+
+ if ( contents.length ) {
+ contents.wrapAll( html );
+
+ } else {
+ self.append( html );
+ }
+ });
+ },
+
+ wrap: function( html ) {
+ var isFunction = jQuery.isFunction( html );
+
+ return this.each(function(i) {
+ jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+ });
+ },
+
+ unwrap: function() {
+ return this.parent().each(function() {
+ if ( !jQuery.nodeName( this, "body" ) ) {
+ jQuery( this ).replaceWith( this.childNodes );
+ }
+ }).end();
+ }
+});
+
+
+jQuery.expr.filters.hidden = function( elem ) {
+ // Support: Opera <= 12.12
+ // Opera reports offsetWidths and offsetHeights less than zero on some elements
+ return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
+ (!support.reliableHiddenOffsets() &&
+ ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
+};
+
+jQuery.expr.filters.visible = function( elem ) {
+ return !jQuery.expr.filters.hidden( elem );
+};
+
+
+
+
+var r20 = /%20/g,
+ rbracket = /\[\]$/,
+ rCRLF = /\r?\n/g,
+ rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+ rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+function buildParams( prefix, obj, traditional, add ) {
+ var name;
+
+ if ( jQuery.isArray( obj ) ) {
+ // Serialize array item.
+ jQuery.each( obj, function( i, v ) {
+ if ( traditional || rbracket.test( prefix ) ) {
+ // Treat each array item as a scalar.
+ add( prefix, v );
+
+ } else {
+ // Item is non-scalar (array or object), encode its numeric index.
+ buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+ }
+ });
+
+ } else if ( !traditional && jQuery.type( obj ) === "object" ) {
+ // Serialize object item.
+ for ( name in obj ) {
+ buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+ }
+
+ } else {
+ // Serialize scalar item.
+ add( prefix, obj );
+ }
+}
+
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function( a, traditional ) {
+ var prefix,
+ s = [],
+ add = function( key, value ) {
+ // If value is a function, invoke it and return its value
+ value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+ s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+ };
+
+ // Set traditional to true for jQuery <= 1.3.2 behavior.
+ if ( traditional === undefined ) {
+ traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+ }
+
+ // If an array was passed in, assume that it is an array of form elements.
+ if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+ // Serialize the form elements
+ jQuery.each( a, function() {
+ add( this.name, this.value );
+ });
+
+ } else {
+ // If traditional, encode the "old" way (the way 1.3.2 or older
+ // did it), otherwise encode params recursively.
+ for ( prefix in a ) {
+ buildParams( prefix, a[ prefix ], traditional, add );
+ }
+ }
+
+ // Return the resulting serialization
+ return s.join( "&" ).replace( r20, "+" );
+};
+
+jQuery.fn.extend({
+ serialize: function() {
+ return jQuery.param( this.serializeArray() );
+ },
+ serializeArray: function() {
+ return this.map(function() {
+ // Can add propHook for "elements" to filter or add form elements
+ var elements = jQuery.prop( this, "elements" );
+ return elements ? jQuery.makeArray( elements ) : this;
+ })
+ .filter(function() {
+ var type = this.type;
+ // Use .is(":disabled") so that fieldset[disabled] works
+ return this.name && !jQuery( this ).is( ":disabled" ) &&
+ rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+ ( this.checked || !rcheckableType.test( type ) );
+ })
+ .map(function( i, elem ) {
+ var val = jQuery( this ).val();
+
+ return val == null ?
+ null :
+ jQuery.isArray( val ) ?
+ jQuery.map( val, function( val ) {
+ return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+ }) :
+ { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+ }).get();
+ }
+});
+
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject !== undefined ?
+ // Support: IE6+
+ function() {
+
+ // XHR cannot access local files, always use ActiveX for that case
+ return !this.isLocal &&
+
+ // Support: IE7-8
+ // oldIE XHR does not support non-RFC2616 methods (#13240)
+ // See http://msdn.microsoft.com/en-us/library/ie/ms536648(v=vs.85).aspx
+ // and http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9
+ // Although this check for six methods instead of eight
+ // since IE also does not support "trace" and "connect"
+ /^(get|post|head|put|delete|options)$/i.test( this.type ) &&
+
+ createStandardXHR() || createActiveXHR();
+ } :
+ // For all other browsers, use the standard XMLHttpRequest object
+ createStandardXHR;
+
+var xhrId = 0,
+ xhrCallbacks = {},
+ xhrSupported = jQuery.ajaxSettings.xhr();
+
+// Support: IE<10
+// Open requests must be manually aborted on unload (#5280)
+if ( window.ActiveXObject ) {
+ jQuery( window ).on( "unload", function() {
+ for ( var key in xhrCallbacks ) {
+ xhrCallbacks[ key ]( undefined, true );
+ }
+ });
+}
+
+// Determine support properties
+support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+xhrSupported = support.ajax = !!xhrSupported;
+
+// Create transport if the browser can provide an xhr
+if ( xhrSupported ) {
+
+ jQuery.ajaxTransport(function( options ) {
+ // Cross domain only allowed if supported through XMLHttpRequest
+ if ( !options.crossDomain || support.cors ) {
+
+ var callback;
+
+ return {
+ send: function( headers, complete ) {
+ var i,
+ xhr = options.xhr(),
+ id = ++xhrId;
+
+ // Open the socket
+ xhr.open( options.type, options.url, options.async, options.username, options.password );
+
+ // Apply custom fields if provided
+ if ( options.xhrFields ) {
+ for ( i in options.xhrFields ) {
+ xhr[ i ] = options.xhrFields[ i ];
+ }
+ }
+
+ // Override mime type if needed
+ if ( options.mimeType && xhr.overrideMimeType ) {
+ xhr.overrideMimeType( options.mimeType );
+ }
+
+ // X-Requested-With header
+ // For cross-domain requests, seeing as conditions for a preflight are
+ // akin to a jigsaw puzzle, we simply never set it to be sure.
+ // (it can always be set on a per-request basis or even using ajaxSetup)
+ // For same-domain requests, won't change header if already provided.
+ if ( !options.crossDomain && !headers["X-Requested-With"] ) {
+ headers["X-Requested-With"] = "XMLHttpRequest";
+ }
+
+ // Set headers
+ for ( i in headers ) {
+ // Support: IE<9
+ // IE's ActiveXObject throws a 'Type Mismatch' exception when setting
+ // request header to a null-value.
+ //
+ // To keep consistent with other XHR implementations, cast the value
+ // to string and ignore `undefined`.
+ if ( headers[ i ] !== undefined ) {
+ xhr.setRequestHeader( i, headers[ i ] + "" );
+ }
+ }
+
+ // Do send the request
+ // This may raise an exception which is actually
+ // handled in jQuery.ajax (so no try/catch here)
+ xhr.send( ( options.hasContent && options.data ) || null );
+
+ // Listener
+ callback = function( _, isAbort ) {
+ var status, statusText, responses;
+
+ // Was never called and is aborted or complete
+ if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+ // Clean up
+ delete xhrCallbacks[ id ];
+ callback = undefined;
+ xhr.onreadystatechange = jQuery.noop;
+
+ // Abort manually if needed
+ if ( isAbort ) {
+ if ( xhr.readyState !== 4 ) {
+ xhr.abort();
+ }
+ } else {
+ responses = {};
+ status = xhr.status;
+
+ // Support: IE<10
+ // Accessing binary-data responseText throws an exception
+ // (#11426)
+ if ( typeof xhr.responseText === "string" ) {
+ responses.text = xhr.responseText;
+ }
+
+ // Firefox throws an exception when accessing
+ // statusText for faulty cross-domain requests
+ try {
+ statusText = xhr.statusText;
+ } catch( e ) {
+ // We normalize with Webkit giving an empty statusText
+ statusText = "";
+ }
+
+ // Filter status for non standard behaviors
+
+ // If the request is local and we have data: assume a success
+ // (success with no data won't get notified, that's the best we
+ // can do given current implementations)
+ if ( !status && options.isLocal && !options.crossDomain ) {
+ status = responses.text ? 200 : 404;
+ // IE - #1450: sometimes returns 1223 when it should be 204
+ } else if ( status === 1223 ) {
+ status = 204;
+ }
+ }
+ }
+
+ // Call complete if needed
+ if ( responses ) {
+ complete( status, statusText, responses, xhr.getAllResponseHeaders() );
+ }
+ };
+
+ if ( !options.async ) {
+ // if we're in sync mode we fire the callback
+ callback();
+ } else if ( xhr.readyState === 4 ) {
+ // (IE6 & IE7) if it's in cache and has been
+ // retrieved directly we need to fire the callback
+ setTimeout( callback );
+ } else {
+ // Add to the list of active xhr callbacks
+ xhr.onreadystatechange = xhrCallbacks[ id ] = callback;
+ }
+ },
+
+ abort: function() {
+ if ( callback ) {
+ callback( undefined, true );
+ }
+ }
+ };
+ }
+ });
+}
+
+// Functions to create xhrs
+function createStandardXHR() {
+ try {
+ return new window.XMLHttpRequest();
+ } catch( e ) {}
+}
+
+function createActiveXHR() {
+ try {
+ return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+ } catch( e ) {}
+}
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup({
+ accepts: {
+ script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+ },
+ contents: {
+ script: /(?:java|ecma)script/
+ },
+ converters: {
+ "text script": function( text ) {
+ jQuery.globalEval( text );
+ return text;
+ }
+ }
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+ if ( s.cache === undefined ) {
+ s.cache = false;
+ }
+ if ( s.crossDomain ) {
+ s.type = "GET";
+ s.global = false;
+ }
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+ // This transport only deals with cross domain requests
+ if ( s.crossDomain ) {
+
+ var script,
+ head = document.head || jQuery("head")[0] || document.documentElement;
+
+ return {
+
+ send: function( _, callback ) {
+
+ script = document.createElement("script");
+
+ script.async = true;
+
+ if ( s.scriptCharset ) {
+ script.charset = s.scriptCharset;
+ }
+
+ script.src = s.url;
+
+ // Attach handlers for all browsers
+ script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+ if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+ // Handle memory leak in IE
+ script.onload = script.onreadystatechange = null;
+
+ // Remove the script
+ if ( script.parentNode ) {
+ script.parentNode.removeChild( script );
+ }
+
+ // Dereference the script
+ script = null;
+
+ // Callback if not abort
+ if ( !isAbort ) {
+ callback( 200, "success" );
+ }
+ }
+ };
+
+ // Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
+ // Use native DOM manipulation to avoid our domManip AJAX trickery
+ head.insertBefore( script, head.firstChild );
+ },
+
+ abort: function() {
+ if ( script ) {
+ script.onload( undefined, true );
+ }
+ }
+ };
+ }
+});
+
+
+
+
+var oldCallbacks = [],
+ rjsonp = /(=)\?(?=&|$)|\?\?/;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+ jsonp: "callback",
+ jsonpCallback: function() {
+ var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+ this[ callback ] = true;
+ return callback;
+ }
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+ var callbackName, overwritten, responseContainer,
+ jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+ "url" :
+ typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+ );
+
+ // Handle iff the expected data type is "jsonp" or we have a parameter to set
+ if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+ // Get callback name, remembering preexisting value associated with it
+ callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+ s.jsonpCallback() :
+ s.jsonpCallback;
+
+ // Insert callback into url or form data
+ if ( jsonProp ) {
+ s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+ } else if ( s.jsonp !== false ) {
+ s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+ }
+
+ // Use data converter to retrieve json after script execution
+ s.converters["script json"] = function() {
+ if ( !responseContainer ) {
+ jQuery.error( callbackName + " was not called" );
+ }
+ return responseContainer[ 0 ];
+ };
+
+ // force json dataType
+ s.dataTypes[ 0 ] = "json";
+
+ // Install callback
+ overwritten = window[ callbackName ];
+ window[ callbackName ] = function() {
+ responseContainer = arguments;
+ };
+
+ // Clean-up function (fires after converters)
+ jqXHR.always(function() {
+ // Restore preexisting value
+ window[ callbackName ] = overwritten;
+
+ // Save back as free
+ if ( s[ callbackName ] ) {
+ // make sure that re-using the options doesn't screw things around
+ s.jsonpCallback = originalSettings.jsonpCallback;
+
+ // save the callback name for future use
+ oldCallbacks.push( callbackName );
+ }
+
+ // Call if it was a function and we have a response
+ if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+ overwritten( responseContainer[ 0 ] );
+ }
+
+ responseContainer = overwritten = undefined;
+ });
+
+ // Delegate to script
+ return "script";
+ }
+});
+
+
+
+
+// data: string of html
+// context (optional): If specified, the fragment will be created in this context, defaults to document
+// keepScripts (optional): If true, will include scripts passed in the html string
+jQuery.parseHTML = function( data, context, keepScripts ) {
+ if ( !data || typeof data !== "string" ) {
+ return null;
+ }
+ if ( typeof context === "boolean" ) {
+ keepScripts = context;
+ context = false;
+ }
+ context = context || document;
+
+ var parsed = rsingleTag.exec( data ),
+ scripts = !keepScripts && [];
+
+ // Single tag
+ if ( parsed ) {
+ return [ context.createElement( parsed[1] ) ];
+ }
+
+ parsed = jQuery.buildFragment( [ data ], context, scripts );
+
+ if ( scripts && scripts.length ) {
+ jQuery( scripts ).remove();
+ }
+
+ return jQuery.merge( [], parsed.childNodes );
+};
+
+
+// Keep a copy of the old load method
+var _load = jQuery.fn.load;
+
+/**
+ * Load a url into a page
+ */
+jQuery.fn.load = function( url, params, callback ) {
+ if ( typeof url !== "string" && _load ) {
+ return _load.apply( this, arguments );
+ }
+
+ var selector, response, type,
+ self = this,
+ off = url.indexOf(" ");
+
+ if ( off >= 0 ) {
+ selector = jQuery.trim( url.slice( off, url.length ) );
+ url = url.slice( 0, off );
+ }
+
+ // If it's a function
+ if ( jQuery.isFunction( params ) ) {
+
+ // We assume that it's the callback
+ callback = params;
+ params = undefined;
+
+ // Otherwise, build a param string
+ } else if ( params && typeof params === "object" ) {
+ type = "POST";
+ }
+
+ // If we have elements to modify, make the request
+ if ( self.length > 0 ) {
+ jQuery.ajax({
+ url: url,
+
+ // if "type" variable is undefined, then "GET" method will be used
+ type: type,
+ dataType: "html",
+ data: params
+ }).done(function( responseText ) {
+
+ // Save response for use in complete callback
+ response = arguments;
+
+ self.html( selector ?
+
+ // If a selector was specified, locate the right elements in a dummy div
+ // Exclude scripts to avoid IE 'Permission Denied' errors
+ jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+ // Otherwise use the full result
+ responseText );
+
+ }).complete( callback && function( jqXHR, status ) {
+ self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+ });
+ }
+
+ return this;
+};
+
+
+
+
+jQuery.expr.filters.animated = function( elem ) {
+ return jQuery.grep(jQuery.timers, function( fn ) {
+ return elem === fn.elem;
+ }).length;
+};
+
+
+
+
+
+var docElem = window.document.documentElement;
+
+/**
+ * Gets a window from an element
+ */
+function getWindow( elem ) {
+ return jQuery.isWindow( elem ) ?
+ elem :
+ elem.nodeType === 9 ?
+ elem.defaultView || elem.parentWindow :
+ false;
+}
+
+jQuery.offset = {
+ setOffset: function( elem, options, i ) {
+ var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+ position = jQuery.css( elem, "position" ),
+ curElem = jQuery( elem ),
+ props = {};
+
+ // set position first, in-case top/left are set even on static elem
+ if ( position === "static" ) {
+ elem.style.position = "relative";
+ }
+
+ curOffset = curElem.offset();
+ curCSSTop = jQuery.css( elem, "top" );
+ curCSSLeft = jQuery.css( elem, "left" );
+ calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+ jQuery.inArray("auto", [ curCSSTop, curCSSLeft ] ) > -1;
+
+ // need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+ if ( calculatePosition ) {
+ curPosition = curElem.position();
+ curTop = curPosition.top;
+ curLeft = curPosition.left;
+ } else {
+ curTop = parseFloat( curCSSTop ) || 0;
+ curLeft = parseFloat( curCSSLeft ) || 0;
+ }
+
+ if ( jQuery.isFunction( options ) ) {
+ options = options.call( elem, i, curOffset );
+ }
+
+ if ( options.top != null ) {
+ props.top = ( options.top - curOffset.top ) + curTop;
+ }
+ if ( options.left != null ) {
+ props.left = ( options.left - curOffset.left ) + curLeft;
+ }
+
+ if ( "using" in options ) {
+ options.using.call( elem, props );
+ } else {
+ curElem.css( props );
+ }
+ }
+};
+
+jQuery.fn.extend({
+ offset: function( options ) {
+ if ( arguments.length ) {
+ return options === undefined ?
+ this :
+ this.each(function( i ) {
+ jQuery.offset.setOffset( this, options, i );
+ });
+ }
+
+ var docElem, win,
+ box = { top: 0, left: 0 },
+ elem = this[ 0 ],
+ doc = elem && elem.ownerDocument;
+
+ if ( !doc ) {
+ return;
+ }
+
+ docElem = doc.documentElement;
+
+ // Make sure it's not a disconnected DOM node
+ if ( !jQuery.contains( docElem, elem ) ) {
+ return box;
+ }
+
+ // If we don't have gBCR, just use 0,0 rather than error
+ // BlackBerry 5, iOS 3 (original iPhone)
+ if ( typeof elem.getBoundingClientRect !== strundefined ) {
+ box = elem.getBoundingClientRect();
+ }
+ win = getWindow( doc );
+ return {
+ top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
+ left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+ };
+ },
+
+ position: function() {
+ if ( !this[ 0 ] ) {
+ return;
+ }
+
+ var offsetParent, offset,
+ parentOffset = { top: 0, left: 0 },
+ elem = this[ 0 ];
+
+ // fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
+ if ( jQuery.css( elem, "position" ) === "fixed" ) {
+ // we assume that getBoundingClientRect is available when computed position is fixed
+ offset = elem.getBoundingClientRect();
+ } else {
+ // Get *real* offsetParent
+ offsetParent = this.offsetParent();
+
+ // Get correct offsets
+ offset = this.offset();
+ if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
+ parentOffset = offsetParent.offset();
+ }
+
+ // Add offsetParent borders
+ parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
+ parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+ }
+
+ // Subtract parent offsets and element margins
+ // note: when an element has margin: auto the offsetLeft and marginLeft
+ // are the same in Safari causing offset.left to incorrectly be 0
+ return {
+ top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+ left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
+ };
+ },
+
+ offsetParent: function() {
+ return this.map(function() {
+ var offsetParent = this.offsetParent || docElem;
+
+ while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
+ offsetParent = offsetParent.offsetParent;
+ }
+ return offsetParent || docElem;
+ });
+ }
+});
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
+ var top = /Y/.test( prop );
+
+ jQuery.fn[ method ] = function( val ) {
+ return access( this, function( elem, method, val ) {
+ var win = getWindow( elem );
+
+ if ( val === undefined ) {
+ return win ? (prop in win) ? win[ prop ] :
+ win.document.documentElement[ method ] :
+ elem[ method ];
+ }
+
+ if ( win ) {
+ win.scrollTo(
+ !top ? val : jQuery( win ).scrollLeft(),
+ top ? val : jQuery( win ).scrollTop()
+ );
+
+ } else {
+ elem[ method ] = val;
+ }
+ }, method, val, arguments.length, null );
+ };
+});
+
+// Add the top/left cssHooks using jQuery.fn.position
+// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+// getComputedStyle returns percent when specified for top/left/bottom/right
+// rather than make the css module depend on the offset module, we just check for it here
+jQuery.each( [ "top", "left" ], function( i, prop ) {
+ jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+ function( elem, computed ) {
+ if ( computed ) {
+ computed = curCSS( elem, prop );
+ // if curCSS returns percentage, fallback to offset
+ return rnumnonpx.test( computed ) ?
+ jQuery( elem ).position()[ prop ] + "px" :
+ computed;
+ }
+ }
+ );
+});
+
+
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+ jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+ // margin is only for outerHeight, outerWidth
+ jQuery.fn[ funcName ] = function( margin, value ) {
+ var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+ extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+ return access( this, function( elem, type, value ) {
+ var doc;
+
+ if ( jQuery.isWindow( elem ) ) {
+ // As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+ // isn't a whole lot we can do. See pull request at this URL for discussion:
+ // https://github.com/jquery/jquery/pull/764
+ return elem.document.documentElement[ "client" + name ];
+ }
+
+ // Get document width or height
+ if ( elem.nodeType === 9 ) {
+ doc = elem.documentElement;
+
+ // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+ // unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+ return Math.max(
+ elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+ elem.body[ "offset" + name ], doc[ "offset" + name ],
+ doc[ "client" + name ]
+ );
+ }
+
+ return value === undefined ?
+ // Get width or height on the element, requesting but not forcing parseFloat
+ jQuery.css( elem, type, extra ) :
+
+ // Set width or height on the element
+ jQuery.style( elem, type, value, extra );
+ }, type, chainable ? margin : undefined, chainable, null );
+ };
+ });
+});
+
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+ return this.length;
+};
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+
+
+
+// Register as a named AMD module, since jQuery can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase jquery is used because AMD module names are
+// derived from file names, and jQuery is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of jQuery, it will work.
+
+// Note that for maximum portability, libraries that are not jQuery should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. jQuery is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+if ( typeof define === "function" && define.amd ) {
+ define( "jquery", [], function() {
+ return jQuery;
+ });
+}
+
+
+
+
+var
+ // Map over jQuery in case of overwrite
+ _jQuery = window.jQuery,
+
+ // Map over the $ in case of overwrite
+ _$ = window.$;
+
+jQuery.noConflict = function( deep ) {
+ if ( window.$ === jQuery ) {
+ window.$ = _$;
+ }
+
+ if ( deep && window.jQuery === jQuery ) {
+ window.jQuery = _jQuery;
+ }
+
+ return jQuery;
+};
+
+// Expose jQuery and $ identifiers, even in
+// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+if ( typeof noGlobal === strundefined ) {
+ window.jQuery = window.$ = jQuery;
+}
+
+
+
+
+return jQuery;
+
+}));
diff --git a/doc/html/_static/jquery.js b/doc/html/_static/jquery.js
new file mode 100644
index 0000000..ab28a24
--- /dev/null
+++ b/doc/html/_static/jquery.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b [...]
+if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&& [...]
+},cur:function(){var a=Zb.propHooks[this.prop];return a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var b,c=Zb.propHooks[this.prop];return this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.prop [...]
diff --git a/doc/html/_static/js/theme.js b/doc/html/_static/js/theme.js
new file mode 100644
index 0000000..60520cc
--- /dev/null
+++ b/doc/html/_static/js/theme.js
@@ -0,0 +1,47 @@
+$( document ).ready(function() {
+ // Shift nav in mobile when clicking the menu.
+ $(document).on('click', "[data-toggle='wy-nav-top']", function() {
+ $("[data-toggle='wy-nav-shift']").toggleClass("shift");
+ $("[data-toggle='rst-versions']").toggleClass("shift");
+ });
+ // Close menu when you click a link.
+ $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
+ $("[data-toggle='wy-nav-shift']").removeClass("shift");
+ $("[data-toggle='rst-versions']").toggleClass("shift");
+ });
+ $(document).on('click', "[data-toggle='rst-current-version']", function() {
+ $("[data-toggle='rst-versions']").toggleClass("shift-up");
+ });
+ // Make tables responsive
+ $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");
+});
+
+window.SphinxRtdTheme = (function (jquery) {
+ var stickyNav = (function () {
+ var navBar,
+ win,
+ stickyNavCssClass = 'stickynav',
+ applyStickNav = function () {
+ if (navBar.height() <= win.height()) {
+ navBar.addClass(stickyNavCssClass);
+ } else {
+ navBar.removeClass(stickyNavCssClass);
+ }
+ },
+ enable = function () {
+ applyStickNav();
+ win.on('resize', applyStickNav);
+ },
+ init = function () {
+ navBar = jquery('nav.wy-nav-side:first');
+ win = jquery(window);
+ };
+ jquery(init);
+ return {
+ enable : enable
+ };
+ }());
+ return {
+ StickyNav : stickyNav
+ };
+}($));
diff --git a/doc/html/_static/minus.png b/doc/html/_static/minus.png
new file mode 100644
index 0000000..0f22b16
Binary files /dev/null and b/doc/html/_static/minus.png differ
diff --git a/doc/html/_static/plus.png b/doc/html/_static/plus.png
new file mode 100644
index 0000000..0cfe084
Binary files /dev/null and b/doc/html/_static/plus.png differ
diff --git a/doc/html/_static/pygments.css b/doc/html/_static/pygments.css
new file mode 100644
index 0000000..57eadc0
--- /dev/null
+++ b/doc/html/_static/pygments.css
@@ -0,0 +1,63 @@
+.highlight .hll { background-color: #ffffcc }
+.highlight { background: #eeffcc; }
+.highlight .c { color: #408090; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #007020; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #007020 } /* Comment.Preproc */
+.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #333333 } /* Generic.Output */
+.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0044DD } /* Generic.Traceback */
+.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #007020 } /* Keyword.Pseudo */
+.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #902000 } /* Keyword.Type */
+.highlight .m { color: #208050 } /* Literal.Number */
+.highlight .s { color: #4070a0 } /* Literal.String */
+.highlight .na { color: #4070a0 } /* Name.Attribute */
+.highlight .nb { color: #007020 } /* Name.Builtin */
+.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
+.highlight .no { color: #60add5 } /* Name.Constant */
+.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */
+.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #007020 } /* Name.Exception */
+.highlight .nf { color: #06287e } /* Name.Function */
+.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */
+.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #bb60d5 } /* Name.Variable */
+.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mb { color: #208050 } /* Literal.Number.Bin */
+.highlight .mf { color: #208050 } /* Literal.Number.Float */
+.highlight .mh { color: #208050 } /* Literal.Number.Hex */
+.highlight .mi { color: #208050 } /* Literal.Number.Integer */
+.highlight .mo { color: #208050 } /* Literal.Number.Oct */
+.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */
+.highlight .sc { color: #4070a0 } /* Literal.String.Char */
+.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #4070a0 } /* Literal.String.Double */
+.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */
+.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
+.highlight .sx { color: #c65d09 } /* Literal.String.Other */
+.highlight .sr { color: #235388 } /* Literal.String.Regex */
+.highlight .s1 { color: #4070a0 } /* Literal.String.Single */
+.highlight .ss { color: #517918 } /* Literal.String.Symbol */
+.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */
+.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */
+.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */
+.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */
\ No newline at end of file
diff --git a/doc/html/_static/searchtools.js b/doc/html/_static/searchtools.js
new file mode 100644
index 0000000..0e794fd
--- /dev/null
+++ b/doc/html/_static/searchtools.js
@@ -0,0 +1,622 @@
+/*
+ * searchtools.js_t
+ * ~~~~~~~~~~~~~~~~
+ *
+ * Sphinx JavaScript utilties for the full-text search.
+ *
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+
+/**
+ * Porter Stemmer
+ */
+var Stemmer = function() {
+
+ var step2list = {
+ ational: 'ate',
+ tional: 'tion',
+ enci: 'ence',
+ anci: 'ance',
+ izer: 'ize',
+ bli: 'ble',
+ alli: 'al',
+ entli: 'ent',
+ eli: 'e',
+ ousli: 'ous',
+ ization: 'ize',
+ ation: 'ate',
+ ator: 'ate',
+ alism: 'al',
+ iveness: 'ive',
+ fulness: 'ful',
+ ousness: 'ous',
+ aliti: 'al',
+ iviti: 'ive',
+ biliti: 'ble',
+ logi: 'log'
+ };
+
+ var step3list = {
+ icate: 'ic',
+ ative: '',
+ alize: 'al',
+ iciti: 'ic',
+ ical: 'ic',
+ ful: '',
+ ness: ''
+ };
+
+ var c = "[^aeiou]"; // consonant
+ var v = "[aeiouy]"; // vowel
+ var C = c + "[^aeiouy]*"; // consonant sequence
+ var V = v + "[aeiou]*"; // vowel sequence
+
+ var mgr0 = "^(" + C + ")?" + V + C; // [C]VC... is m>0
+ var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$"; // [C]VC[V] is m=1
+ var mgr1 = "^(" + C + ")?" + V + C + V + C; // [C]VCVC... is m>1
+ var s_v = "^(" + C + ")?" + v; // vowel in stem
+
+ this.stemWord = function (w) {
+ var stem;
+ var suffix;
+ var firstch;
+ var origword = w;
+
+ if (w.length < 3)
+ return w;
+
+ var re;
+ var re2;
+ var re3;
+ var re4;
+
+ firstch = w.substr(0,1);
+ if (firstch == "y")
+ w = firstch.toUpperCase() + w.substr(1);
+
+ // Step 1a
+ re = /^(.+?)(ss|i)es$/;
+ re2 = /^(.+?)([^s])s$/;
+
+ if (re.test(w))
+ w = w.replace(re,"$1$2");
+ else if (re2.test(w))
+ w = w.replace(re2,"$1$2");
+
+ // Step 1b
+ re = /^(.+?)eed$/;
+ re2 = /^(.+?)(ed|ing)$/;
+ if (re.test(w)) {
+ var fp = re.exec(w);
+ re = new RegExp(mgr0);
+ if (re.test(fp[1])) {
+ re = /.$/;
+ w = w.replace(re,"");
+ }
+ }
+ else if (re2.test(w)) {
+ var fp = re2.exec(w);
+ stem = fp[1];
+ re2 = new RegExp(s_v);
+ if (re2.test(stem)) {
+ w = stem;
+ re2 = /(at|bl|iz)$/;
+ re3 = new RegExp("([^aeiouylsz])\\1$");
+ re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
+ if (re2.test(w))
+ w = w + "e";
+ else if (re3.test(w)) {
+ re = /.$/;
+ w = w.replace(re,"");
+ }
+ else if (re4.test(w))
+ w = w + "e";
+ }
+ }
+
+ // Step 1c
+ re = /^(.+?)y$/;
+ if (re.test(w)) {
+ var fp = re.exec(w);
+ stem = fp[1];
+ re = new RegExp(s_v);
+ if (re.test(stem))
+ w = stem + "i";
+ }
+
+ // Step 2
+ re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/;
+ if (re.test(w)) {
+ var fp = re.exec(w);
+ stem = fp[1];
+ suffix = fp[2];
+ re = new RegExp(mgr0);
+ if (re.test(stem))
+ w = stem + step2list[suffix];
+ }
+
+ // Step 3
+ re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/;
+ if (re.test(w)) {
+ var fp = re.exec(w);
+ stem = fp[1];
+ suffix = fp[2];
+ re = new RegExp(mgr0);
+ if (re.test(stem))
+ w = stem + step3list[suffix];
+ }
+
+ // Step 4
+ re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/;
+ re2 = /^(.+?)(s|t)(ion)$/;
+ if (re.test(w)) {
+ var fp = re.exec(w);
+ stem = fp[1];
+ re = new RegExp(mgr1);
+ if (re.test(stem))
+ w = stem;
+ }
+ else if (re2.test(w)) {
+ var fp = re2.exec(w);
+ stem = fp[1] + fp[2];
+ re2 = new RegExp(mgr1);
+ if (re2.test(stem))
+ w = stem;
+ }
+
+ // Step 5
+ re = /^(.+?)e$/;
+ if (re.test(w)) {
+ var fp = re.exec(w);
+ stem = fp[1];
+ re = new RegExp(mgr1);
+ re2 = new RegExp(meq1);
+ re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
+ if (re.test(stem) || (re2.test(stem) && !(re3.test(stem))))
+ w = stem;
+ }
+ re = /ll$/;
+ re2 = new RegExp(mgr1);
+ if (re.test(w) && re2.test(w)) {
+ re = /.$/;
+ w = w.replace(re,"");
+ }
+
+ // and turn initial Y back to y
+ if (firstch == "y")
+ w = firstch.toLowerCase() + w.substr(1);
+ return w;
+ }
+}
+
+
+
+/**
+ * Simple result scoring code.
+ */
+var Scorer = {
+ // Implement the following function to further tweak the score for each result
+ // The function takes a result array [filename, title, anchor, descr, score]
+ // and returns the new score.
+ /*
+ score: function(result) {
+ return result[4];
+ },
+ */
+
+ // query matches the full name of an object
+ objNameMatch: 11,
+ // or matches in the last dotted part of the object name
+ objPartialMatch: 6,
+ // Additive scores depending on the priority of the object
+ objPrio: {0: 15, // used to be importantResults
+ 1: 5, // used to be objectResults
+ 2: -5}, // used to be unimportantResults
+ // Used when the priority is not in the mapping.
+ objPrioDefault: 0,
+
+ // query found in title
+ title: 15,
+ // query found in terms
+ term: 5
+};
+
+
+/**
+ * Search Module
+ */
+var Search = {
+
+ _index : null,
+ _queued_query : null,
+ _pulse_status : -1,
+
+ init : function() {
+ var params = $.getQueryParameters();
+ if (params.q) {
+ var query = params.q[0];
+ $('input[name="q"]')[0].value = query;
+ this.performSearch(query);
+ }
+ },
+
+ loadIndex : function(url) {
+ $.ajax({type: "GET", url: url, data: null,
+ dataType: "script", cache: true,
+ complete: function(jqxhr, textstatus) {
+ if (textstatus != "success") {
+ document.getElementById("searchindexloader").src = url;
+ }
+ }});
+ },
+
+ setIndex : function(index) {
+ var q;
+ this._index = index;
+ if ((q = this._queued_query) !== null) {
+ this._queued_query = null;
+ Search.query(q);
+ }
+ },
+
+ hasIndex : function() {
+ return this._index !== null;
+ },
+
+ deferQuery : function(query) {
+ this._queued_query = query;
+ },
+
+ stopPulse : function() {
+ this._pulse_status = 0;
+ },
+
+ startPulse : function() {
+ if (this._pulse_status >= 0)
+ return;
+ function pulse() {
+ var i;
+ Search._pulse_status = (Search._pulse_status + 1) % 4;
+ var dotString = '';
+ for (i = 0; i < Search._pulse_status; i++)
+ dotString += '.';
+ Search.dots.text(dotString);
+ if (Search._pulse_status > -1)
+ window.setTimeout(pulse, 500);
+ }
+ pulse();
+ },
+
+ /**
+ * perform a search for something (or wait until index is loaded)
+ */
+ performSearch : function(query) {
+ // create the required interface elements
+ this.out = $('#search-results');
+ this.title = $('<h2>' + _('Searching') + '</h2>').appendTo(this.out);
+ this.dots = $('<span></span>').appendTo(this.title);
+ this.status = $('<p style="display: none"></p>').appendTo(this.out);
+ this.output = $('<ul class="search"/>').appendTo(this.out);
+
+ $('#search-progress').text(_('Preparing search...'));
+ this.startPulse();
+
+ // index already loaded, the browser was quick!
+ if (this.hasIndex())
+ this.query(query);
+ else
+ this.deferQuery(query);
+ },
+
+ /**
+ * execute search (requires search index to be loaded)
+ */
+ query : function(query) {
+ var i;
+ var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"];
+
+ // stem the searchterms and add them to the correct list
+ var stemmer = new Stemmer();
+ var searchterms = [];
+ var excluded = [];
+ var hlterms = [];
+ var tmp = query.split(/\s+/);
+ var objectterms = [];
+ for (i = 0; i < tmp.length; i++) {
+ if (tmp[i] !== "") {
+ objectterms.push(tmp[i].toLowerCase());
+ }
+
+ if ($u.indexOf(stopwords, tmp[i].toLowerCase()) != -1 || tmp[i].match(/^\d+$/) ||
+ tmp[i] === "") {
+ // skip this "word"
+ continue;
+ }
+ // stem the word
+ var word = stemmer.stemWord(tmp[i].toLowerCase());
+ var toAppend;
+ // select the correct list
+ if (word[0] == '-') {
+ toAppend = excluded;
+ word = word.substr(1);
+ }
+ else {
+ toAppend = searchterms;
+ hlterms.push(tmp[i].toLowerCase());
+ }
+ // only add if not already in the list
+ if (!$u.contains(toAppend, word))
+ toAppend.push(word);
+ }
+ var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
+
+ // console.debug('SEARCH: searching for:');
+ // console.info('required: ', searchterms);
+ // console.info('excluded: ', excluded);
+
+ // prepare search
+ var terms = this._index.terms;
+ var titleterms = this._index.titleterms;
+
+ // array of [filename, title, anchor, descr, score]
+ var results = [];
+ $('#search-progress').empty();
+
+ // lookup as object
+ for (i = 0; i < objectterms.length; i++) {
+ var others = [].concat(objectterms.slice(0, i),
+ objectterms.slice(i+1, objectterms.length));
+ results = results.concat(this.performObjectSearch(objectterms[i], others));
+ }
+
+ // lookup as search terms in fulltext
+ results = results.concat(this.performTermsSearch(searchterms, excluded, terms, Scorer.term))
+ .concat(this.performTermsSearch(searchterms, excluded, titleterms, Scorer.title));
+
+ // let the scorer override scores with a custom scoring function
+ if (Scorer.score) {
+ for (i = 0; i < results.length; i++)
+ results[i][4] = Scorer.score(results[i]);
+ }
+
+ // now sort the results by score (in opposite order of appearance, since the
+ // display function below uses pop() to retrieve items) and then
+ // alphabetically
+ results.sort(function(a, b) {
+ var left = a[4];
+ var right = b[4];
+ if (left > right) {
+ return 1;
+ } else if (left < right) {
+ return -1;
+ } else {
+ // same score: sort alphabetically
+ left = a[1].toLowerCase();
+ right = b[1].toLowerCase();
+ return (left > right) ? -1 : ((left < right) ? 1 : 0);
+ }
+ });
+
+ // for debugging
+ //Search.lastresults = results.slice(); // a copy
+ //console.info('search results:', Search.lastresults);
+
+ // print the results
+ var resultCount = results.length;
+ function displayNextItem() {
+ // results left, load the summary and display it
+ if (results.length) {
+ var item = results.pop();
+ var listItem = $('<li style="display:none"></li>');
+ if (DOCUMENTATION_OPTIONS.FILE_SUFFIX === '') {
+ // dirhtml builder
+ var dirname = item[0] + '/';
+ if (dirname.match(/\/index\/$/)) {
+ dirname = dirname.substring(0, dirname.length-6);
+ } else if (dirname == 'index/') {
+ dirname = '';
+ }
+ listItem.append($('<a/>').attr('href',
+ DOCUMENTATION_OPTIONS.URL_ROOT + dirname +
+ highlightstring + item[2]).html(item[1]));
+ } else {
+ // normal html builders
+ listItem.append($('<a/>').attr('href',
+ item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
+ highlightstring + item[2]).html(item[1]));
+ }
+ if (item[3]) {
+ listItem.append($('<span> (' + item[3] + ')</span>'));
+ Search.output.append(listItem);
+ listItem.slideDown(5, function() {
+ displayNextItem();
+ });
+ } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
+ $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[0] + '.txt',
+ dataType: "text",
+ complete: function(jqxhr, textstatus) {
+ var data = jqxhr.responseText;
+ if (data !== '' && data !== undefined) {
+ listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
+ }
+ Search.output.append(listItem);
+ listItem.slideDown(5, function() {
+ displayNextItem();
+ });
+ }});
+ } else {
+ // no source available, just display title
+ Search.output.append(listItem);
+ listItem.slideDown(5, function() {
+ displayNextItem();
+ });
+ }
+ }
+ // search finished, update title and status message
+ else {
+ Search.stopPulse();
+ Search.title.text(_('Search Results'));
+ if (!resultCount)
+ Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
+ else
+ Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
+ Search.status.fadeIn(500);
+ }
+ }
+ displayNextItem();
+ },
+
+ /**
+ * search for object names
+ */
+ performObjectSearch : function(object, otherterms) {
+ var filenames = this._index.filenames;
+ var objects = this._index.objects;
+ var objnames = this._index.objnames;
+ var titles = this._index.titles;
+
+ var i;
+ var results = [];
+
+ for (var prefix in objects) {
+ for (var name in objects[prefix]) {
+ var fullname = (prefix ? prefix + '.' : '') + name;
+ if (fullname.toLowerCase().indexOf(object) > -1) {
+ var score = 0;
+ var parts = fullname.split('.');
+ // check for different match types: exact matches of full name or
+ // "last name" (i.e. last dotted part)
+ if (fullname == object || parts[parts.length - 1] == object) {
+ score += Scorer.objNameMatch;
+ // matches in last name
+ } else if (parts[parts.length - 1].indexOf(object) > -1) {
+ score += Scorer.objPartialMatch;
+ }
+ var match = objects[prefix][name];
+ var objname = objnames[match[1]][2];
+ var title = titles[match[0]];
+ // If more than one term searched for, we require other words to be
+ // found in the name/title/description
+ if (otherterms.length > 0) {
+ var haystack = (prefix + ' ' + name + ' ' +
+ objname + ' ' + title).toLowerCase();
+ var allfound = true;
+ for (i = 0; i < otherterms.length; i++) {
+ if (haystack.indexOf(otherterms[i]) == -1) {
+ allfound = false;
+ break;
+ }
+ }
+ if (!allfound) {
+ continue;
+ }
+ }
+ var descr = objname + _(', in ') + title;
+
+ var anchor = match[3];
+ if (anchor === '')
+ anchor = fullname;
+ else if (anchor == '-')
+ anchor = objnames[match[1]][1] + '-' + fullname;
+ // add custom score for some objects according to scorer
+ if (Scorer.objPrio.hasOwnProperty(match[2])) {
+ score += Scorer.objPrio[match[2]];
+ } else {
+ score += Scorer.objPrioDefault;
+ }
+ results.push([filenames[match[0]], fullname, '#'+anchor, descr, score]);
+ }
+ }
+ }
+
+ return results;
+ },
+
+ /**
+ * search for full-text terms in the index
+ */
+ performTermsSearch : function(searchterms, excluded, terms, score) {
+ var filenames = this._index.filenames;
+ var titles = this._index.titles;
+
+ var i, j, file, files;
+ var fileMap = {};
+ var results = [];
+
+ // perform the search on the required terms
+ for (i = 0; i < searchterms.length; i++) {
+ var word = searchterms[i];
+ // no match but word was a required one
+ if ((files = terms[word]) === undefined)
+ break;
+ if (files.length === undefined) {
+ files = [files];
+ }
+ // create the mapping
+ for (j = 0; j < files.length; j++) {
+ file = files[j];
+ if (file in fileMap)
+ fileMap[file].push(word);
+ else
+ fileMap[file] = [word];
+ }
+ }
+
+ // now check if the files don't contain excluded terms
+ for (file in fileMap) {
+ var valid = true;
+
+ // check if all requirements are matched
+ if (fileMap[file].length != searchterms.length)
+ continue;
+
+ // ensure that none of the excluded terms is in the search result
+ for (i = 0; i < excluded.length; i++) {
+ if (terms[excluded[i]] == file ||
+ $u.contains(terms[excluded[i]] || [], file)) {
+ valid = false;
+ break;
+ }
+ }
+
+ // if we have still a valid result we can add it to the result list
+ if (valid) {
+ results.push([filenames[file], titles[file], '', null, score]);
+ }
+ }
+ return results;
+ },
+
+ /**
+ * helper function to return a node containing the
+ * search summary for a given text. keywords is a list
+ * of stemmed words, hlwords is the list of normal, unstemmed
+ * words. the first one is used to find the occurance, the
+ * latter for highlighting it.
+ */
+ makeSearchSummary : function(text, keywords, hlwords) {
+ var textLower = text.toLowerCase();
+ var start = 0;
+ $.each(keywords, function() {
+ var i = textLower.indexOf(this.toLowerCase());
+ if (i > -1)
+ start = i;
+ });
+ start = Math.max(start - 120, 0);
+ var excerpt = ((start > 0) ? '...' : '') +
+ $.trim(text.substr(start, 240)) +
+ ((start + 240 - text.length) ? '...' : '');
+ var rv = $('<div class="context"></div>').text(excerpt);
+ $.each(hlwords, function() {
+ rv = rv.highlightText(this, 'highlighted');
+ });
+ return rv;
+ }
+};
+
+$(document).ready(function() {
+ Search.init();
+});
\ No newline at end of file
diff --git a/doc/html/_static/underscore-1.3.1.js b/doc/html/_static/underscore-1.3.1.js
new file mode 100644
index 0000000..208d4cd
--- /dev/null
+++ b/doc/html/_static/underscore-1.3.1.js
@@ -0,0 +1,999 @@
+// Underscore.js 1.3.1
+// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the MIT license.
+// Portions of Underscore are inspired or borrowed from Prototype,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore
+
+(function() {
+
+ // Baseline setup
+ // --------------
+
+ // Establish the root object, `window` in the browser, or `global` on the server.
+ var root = this;
+
+ // Save the previous value of the `_` variable.
+ var previousUnderscore = root._;
+
+ // Establish the object that gets returned to break out of a loop iteration.
+ var breaker = {};
+
+ // Save bytes in the minified (but not gzipped) version:
+ var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+
+ // Create quick reference variables for speed access to core prototypes.
+ var slice = ArrayProto.slice,
+ unshift = ArrayProto.unshift,
+ toString = ObjProto.toString,
+ hasOwnProperty = ObjProto.hasOwnProperty;
+
+ // All **ECMAScript 5** native function implementations that we hope to use
+ // are declared here.
+ var
+ nativeForEach = ArrayProto.forEach,
+ nativeMap = ArrayProto.map,
+ nativeReduce = ArrayProto.reduce,
+ nativeReduceRight = ArrayProto.reduceRight,
+ nativeFilter = ArrayProto.filter,
+ nativeEvery = ArrayProto.every,
+ nativeSome = ArrayProto.some,
+ nativeIndexOf = ArrayProto.indexOf,
+ nativeLastIndexOf = ArrayProto.lastIndexOf,
+ nativeIsArray = Array.isArray,
+ nativeKeys = Object.keys,
+ nativeBind = FuncProto.bind;
+
+ // Create a safe reference to the Underscore object for use below.
+ var _ = function(obj) { return new wrapper(obj); };
+
+ // Export the Underscore object for **Node.js**, with
+ // backwards-compatibility for the old `require()` API. If we're in
+ // the browser, add `_` as a global object via a string identifier,
+ // for Closure Compiler "advanced" mode.
+ if (typeof exports !== 'undefined') {
+ if (typeof module !== 'undefined' && module.exports) {
+ exports = module.exports = _;
+ }
+ exports._ = _;
+ } else {
+ root['_'] = _;
+ }
+
+ // Current version.
+ _.VERSION = '1.3.1';
+
+ // Collection Functions
+ // --------------------
+
+ // The cornerstone, an `each` implementation, aka `forEach`.
+ // Handles objects with the built-in `forEach`, arrays, and raw objects.
+ // Delegates to **ECMAScript 5**'s native `forEach` if available.
+ var each = _.each = _.forEach = function(obj, iterator, context) {
+ if (obj == null) return;
+ if (nativeForEach && obj.forEach === nativeForEach) {
+ obj.forEach(iterator, context);
+ } else if (obj.length === +obj.length) {
+ for (var i = 0, l = obj.length; i < l; i++) {
+ if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
+ }
+ } else {
+ for (var key in obj) {
+ if (_.has(obj, key)) {
+ if (iterator.call(context, obj[key], key, obj) === breaker) return;
+ }
+ }
+ }
+ };
+
+ // Return the results of applying the iterator to each element.
+ // Delegates to **ECMAScript 5**'s native `map` if available.
+ _.map = _.collect = function(obj, iterator, context) {
+ var results = [];
+ if (obj == null) return results;
+ if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
+ each(obj, function(value, index, list) {
+ results[results.length] = iterator.call(context, value, index, list);
+ });
+ if (obj.length === +obj.length) results.length = obj.length;
+ return results;
+ };
+
+ // **Reduce** builds up a single result from a list of values, aka `inject`,
+ // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
+ _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
+ var initial = arguments.length > 2;
+ if (obj == null) obj = [];
+ if (nativeReduce && obj.reduce === nativeReduce) {
+ if (context) iterator = _.bind(iterator, context);
+ return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
+ }
+ each(obj, function(value, index, list) {
+ if (!initial) {
+ memo = value;
+ initial = true;
+ } else {
+ memo = iterator.call(context, memo, value, index, list);
+ }
+ });
+ if (!initial) throw new TypeError('Reduce of empty array with no initial value');
+ return memo;
+ };
+
+ // The right-associative version of reduce, also known as `foldr`.
+ // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
+ _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
+ var initial = arguments.length > 2;
+ if (obj == null) obj = [];
+ if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
+ if (context) iterator = _.bind(iterator, context);
+ return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+ }
+ var reversed = _.toArray(obj).reverse();
+ if (context && !initial) iterator = _.bind(iterator, context);
+ return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator);
+ };
+
+ // Return the first value which passes a truth test. Aliased as `detect`.
+ _.find = _.detect = function(obj, iterator, context) {
+ var result;
+ any(obj, function(value, index, list) {
+ if (iterator.call(context, value, index, list)) {
+ result = value;
+ return true;
+ }
+ });
+ return result;
+ };
+
+ // Return all the elements that pass a truth test.
+ // Delegates to **ECMAScript 5**'s native `filter` if available.
+ // Aliased as `select`.
+ _.filter = _.select = function(obj, iterator, context) {
+ var results = [];
+ if (obj == null) return results;
+ if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
+ each(obj, function(value, index, list) {
+ if (iterator.call(context, value, index, list)) results[results.length] = value;
+ });
+ return results;
+ };
+
+ // Return all the elements for which a truth test fails.
+ _.reject = function(obj, iterator, context) {
+ var results = [];
+ if (obj == null) return results;
+ each(obj, function(value, index, list) {
+ if (!iterator.call(context, value, index, list)) results[results.length] = value;
+ });
+ return results;
+ };
+
+ // Determine whether all of the elements match a truth test.
+ // Delegates to **ECMAScript 5**'s native `every` if available.
+ // Aliased as `all`.
+ _.every = _.all = function(obj, iterator, context) {
+ var result = true;
+ if (obj == null) return result;
+ if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
+ each(obj, function(value, index, list) {
+ if (!(result = result && iterator.call(context, value, index, list))) return breaker;
+ });
+ return result;
+ };
+
+ // Determine if at least one element in the object matches a truth test.
+ // Delegates to **ECMAScript 5**'s native `some` if available.
+ // Aliased as `any`.
+ var any = _.some = _.any = function(obj, iterator, context) {
+ iterator || (iterator = _.identity);
+ var result = false;
+ if (obj == null) return result;
+ if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
+ each(obj, function(value, index, list) {
+ if (result || (result = iterator.call(context, value, index, list))) return breaker;
+ });
+ return !!result;
+ };
+
+ // Determine if a given value is included in the array or object using `===`.
+ // Aliased as `contains`.
+ _.include = _.contains = function(obj, target) {
+ var found = false;
+ if (obj == null) return found;
+ if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
+ found = any(obj, function(value) {
+ return value === target;
+ });
+ return found;
+ };
+
+ // Invoke a method (with arguments) on every item in a collection.
+ _.invoke = function(obj, method) {
+ var args = slice.call(arguments, 2);
+ return _.map(obj, function(value) {
+ return (_.isFunction(method) ? method || value : value[method]).apply(value, args);
+ });
+ };
+
+ // Convenience version of a common use case of `map`: fetching a property.
+ _.pluck = function(obj, key) {
+ return _.map(obj, function(value){ return value[key]; });
+ };
+
+ // Return the maximum element or (element-based computation).
+ _.max = function(obj, iterator, context) {
+ if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
+ if (!iterator && _.isEmpty(obj)) return -Infinity;
+ var result = {computed : -Infinity};
+ each(obj, function(value, index, list) {
+ var computed = iterator ? iterator.call(context, value, index, list) : value;
+ computed >= result.computed && (result = {value : value, computed : computed});
+ });
+ return result.value;
+ };
+
+ // Return the minimum element (or element-based computation).
+ _.min = function(obj, iterator, context) {
+ if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
+ if (!iterator && _.isEmpty(obj)) return Infinity;
+ var result = {computed : Infinity};
+ each(obj, function(value, index, list) {
+ var computed = iterator ? iterator.call(context, value, index, list) : value;
+ computed < result.computed && (result = {value : value, computed : computed});
+ });
+ return result.value;
+ };
+
+ // Shuffle an array.
+ _.shuffle = function(obj) {
+ var shuffled = [], rand;
+ each(obj, function(value, index, list) {
+ if (index == 0) {
+ shuffled[0] = value;
+ } else {
+ rand = Math.floor(Math.random() * (index + 1));
+ shuffled[index] = shuffled[rand];
+ shuffled[rand] = value;
+ }
+ });
+ return shuffled;
+ };
+
+ // Sort the object's values by a criterion produced by an iterator.
+ _.sortBy = function(obj, iterator, context) {
+ return _.pluck(_.map(obj, function(value, index, list) {
+ return {
+ value : value,
+ criteria : iterator.call(context, value, index, list)
+ };
+ }).sort(function(left, right) {
+ var a = left.criteria, b = right.criteria;
+ return a < b ? -1 : a > b ? 1 : 0;
+ }), 'value');
+ };
+
+ // Groups the object's values by a criterion. Pass either a string attribute
+ // to group by, or a function that returns the criterion.
+ _.groupBy = function(obj, val) {
+ var result = {};
+ var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
+ each(obj, function(value, index) {
+ var key = iterator(value, index);
+ (result[key] || (result[key] = [])).push(value);
+ });
+ return result;
+ };
+
+ // Use a comparator function to figure out at what index an object should
+ // be inserted so as to maintain order. Uses binary search.
+ _.sortedIndex = function(array, obj, iterator) {
+ iterator || (iterator = _.identity);
+ var low = 0, high = array.length;
+ while (low < high) {
+ var mid = (low + high) >> 1;
+ iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid;
+ }
+ return low;
+ };
+
+ // Safely convert anything iterable into a real, live array.
+ _.toArray = function(iterable) {
+ if (!iterable) return [];
+ if (iterable.toArray) return iterable.toArray();
+ if (_.isArray(iterable)) return slice.call(iterable);
+ if (_.isArguments(iterable)) return slice.call(iterable);
+ return _.values(iterable);
+ };
+
+ // Return the number of elements in an object.
+ _.size = function(obj) {
+ return _.toArray(obj).length;
+ };
+
+ // Array Functions
+ // ---------------
+
+ // Get the first element of an array. Passing **n** will return the first N
+ // values in the array. Aliased as `head`. The **guard** check allows it to work
+ // with `_.map`.
+ _.first = _.head = function(array, n, guard) {
+ return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
+ };
+
+ // Returns everything but the last entry of the array. Especcialy useful on
+ // the arguments object. Passing **n** will return all the values in
+ // the array, excluding the last N. The **guard** check allows it to work with
+ // `_.map`.
+ _.initial = function(array, n, guard) {
+ return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
+ };
+
+ // Get the last element of an array. Passing **n** will return the last N
+ // values in the array. The **guard** check allows it to work with `_.map`.
+ _.last = function(array, n, guard) {
+ if ((n != null) && !guard) {
+ return slice.call(array, Math.max(array.length - n, 0));
+ } else {
+ return array[array.length - 1];
+ }
+ };
+
+ // Returns everything but the first entry of the array. Aliased as `tail`.
+ // Especially useful on the arguments object. Passing an **index** will return
+ // the rest of the values in the array from that index onward. The **guard**
+ // check allows it to work with `_.map`.
+ _.rest = _.tail = function(array, index, guard) {
+ return slice.call(array, (index == null) || guard ? 1 : index);
+ };
+
+ // Trim out all falsy values from an array.
+ _.compact = function(array) {
+ return _.filter(array, function(value){ return !!value; });
+ };
+
+ // Return a completely flattened version of an array.
+ _.flatten = function(array, shallow) {
+ return _.reduce(array, function(memo, value) {
+ if (_.isArray(value)) return memo.concat(shallow ? value : _.flatten(value));
+ memo[memo.length] = value;
+ return memo;
+ }, []);
+ };
+
+ // Return a version of the array that does not contain the specified value(s).
+ _.without = function(array) {
+ return _.difference(array, slice.call(arguments, 1));
+ };
+
+ // Produce a duplicate-free version of the array. If the array has already
+ // been sorted, you have the option of using a faster algorithm.
+ // Aliased as `unique`.
+ _.uniq = _.unique = function(array, isSorted, iterator) {
+ var initial = iterator ? _.map(array, iterator) : array;
+ var result = [];
+ _.reduce(initial, function(memo, el, i) {
+ if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) {
+ memo[memo.length] = el;
+ result[result.length] = array[i];
+ }
+ return memo;
+ }, []);
+ return result;
+ };
+
+ // Produce an array that contains the union: each distinct element from all of
+ // the passed-in arrays.
+ _.union = function() {
+ return _.uniq(_.flatten(arguments, true));
+ };
+
+ // Produce an array that contains every item shared between all the
+ // passed-in arrays. (Aliased as "intersect" for back-compat.)
+ _.intersection = _.intersect = function(array) {
+ var rest = slice.call(arguments, 1);
+ return _.filter(_.uniq(array), function(item) {
+ return _.every(rest, function(other) {
+ return _.indexOf(other, item) >= 0;
+ });
+ });
+ };
+
+ // Take the difference between one array and a number of other arrays.
+ // Only the elements present in just the first array will remain.
+ _.difference = function(array) {
+ var rest = _.flatten(slice.call(arguments, 1));
+ return _.filter(array, function(value){ return !_.include(rest, value); });
+ };
+
+ // Zip together multiple lists into a single array -- elements that share
+ // an index go together.
+ _.zip = function() {
+ var args = slice.call(arguments);
+ var length = _.max(_.pluck(args, 'length'));
+ var results = new Array(length);
+ for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i);
+ return results;
+ };
+
+ // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
+ // we need this function. Return the position of the first occurrence of an
+ // item in an array, or -1 if the item is not included in the array.
+ // Delegates to **ECMAScript 5**'s native `indexOf` if available.
+ // If the array is large and already in sort order, pass `true`
+ // for **isSorted** to use binary search.
+ _.indexOf = function(array, item, isSorted) {
+ if (array == null) return -1;
+ var i, l;
+ if (isSorted) {
+ i = _.sortedIndex(array, item);
+ return array[i] === item ? i : -1;
+ }
+ if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
+ for (i = 0, l = array.length; i < l; i++) if (i in array && array[i] === item) return i;
+ return -1;
+ };
+
+ // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
+ _.lastIndexOf = function(array, item) {
+ if (array == null) return -1;
+ if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
+ var i = array.length;
+ while (i--) if (i in array && array[i] === item) return i;
+ return -1;
+ };
+
+ // Generate an integer Array containing an arithmetic progression. A port of
+ // the native Python `range()` function. See
+ // [the Python documentation](http://docs.python.org/library/functions.html#range).
+ _.range = function(start, stop, step) {
+ if (arguments.length <= 1) {
+ stop = start || 0;
+ start = 0;
+ }
+ step = arguments[2] || 1;
+
+ var len = Math.max(Math.ceil((stop - start) / step), 0);
+ var idx = 0;
+ var range = new Array(len);
+
+ while(idx < len) {
+ range[idx++] = start;
+ start += step;
+ }
+
+ return range;
+ };
+
+ // Function (ahem) Functions
+ // ------------------
+
+ // Reusable constructor function for prototype setting.
+ var ctor = function(){};
+
+ // Create a function bound to a given object (assigning `this`, and arguments,
+ // optionally). Binding with arguments is also known as `curry`.
+ // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
+ // We check for `func.bind` first, to fail fast when `func` is undefined.
+ _.bind = function bind(func, context) {
+ var bound, args;
+ if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+ if (!_.isFunction(func)) throw new TypeError;
+ args = slice.call(arguments, 2);
+ return bound = function() {
+ if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
+ ctor.prototype = func.prototype;
+ var self = new ctor;
+ var result = func.apply(self, args.concat(slice.call(arguments)));
+ if (Object(result) === result) return result;
+ return self;
+ };
+ };
+
+ // Bind all of an object's methods to that object. Useful for ensuring that
+ // all callbacks defined on an object belong to it.
+ _.bindAll = function(obj) {
+ var funcs = slice.call(arguments, 1);
+ if (funcs.length == 0) funcs = _.functions(obj);
+ each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
+ return obj;
+ };
+
+ // Memoize an expensive function by storing its results.
+ _.memoize = function(func, hasher) {
+ var memo = {};
+ hasher || (hasher = _.identity);
+ return function() {
+ var key = hasher.apply(this, arguments);
+ return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
+ };
+ };
+
+ // Delays a function for the given number of milliseconds, and then calls
+ // it with the arguments supplied.
+ _.delay = function(func, wait) {
+ var args = slice.call(arguments, 2);
+ return setTimeout(function(){ return func.apply(func, args); }, wait);
+ };
+
+ // Defers a function, scheduling it to run after the current call stack has
+ // cleared.
+ _.defer = function(func) {
+ return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
+ };
+
+ // Returns a function, that, when invoked, will only be triggered at most once
+ // during a given window of time.
+ _.throttle = function(func, wait) {
+ var context, args, timeout, throttling, more;
+ var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
+ return function() {
+ context = this; args = arguments;
+ var later = function() {
+ timeout = null;
+ if (more) func.apply(context, args);
+ whenDone();
+ };
+ if (!timeout) timeout = setTimeout(later, wait);
+ if (throttling) {
+ more = true;
+ } else {
+ func.apply(context, args);
+ }
+ whenDone();
+ throttling = true;
+ };
+ };
+
+ // Returns a function, that, as long as it continues to be invoked, will not
+ // be triggered. The function will be called after it stops being called for
+ // N milliseconds.
+ _.debounce = function(func, wait) {
+ var timeout;
+ return function() {
+ var context = this, args = arguments;
+ var later = function() {
+ timeout = null;
+ func.apply(context, args);
+ };
+ clearTimeout(timeout);
+ timeout = setTimeout(later, wait);
+ };
+ };
+
+ // Returns a function that will be executed at most one time, no matter how
+ // often you call it. Useful for lazy initialization.
+ _.once = function(func) {
+ var ran = false, memo;
+ return function() {
+ if (ran) return memo;
+ ran = true;
+ return memo = func.apply(this, arguments);
+ };
+ };
+
+ // Returns the first function passed as an argument to the second,
+ // allowing you to adjust arguments, run code before and after, and
+ // conditionally execute the original function.
+ _.wrap = function(func, wrapper) {
+ return function() {
+ var args = [func].concat(slice.call(arguments, 0));
+ return wrapper.apply(this, args);
+ };
+ };
+
+ // Returns a function that is the composition of a list of functions, each
+ // consuming the return value of the function that follows.
+ _.compose = function() {
+ var funcs = arguments;
+ return function() {
+ var args = arguments;
+ for (var i = funcs.length - 1; i >= 0; i--) {
+ args = [funcs[i].apply(this, args)];
+ }
+ return args[0];
+ };
+ };
+
+ // Returns a function that will only be executed after being called N times.
+ _.after = function(times, func) {
+ if (times <= 0) return func();
+ return function() {
+ if (--times < 1) { return func.apply(this, arguments); }
+ };
+ };
+
+ // Object Functions
+ // ----------------
+
+ // Retrieve the names of an object's properties.
+ // Delegates to **ECMAScript 5**'s native `Object.keys`
+ _.keys = nativeKeys || function(obj) {
+ if (obj !== Object(obj)) throw new TypeError('Invalid object');
+ var keys = [];
+ for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
+ return keys;
+ };
+
+ // Retrieve the values of an object's properties.
+ _.values = function(obj) {
+ return _.map(obj, _.identity);
+ };
+
+ // Return a sorted list of the function names available on the object.
+ // Aliased as `methods`
+ _.functions = _.methods = function(obj) {
+ var names = [];
+ for (var key in obj) {
+ if (_.isFunction(obj[key])) names.push(key);
+ }
+ return names.sort();
+ };
+
+ // Extend a given object with all the properties in passed-in object(s).
+ _.extend = function(obj) {
+ each(slice.call(arguments, 1), function(source) {
+ for (var prop in source) {
+ obj[prop] = source[prop];
+ }
+ });
+ return obj;
+ };
+
+ // Fill in a given object with default properties.
+ _.defaults = function(obj) {
+ each(slice.call(arguments, 1), function(source) {
+ for (var prop in source) {
+ if (obj[prop] == null) obj[prop] = source[prop];
+ }
+ });
+ return obj;
+ };
+
+ // Create a (shallow-cloned) duplicate of an object.
+ _.clone = function(obj) {
+ if (!_.isObject(obj)) return obj;
+ return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
+ };
+
+ // Invokes interceptor with the obj, and then returns obj.
+ // The primary purpose of this method is to "tap into" a method chain, in
+ // order to perform operations on intermediate results within the chain.
+ _.tap = function(obj, interceptor) {
+ interceptor(obj);
+ return obj;
+ };
+
+ // Internal recursive comparison function.
+ function eq(a, b, stack) {
+ // Identical objects are equal. `0 === -0`, but they aren't identical.
+ // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
+ if (a === b) return a !== 0 || 1 / a == 1 / b;
+ // A strict comparison is necessary because `null == undefined`.
+ if (a == null || b == null) return a === b;
+ // Unwrap any wrapped objects.
+ if (a._chain) a = a._wrapped;
+ if (b._chain) b = b._wrapped;
+ // Invoke a custom `isEqual` method if one is provided.
+ if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b);
+ if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a);
+ // Compare `[[Class]]` names.
+ var className = toString.call(a);
+ if (className != toString.call(b)) return false;
+ switch (className) {
+ // Strings, numbers, dates, and booleans are compared by value.
+ case '[object String]':
+ // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+ // equivalent to `new String("5")`.
+ return a == String(b);
+ case '[object Number]':
+ // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
+ // other numeric values.
+ return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
+ case '[object Date]':
+ case '[object Boolean]':
+ // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+ // millisecond representations. Note that invalid dates with millisecond representations
+ // of `NaN` are not equivalent.
+ return +a == +b;
+ // RegExps are compared by their source patterns and flags.
+ case '[object RegExp]':
+ return a.source == b.source &&
+ a.global == b.global &&
+ a.multiline == b.multiline &&
+ a.ignoreCase == b.ignoreCase;
+ }
+ if (typeof a != 'object' || typeof b != 'object') return false;
+ // Assume equality for cyclic structures. The algorithm for detecting cyclic
+ // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+ var length = stack.length;
+ while (length--) {
+ // Linear search. Performance is inversely proportional to the number of
+ // unique nested structures.
+ if (stack[length] == a) return true;
+ }
+ // Add the first object to the stack of traversed objects.
+ stack.push(a);
+ var size = 0, result = true;
+ // Recursively compare objects and arrays.
+ if (className == '[object Array]') {
+ // Compare array lengths to determine if a deep comparison is necessary.
+ size = a.length;
+ result = size == b.length;
+ if (result) {
+ // Deep compare the contents, ignoring non-numeric properties.
+ while (size--) {
+ // Ensure commutative equality for sparse arrays.
+ if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break;
+ }
+ }
+ } else {
+ // Objects with different constructors are not equivalent.
+ if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false;
+ // Deep compare objects.
+ for (var key in a) {
+ if (_.has(a, key)) {
+ // Count the expected number of properties.
+ size++;
+ // Deep compare each member.
+ if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break;
+ }
+ }
+ // Ensure that both objects contain the same number of properties.
+ if (result) {
+ for (key in b) {
+ if (_.has(b, key) && !(size--)) break;
+ }
+ result = !size;
+ }
+ }
+ // Remove the first object from the stack of traversed objects.
+ stack.pop();
+ return result;
+ }
+
+ // Perform a deep comparison to check if two objects are equal.
+ _.isEqual = function(a, b) {
+ return eq(a, b, []);
+ };
+
+ // Is a given array, string, or object empty?
+ // An "empty" object has no enumerable own-properties.
+ _.isEmpty = function(obj) {
+ if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
+ for (var key in obj) if (_.has(obj, key)) return false;
+ return true;
+ };
+
+ // Is a given value a DOM element?
+ _.isElement = function(obj) {
+ return !!(obj && obj.nodeType == 1);
+ };
+
+ // Is a given value an array?
+ // Delegates to ECMA5's native Array.isArray
+ _.isArray = nativeIsArray || function(obj) {
+ return toString.call(obj) == '[object Array]';
+ };
+
+ // Is a given variable an object?
+ _.isObject = function(obj) {
+ return obj === Object(obj);
+ };
+
+ // Is a given variable an arguments object?
+ _.isArguments = function(obj) {
+ return toString.call(obj) == '[object Arguments]';
+ };
+ if (!_.isArguments(arguments)) {
+ _.isArguments = function(obj) {
+ return !!(obj && _.has(obj, 'callee'));
+ };
+ }
+
+ // Is a given value a function?
+ _.isFunction = function(obj) {
+ return toString.call(obj) == '[object Function]';
+ };
+
+ // Is a given value a string?
+ _.isString = function(obj) {
+ return toString.call(obj) == '[object String]';
+ };
+
+ // Is a given value a number?
+ _.isNumber = function(obj) {
+ return toString.call(obj) == '[object Number]';
+ };
+
+ // Is the given value `NaN`?
+ _.isNaN = function(obj) {
+ // `NaN` is the only value for which `===` is not reflexive.
+ return obj !== obj;
+ };
+
+ // Is a given value a boolean?
+ _.isBoolean = function(obj) {
+ return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
+ };
+
+ // Is a given value a date?
+ _.isDate = function(obj) {
+ return toString.call(obj) == '[object Date]';
+ };
+
+ // Is the given value a regular expression?
+ _.isRegExp = function(obj) {
+ return toString.call(obj) == '[object RegExp]';
+ };
+
+ // Is a given value equal to null?
+ _.isNull = function(obj) {
+ return obj === null;
+ };
+
+ // Is a given variable undefined?
+ _.isUndefined = function(obj) {
+ return obj === void 0;
+ };
+
+ // Has own property?
+ _.has = function(obj, key) {
+ return hasOwnProperty.call(obj, key);
+ };
+
+ // Utility Functions
+ // -----------------
+
+ // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
+ // previous owner. Returns a reference to the Underscore object.
+ _.noConflict = function() {
+ root._ = previousUnderscore;
+ return this;
+ };
+
+ // Keep the identity function around for default iterators.
+ _.identity = function(value) {
+ return value;
+ };
+
+ // Run a function **n** times.
+ _.times = function (n, iterator, context) {
+ for (var i = 0; i < n; i++) iterator.call(context, i);
+ };
+
+ // Escape a string for HTML interpolation.
+ _.escape = function(string) {
+ return (''+string).replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"').replace(/'/g, ''').replace(/\//g,'/');
+ };
+
+ // Add your own custom functions to the Underscore object, ensuring that
+ // they're correctly added to the OOP wrapper as well.
+ _.mixin = function(obj) {
+ each(_.functions(obj), function(name){
+ addToWrapper(name, _[name] = obj[name]);
+ });
+ };
+
+ // Generate a unique integer id (unique within the entire client session).
+ // Useful for temporary DOM ids.
+ var idCounter = 0;
+ _.uniqueId = function(prefix) {
+ var id = idCounter++;
+ return prefix ? prefix + id : id;
+ };
+
+ // By default, Underscore uses ERB-style template delimiters, change the
+ // following template settings to use alternative delimiters.
+ _.templateSettings = {
+ evaluate : /<%([\s\S]+?)%>/g,
+ interpolate : /<%=([\s\S]+?)%>/g,
+ escape : /<%-([\s\S]+?)%>/g
+ };
+
+ // When customizing `templateSettings`, if you don't want to define an
+ // interpolation, evaluation or escaping regex, we need one that is
+ // guaranteed not to match.
+ var noMatch = /.^/;
+
+ // Within an interpolation, evaluation, or escaping, remove HTML escaping
+ // that had been previously added.
+ var unescape = function(code) {
+ return code.replace(/\\\\/g, '\\').replace(/\\'/g, "'");
+ };
+
+ // JavaScript micro-templating, similar to John Resig's implementation.
+ // Underscore templating handles arbitrary delimiters, preserves whitespace,
+ // and correctly escapes quotes within interpolated code.
+ _.template = function(str, data) {
+ var c = _.templateSettings;
+ var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' +
+ 'with(obj||{}){__p.push(\'' +
+ str.replace(/\\/g, '\\\\')
+ .replace(/'/g, "\\'")
+ .replace(c.escape || noMatch, function(match, code) {
+ return "',_.escape(" + unescape(code) + "),'";
+ })
+ .replace(c.interpolate || noMatch, function(match, code) {
+ return "'," + unescape(code) + ",'";
+ })
+ .replace(c.evaluate || noMatch, function(match, code) {
+ return "');" + unescape(code).replace(/[\r\n\t]/g, ' ') + ";__p.push('";
+ })
+ .replace(/\r/g, '\\r')
+ .replace(/\n/g, '\\n')
+ .replace(/\t/g, '\\t')
+ + "');}return __p.join('');";
+ var func = new Function('obj', '_', tmpl);
+ if (data) return func(data, _);
+ return function(data) {
+ return func.call(this, data, _);
+ };
+ };
+
+ // Add a "chain" function, which will delegate to the wrapper.
+ _.chain = function(obj) {
+ return _(obj).chain();
+ };
+
+ // The OOP Wrapper
+ // ---------------
+
+ // If Underscore is called as a function, it returns a wrapped object that
+ // can be used OO-style. This wrapper holds altered versions of all the
+ // underscore functions. Wrapped objects may be chained.
+ var wrapper = function(obj) { this._wrapped = obj; };
+
+ // Expose `wrapper.prototype` as `_.prototype`
+ _.prototype = wrapper.prototype;
+
+ // Helper function to continue chaining intermediate results.
+ var result = function(obj, chain) {
+ return chain ? _(obj).chain() : obj;
+ };
+
+ // A method to easily add functions to the OOP wrapper.
+ var addToWrapper = function(name, func) {
+ wrapper.prototype[name] = function() {
+ var args = slice.call(arguments);
+ unshift.call(args, this._wrapped);
+ return result(func.apply(_, args), this._chain);
+ };
+ };
+
+ // Add all of the Underscore functions to the wrapper object.
+ _.mixin(_);
+
+ // Add all mutator Array functions to the wrapper.
+ each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+ var method = ArrayProto[name];
+ wrapper.prototype[name] = function() {
+ var wrapped = this._wrapped;
+ method.apply(wrapped, arguments);
+ var length = wrapped.length;
+ if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0];
+ return result(wrapped, this._chain);
+ };
+ });
+
+ // Add all accessor Array functions to the wrapper.
+ each(['concat', 'join', 'slice'], function(name) {
+ var method = ArrayProto[name];
+ wrapper.prototype[name] = function() {
+ return result(method.apply(this._wrapped, arguments), this._chain);
+ };
+ });
+
+ // Start chaining a wrapped Underscore object.
+ wrapper.prototype.chain = function() {
+ this._chain = true;
+ return this;
+ };
+
+ // Extracts the result from a wrapped and chained object.
+ wrapper.prototype.value = function() {
+ return this._wrapped;
+ };
+
+}).call(this);
diff --git a/doc/html/_static/underscore.js b/doc/html/_static/underscore.js
new file mode 100644
index 0000000..5b55f32
--- /dev/null
+++ b/doc/html/_static/underscore.js
@@ -0,0 +1,31 @@
+// Underscore.js 1.3.1
+// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the MIT license.
+// Portions of Underscore are inspired or borrowed from Prototype,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore
+(function(){function q(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null||c==null)return a===c;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return false;switch(e){case "[object String]":return a==String(c);case "[object Number]":return a!=+a?c!=+c:a==0?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object [...]
+c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if(typeof a!="object"||typeof c!="object")return false;for(var f=d.length;f--;)if(d[f]==a)return true;d.push(a);var f=0,g=true;if(e=="[object Array]"){if(f=a.length,g=f==c.length)for(;f--;)if(!(g=f in a==f in c&&q(a[f],c[f],d)))break}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return false;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&q(a[h],c[h],d))))break;if(g){for(h i [...]
+h)&&!f--)break;g=!f}}d.pop();return g}var r=this,G=r._,n={},k=Array.prototype,o=Object.prototype,i=k.slice,H=k.unshift,l=o.toString,I=o.hasOwnProperty,w=k.forEach,x=k.map,y=k.reduce,z=k.reduceRight,A=k.filter,B=k.every,C=k.some,p=k.indexOf,D=k.lastIndexOf,o=Array.isArray,J=Object.keys,s=Function.prototype.bind,b=function(a){return new m(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else r._=b;b.VERSION="1.3.1";var [...]
+b.forEach=function(a,c,d){if(a!=null)if(w&&a.forEach===w)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===n)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===n)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(x&&a.map===x)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.l [...]
+null&&(a=[]);if(y&&a.reduce===y)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(z&&a.reduceRight===z)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.f [...]
+function(a,c,b){var e;E(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(A&&a.filter===A)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(B&&a.every===B)return a.every(c,b);j(a,function(a,g, [...]
+e&&c.call(b,a,g,h)))return n});return e};var E=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(C&&a.some===C)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return n});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return p&&a.indexOf===p?a.indexOf(c)!=-1:b=E(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d) [...]
+function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&(e={value:a [...]
+return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){f==0?b[0]=a:(d=Math.floor(Math.random()*(f+1)),b[f]=b[d],b[d]=a)});return b};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,g){return{value:a,criteria:c.call(d,a,b,g)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedInd [...]
+c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:a.toArray?a.toArray():b.isArray(a)?i.call(a):b.isArguments(a)?i.call(a):b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length- [...]
+b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,e=[];b.reduce(d,function(d,g,h){if(0==h||(c===true?b.last(d)!=g:!b.include(d,g)))d[d.length]=g,e[e.length]=a[h];retur [...]
+return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=func [...]
+d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(p&&a.indexOf===p)return a.indexOf(c);for(d=0,e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(D&&a.lastIndexOf===D)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d; [...]
+var F=function(){};b.bind=function(a,c){var d,e;if(a.bind===s&&s)return s.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));F.prototype=a.prototype;var b=new F,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.mem [...]
+c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i=b.debounce(function(){h=g=false},c);return function(){d=this;e=arguments;var b;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);i()},c)) [...]
+a.apply(d,e);i();g=true}};b.debounce=function(a,b){var d;return function(){var e=this,f=arguments;clearTimeout(d);d=setTimeout(function(){d=null;a.apply(e,f)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)] [...]
+b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=J||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.defaults=function( [...]
+1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return q(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=o||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){ret [...]
+b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!b.has(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a) [...]
+b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,b){return I.call(a,b)};b.noConflict=function(){r._=G;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};b.mixin [...]
+function(c){K(c,b[c]=a[c])})};var L=0;b.uniqueId=function(a){var b=L++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var t=/.^/,u=function(a){return a.replace(/\\\\/g,"\\").replace(/\\'/g,"'")};b.template=function(a,c){var d=b.templateSettings,d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.escape||t,function(a,b){return [...]
+u(b)+"),'"}).replace(d.interpolate||t,function(a,b){return"',"+u(b)+",'"}).replace(d.evaluate||t,function(a,b){return"');"+u(b).replace(/[\r\n\t]/g," ")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var v=function(a,c){return c?b(a).chain():a},K=func [...]
+function(){var a=i.call(arguments);H.call(a,this._wrapped);return v(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return v(d,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return v(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.ch [...]
+true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);
diff --git a/doc/html/_static/up-pressed.png b/doc/html/_static/up-pressed.png
new file mode 100644
index 0000000..99e7210
Binary files /dev/null and b/doc/html/_static/up-pressed.png differ
diff --git a/doc/html/_static/up.png b/doc/html/_static/up.png
new file mode 100644
index 0000000..26de002
Binary files /dev/null and b/doc/html/_static/up.png differ
diff --git a/doc/html/_static/websupport.js b/doc/html/_static/websupport.js
new file mode 100644
index 0000000..28d65db
--- /dev/null
+++ b/doc/html/_static/websupport.js
@@ -0,0 +1,808 @@
+/*
+ * websupport.js
+ * ~~~~~~~~~~~~~
+ *
+ * sphinx.websupport utilties for all documentation.
+ *
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+(function($) {
+ $.fn.autogrow = function() {
+ return this.each(function() {
+ var textarea = this;
+
+ $.fn.autogrow.resize(textarea);
+
+ $(textarea)
+ .focus(function() {
+ textarea.interval = setInterval(function() {
+ $.fn.autogrow.resize(textarea);
+ }, 500);
+ })
+ .blur(function() {
+ clearInterval(textarea.interval);
+ });
+ });
+ };
+
+ $.fn.autogrow.resize = function(textarea) {
+ var lineHeight = parseInt($(textarea).css('line-height'), 10);
+ var lines = textarea.value.split('\n');
+ var columns = textarea.cols;
+ var lineCount = 0;
+ $.each(lines, function() {
+ lineCount += Math.ceil(this.length / columns) || 1;
+ });
+ var height = lineHeight * (lineCount + 1);
+ $(textarea).css('height', height);
+ };
+})(jQuery);
+
+(function($) {
+ var comp, by;
+
+ function init() {
+ initEvents();
+ initComparator();
+ }
+
+ function initEvents() {
+ $(document).on("click", 'a.comment-close', function(event) {
+ event.preventDefault();
+ hide($(this).attr('id').substring(2));
+ });
+ $(document).on("click", 'a.vote', function(event) {
+ event.preventDefault();
+ handleVote($(this));
+ });
+ $(document).on("click", 'a.reply', function(event) {
+ event.preventDefault();
+ openReply($(this).attr('id').substring(2));
+ });
+ $(document).on("click", 'a.close-reply', function(event) {
+ event.preventDefault();
+ closeReply($(this).attr('id').substring(2));
+ });
+ $(document).on("click", 'a.sort-option', function(event) {
+ event.preventDefault();
+ handleReSort($(this));
+ });
+ $(document).on("click", 'a.show-proposal', function(event) {
+ event.preventDefault();
+ showProposal($(this).attr('id').substring(2));
+ });
+ $(document).on("click", 'a.hide-proposal', function(event) {
+ event.preventDefault();
+ hideProposal($(this).attr('id').substring(2));
+ });
+ $(document).on("click", 'a.show-propose-change', function(event) {
+ event.preventDefault();
+ showProposeChange($(this).attr('id').substring(2));
+ });
+ $(document).on("click", 'a.hide-propose-change', function(event) {
+ event.preventDefault();
+ hideProposeChange($(this).attr('id').substring(2));
+ });
+ $(document).on("click", 'a.accept-comment', function(event) {
+ event.preventDefault();
+ acceptComment($(this).attr('id').substring(2));
+ });
+ $(document).on("click", 'a.delete-comment', function(event) {
+ event.preventDefault();
+ deleteComment($(this).attr('id').substring(2));
+ });
+ $(document).on("click", 'a.comment-markup', function(event) {
+ event.preventDefault();
+ toggleCommentMarkupBox($(this).attr('id').substring(2));
+ });
+ }
+
+ /**
+ * Set comp, which is a comparator function used for sorting and
+ * inserting comments into the list.
+ */
+ function setComparator() {
+ // If the first three letters are "asc", sort in ascending order
+ // and remove the prefix.
+ if (by.substring(0,3) == 'asc') {
+ var i = by.substring(3);
+ comp = function(a, b) { return a[i] - b[i]; };
+ } else {
+ // Otherwise sort in descending order.
+ comp = function(a, b) { return b[by] - a[by]; };
+ }
+
+ // Reset link styles and format the selected sort option.
+ $('a.sel').attr('href', '#').removeClass('sel');
+ $('a.by' + by).removeAttr('href').addClass('sel');
+ }
+
+ /**
+ * Create a comp function. If the user has preferences stored in
+ * the sortBy cookie, use those, otherwise use the default.
+ */
+ function initComparator() {
+ by = 'rating'; // Default to sort by rating.
+ // If the sortBy cookie is set, use that instead.
+ if (document.cookie.length > 0) {
+ var start = document.cookie.indexOf('sortBy=');
+ if (start != -1) {
+ start = start + 7;
+ var end = document.cookie.indexOf(";", start);
+ if (end == -1) {
+ end = document.cookie.length;
+ by = unescape(document.cookie.substring(start, end));
+ }
+ }
+ }
+ setComparator();
+ }
+
+ /**
+ * Show a comment div.
+ */
+ function show(id) {
+ $('#ao' + id).hide();
+ $('#ah' + id).show();
+ var context = $.extend({id: id}, opts);
+ var popup = $(renderTemplate(popupTemplate, context)).hide();
+ popup.find('textarea[name="proposal"]').hide();
+ popup.find('a.by' + by).addClass('sel');
+ var form = popup.find('#cf' + id);
+ form.submit(function(event) {
+ event.preventDefault();
+ addComment(form);
+ });
+ $('#s' + id).after(popup);
+ popup.slideDown('fast', function() {
+ getComments(id);
+ });
+ }
+
+ /**
+ * Hide a comment div.
+ */
+ function hide(id) {
+ $('#ah' + id).hide();
+ $('#ao' + id).show();
+ var div = $('#sc' + id);
+ div.slideUp('fast', function() {
+ div.remove();
+ });
+ }
+
+ /**
+ * Perform an ajax request to get comments for a node
+ * and insert the comments into the comments tree.
+ */
+ function getComments(id) {
+ $.ajax({
+ type: 'GET',
+ url: opts.getCommentsURL,
+ data: {node: id},
+ success: function(data, textStatus, request) {
+ var ul = $('#cl' + id);
+ var speed = 100;
+ $('#cf' + id)
+ .find('textarea[name="proposal"]')
+ .data('source', data.source);
+
+ if (data.comments.length === 0) {
+ ul.html('<li>No comments yet.</li>');
+ ul.data('empty', true);
+ } else {
+ // If there are comments, sort them and put them in the list.
+ var comments = sortComments(data.comments);
+ speed = data.comments.length * 100;
+ appendComments(comments, ul);
+ ul.data('empty', false);
+ }
+ $('#cn' + id).slideUp(speed + 200);
+ ul.slideDown(speed);
+ },
+ error: function(request, textStatus, error) {
+ showError('Oops, there was a problem retrieving the comments.');
+ },
+ dataType: 'json'
+ });
+ }
+
+ /**
+ * Add a comment via ajax and insert the comment into the comment tree.
+ */
+ function addComment(form) {
+ var node_id = form.find('input[name="node"]').val();
+ var parent_id = form.find('input[name="parent"]').val();
+ var text = form.find('textarea[name="comment"]').val();
+ var proposal = form.find('textarea[name="proposal"]').val();
+
+ if (text == '') {
+ showError('Please enter a comment.');
+ return;
+ }
+
+ // Disable the form that is being submitted.
+ form.find('textarea,input').attr('disabled', 'disabled');
+
+ // Send the comment to the server.
+ $.ajax({
+ type: "POST",
+ url: opts.addCommentURL,
+ dataType: 'json',
+ data: {
+ node: node_id,
+ parent: parent_id,
+ text: text,
+ proposal: proposal
+ },
+ success: function(data, textStatus, error) {
+ // Reset the form.
+ if (node_id) {
+ hideProposeChange(node_id);
+ }
+ form.find('textarea')
+ .val('')
+ .add(form.find('input'))
+ .removeAttr('disabled');
+ var ul = $('#cl' + (node_id || parent_id));
+ if (ul.data('empty')) {
+ $(ul).empty();
+ ul.data('empty', false);
+ }
+ insertComment(data.comment);
+ var ao = $('#ao' + node_id);
+ ao.find('img').attr({'src': opts.commentBrightImage});
+ if (node_id) {
+ // if this was a "root" comment, remove the commenting box
+ // (the user can get it back by reopening the comment popup)
+ $('#ca' + node_id).slideUp();
+ }
+ },
+ error: function(request, textStatus, error) {
+ form.find('textarea,input').removeAttr('disabled');
+ showError('Oops, there was a problem adding the comment.');
+ }
+ });
+ }
+
+ /**
+ * Recursively append comments to the main comment list and children
+ * lists, creating the comment tree.
+ */
+ function appendComments(comments, ul) {
+ $.each(comments, function() {
+ var div = createCommentDiv(this);
+ ul.append($(document.createElement('li')).html(div));
+ appendComments(this.children, div.find('ul.comment-children'));
+ // To avoid stagnating data, don't store the comments children in data.
+ this.children = null;
+ div.data('comment', this);
+ });
+ }
+
+ /**
+ * After adding a new comment, it must be inserted in the correct
+ * location in the comment tree.
+ */
+ function insertComment(comment) {
+ var div = createCommentDiv(comment);
+
+ // To avoid stagnating data, don't store the comments children in data.
+ comment.children = null;
+ div.data('comment', comment);
+
+ var ul = $('#cl' + (comment.node || comment.parent));
+ var siblings = getChildren(ul);
+
+ var li = $(document.createElement('li'));
+ li.hide();
+
+ // Determine where in the parents children list to insert this comment.
+ for(i=0; i < siblings.length; i++) {
+ if (comp(comment, siblings[i]) <= 0) {
+ $('#cd' + siblings[i].id)
+ .parent()
+ .before(li.html(div));
+ li.slideDown('fast');
+ return;
+ }
+ }
+
+ // If we get here, this comment rates lower than all the others,
+ // or it is the only comment in the list.
+ ul.append(li.html(div));
+ li.slideDown('fast');
+ }
+
+ function acceptComment(id) {
+ $.ajax({
+ type: 'POST',
+ url: opts.acceptCommentURL,
+ data: {id: id},
+ success: function(data, textStatus, request) {
+ $('#cm' + id).fadeOut('fast');
+ $('#cd' + id).removeClass('moderate');
+ },
+ error: function(request, textStatus, error) {
+ showError('Oops, there was a problem accepting the comment.');
+ }
+ });
+ }
+
+ function deleteComment(id) {
+ $.ajax({
+ type: 'POST',
+ url: opts.deleteCommentURL,
+ data: {id: id},
+ success: function(data, textStatus, request) {
+ var div = $('#cd' + id);
+ if (data == 'delete') {
+ // Moderator mode: remove the comment and all children immediately
+ div.slideUp('fast', function() {
+ div.remove();
+ });
+ return;
+ }
+ // User mode: only mark the comment as deleted
+ div
+ .find('span.user-id:first')
+ .text('[deleted]').end()
+ .find('div.comment-text:first')
+ .text('[deleted]').end()
+ .find('#cm' + id + ', #dc' + id + ', #ac' + id + ', #rc' + id +
+ ', #sp' + id + ', #hp' + id + ', #cr' + id + ', #rl' + id)
+ .remove();
+ var comment = div.data('comment');
+ comment.username = '[deleted]';
+ comment.text = '[deleted]';
+ div.data('comment', comment);
+ },
+ error: function(request, textStatus, error) {
+ showError('Oops, there was a problem deleting the comment.');
+ }
+ });
+ }
+
+ function showProposal(id) {
+ $('#sp' + id).hide();
+ $('#hp' + id).show();
+ $('#pr' + id).slideDown('fast');
+ }
+
+ function hideProposal(id) {
+ $('#hp' + id).hide();
+ $('#sp' + id).show();
+ $('#pr' + id).slideUp('fast');
+ }
+
+ function showProposeChange(id) {
+ $('#pc' + id).hide();
+ $('#hc' + id).show();
+ var textarea = $('#pt' + id);
+ textarea.val(textarea.data('source'));
+ $.fn.autogrow.resize(textarea[0]);
+ textarea.slideDown('fast');
+ }
+
+ function hideProposeChange(id) {
+ $('#hc' + id).hide();
+ $('#pc' + id).show();
+ var textarea = $('#pt' + id);
+ textarea.val('').removeAttr('disabled');
+ textarea.slideUp('fast');
+ }
+
+ function toggleCommentMarkupBox(id) {
+ $('#mb' + id).toggle();
+ }
+
+ /** Handle when the user clicks on a sort by link. */
+ function handleReSort(link) {
+ var classes = link.attr('class').split(/\s+/);
+ for (var i=0; i<classes.length; i++) {
+ if (classes[i] != 'sort-option') {
+ by = classes[i].substring(2);
+ }
+ }
+ setComparator();
+ // Save/update the sortBy cookie.
+ var expiration = new Date();
+ expiration.setDate(expiration.getDate() + 365);
+ document.cookie= 'sortBy=' + escape(by) +
+ ';expires=' + expiration.toUTCString();
+ $('ul.comment-ul').each(function(index, ul) {
+ var comments = getChildren($(ul), true);
+ comments = sortComments(comments);
+ appendComments(comments, $(ul).empty());
+ });
+ }
+
+ /**
+ * Function to process a vote when a user clicks an arrow.
+ */
+ function handleVote(link) {
+ if (!opts.voting) {
+ showError("You'll need to login to vote.");
+ return;
+ }
+
+ var id = link.attr('id');
+ if (!id) {
+ // Didn't click on one of the voting arrows.
+ return;
+ }
+ // If it is an unvote, the new vote value is 0,
+ // Otherwise it's 1 for an upvote, or -1 for a downvote.
+ var value = 0;
+ if (id.charAt(1) != 'u') {
+ value = id.charAt(0) == 'u' ? 1 : -1;
+ }
+ // The data to be sent to the server.
+ var d = {
+ comment_id: id.substring(2),
+ value: value
+ };
+
+ // Swap the vote and unvote links.
+ link.hide();
+ $('#' + id.charAt(0) + (id.charAt(1) == 'u' ? 'v' : 'u') + d.comment_id)
+ .show();
+
+ // The div the comment is displayed in.
+ var div = $('div#cd' + d.comment_id);
+ var data = div.data('comment');
+
+ // If this is not an unvote, and the other vote arrow has
+ // already been pressed, unpress it.
+ if ((d.value !== 0) && (data.vote === d.value * -1)) {
+ $('#' + (d.value == 1 ? 'd' : 'u') + 'u' + d.comment_id).hide();
+ $('#' + (d.value == 1 ? 'd' : 'u') + 'v' + d.comment_id).show();
+ }
+
+ // Update the comments rating in the local data.
+ data.rating += (data.vote === 0) ? d.value : (d.value - data.vote);
+ data.vote = d.value;
+ div.data('comment', data);
+
+ // Change the rating text.
+ div.find('.rating:first')
+ .text(data.rating + ' point' + (data.rating == 1 ? '' : 's'));
+
+ // Send the vote information to the server.
+ $.ajax({
+ type: "POST",
+ url: opts.processVoteURL,
+ data: d,
+ error: function(request, textStatus, error) {
+ showError('Oops, there was a problem casting that vote.');
+ }
+ });
+ }
+
+ /**
+ * Open a reply form used to reply to an existing comment.
+ */
+ function openReply(id) {
+ // Swap out the reply link for the hide link
+ $('#rl' + id).hide();
+ $('#cr' + id).show();
+
+ // Add the reply li to the children ul.
+ var div = $(renderTemplate(replyTemplate, {id: id})).hide();
+ $('#cl' + id)
+ .prepend(div)
+ // Setup the submit handler for the reply form.
+ .find('#rf' + id)
+ .submit(function(event) {
+ event.preventDefault();
+ addComment($('#rf' + id));
+ closeReply(id);
+ })
+ .find('input[type=button]')
+ .click(function() {
+ closeReply(id);
+ });
+ div.slideDown('fast', function() {
+ $('#rf' + id).find('textarea').focus();
+ });
+ }
+
+ /**
+ * Close the reply form opened with openReply.
+ */
+ function closeReply(id) {
+ // Remove the reply div from the DOM.
+ $('#rd' + id).slideUp('fast', function() {
+ $(this).remove();
+ });
+
+ // Swap out the hide link for the reply link
+ $('#cr' + id).hide();
+ $('#rl' + id).show();
+ }
+
+ /**
+ * Recursively sort a tree of comments using the comp comparator.
+ */
+ function sortComments(comments) {
+ comments.sort(comp);
+ $.each(comments, function() {
+ this.children = sortComments(this.children);
+ });
+ return comments;
+ }
+
+ /**
+ * Get the children comments from a ul. If recursive is true,
+ * recursively include childrens' children.
+ */
+ function getChildren(ul, recursive) {
+ var children = [];
+ ul.children().children("[id^='cd']")
+ .each(function() {
+ var comment = $(this).data('comment');
+ if (recursive)
+ comment.children = getChildren($(this).find('#cl' + comment.id), true);
+ children.push(comment);
+ });
+ return children;
+ }
+
+ /** Create a div to display a comment in. */
+ function createCommentDiv(comment) {
+ if (!comment.displayed && !opts.moderator) {
+ return $('<div class="moderate">Thank you! Your comment will show up '
+ + 'once it is has been approved by a moderator.</div>');
+ }
+ // Prettify the comment rating.
+ comment.pretty_rating = comment.rating + ' point' +
+ (comment.rating == 1 ? '' : 's');
+ // Make a class (for displaying not yet moderated comments differently)
+ comment.css_class = comment.displayed ? '' : ' moderate';
+ // Create a div for this comment.
+ var context = $.extend({}, opts, comment);
+ var div = $(renderTemplate(commentTemplate, context));
+
+ // If the user has voted on this comment, highlight the correct arrow.
+ if (comment.vote) {
+ var direction = (comment.vote == 1) ? 'u' : 'd';
+ div.find('#' + direction + 'v' + comment.id).hide();
+ div.find('#' + direction + 'u' + comment.id).show();
+ }
+
+ if (opts.moderator || comment.text != '[deleted]') {
+ div.find('a.reply').show();
+ if (comment.proposal_diff)
+ div.find('#sp' + comment.id).show();
+ if (opts.moderator && !comment.displayed)
+ div.find('#cm' + comment.id).show();
+ if (opts.moderator || (opts.username == comment.username))
+ div.find('#dc' + comment.id).show();
+ }
+ return div;
+ }
+
+ /**
+ * A simple template renderer. Placeholders such as <%id%> are replaced
+ * by context['id'] with items being escaped. Placeholders such as <#id#>
+ * are not escaped.
+ */
+ function renderTemplate(template, context) {
+ var esc = $(document.createElement('div'));
+
+ function handle(ph, escape) {
+ var cur = context;
+ $.each(ph.split('.'), function() {
+ cur = cur[this];
+ });
+ return escape ? esc.text(cur || "").html() : cur;
+ }
+
+ return template.replace(/<([%#])([\w\.]*)\1>/g, function() {
+ return handle(arguments[2], arguments[1] == '%' ? true : false);
+ });
+ }
+
+ /** Flash an error message briefly. */
+ function showError(message) {
+ $(document.createElement('div')).attr({'class': 'popup-error'})
+ .append($(document.createElement('div'))
+ .attr({'class': 'error-message'}).text(message))
+ .appendTo('body')
+ .fadeIn("slow")
+ .delay(2000)
+ .fadeOut("slow");
+ }
+
+ /** Add a link the user uses to open the comments popup. */
+ $.fn.comment = function() {
+ return this.each(function() {
+ var id = $(this).attr('id').substring(1);
+ var count = COMMENT_METADATA[id];
+ var title = count + ' comment' + (count == 1 ? '' : 's');
+ var image = count > 0 ? opts.commentBrightImage : opts.commentImage;
+ var addcls = count == 0 ? ' nocomment' : '';
+ $(this)
+ .append(
+ $(document.createElement('a')).attr({
+ href: '#',
+ 'class': 'sphinx-comment-open' + addcls,
+ id: 'ao' + id
+ })
+ .append($(document.createElement('img')).attr({
+ src: image,
+ alt: 'comment',
+ title: title
+ }))
+ .click(function(event) {
+ event.preventDefault();
+ show($(this).attr('id').substring(2));
+ })
+ )
+ .append(
+ $(document.createElement('a')).attr({
+ href: '#',
+ 'class': 'sphinx-comment-close hidden',
+ id: 'ah' + id
+ })
+ .append($(document.createElement('img')).attr({
+ src: opts.closeCommentImage,
+ alt: 'close',
+ title: 'close'
+ }))
+ .click(function(event) {
+ event.preventDefault();
+ hide($(this).attr('id').substring(2));
+ })
+ );
+ });
+ };
+
+ var opts = {
+ processVoteURL: '/_process_vote',
+ addCommentURL: '/_add_comment',
+ getCommentsURL: '/_get_comments',
+ acceptCommentURL: '/_accept_comment',
+ deleteCommentURL: '/_delete_comment',
+ commentImage: '/static/_static/comment.png',
+ closeCommentImage: '/static/_static/comment-close.png',
+ loadingImage: '/static/_static/ajax-loader.gif',
+ commentBrightImage: '/static/_static/comment-bright.png',
+ upArrow: '/static/_static/up.png',
+ downArrow: '/static/_static/down.png',
+ upArrowPressed: '/static/_static/up-pressed.png',
+ downArrowPressed: '/static/_static/down-pressed.png',
+ voting: false,
+ moderator: false
+ };
+
+ if (typeof COMMENT_OPTIONS != "undefined") {
+ opts = jQuery.extend(opts, COMMENT_OPTIONS);
+ }
+
+ var popupTemplate = '\
+ <div class="sphinx-comments" id="sc<%id%>">\
+ <p class="sort-options">\
+ Sort by:\
+ <a href="#" class="sort-option byrating">best rated</a>\
+ <a href="#" class="sort-option byascage">newest</a>\
+ <a href="#" class="sort-option byage">oldest</a>\
+ </p>\
+ <div class="comment-header">Comments</div>\
+ <div class="comment-loading" id="cn<%id%>">\
+ loading comments... <img src="<%loadingImage%>" alt="" /></div>\
+ <ul id="cl<%id%>" class="comment-ul"></ul>\
+ <div id="ca<%id%>">\
+ <p class="add-a-comment">Add a comment\
+ (<a href="#" class="comment-markup" id="ab<%id%>">markup</a>):</p>\
+ <div class="comment-markup-box" id="mb<%id%>">\
+ reStructured text markup: <i>*emph*</i>, <b>**strong**</b>, \
+ <code>``code``</code>, \
+ code blocks: <code>::</code> and an indented block after blank line</div>\
+ <form method="post" id="cf<%id%>" class="comment-form" action="">\
+ <textarea name="comment" cols="80"></textarea>\
+ <p class="propose-button">\
+ <a href="#" id="pc<%id%>" class="show-propose-change">\
+ Propose a change ▹\
+ </a>\
+ <a href="#" id="hc<%id%>" class="hide-propose-change">\
+ Propose a change ▿\
+ </a>\
+ </p>\
+ <textarea name="proposal" id="pt<%id%>" cols="80"\
+ spellcheck="false"></textarea>\
+ <input type="submit" value="Add comment" />\
+ <input type="hidden" name="node" value="<%id%>" />\
+ <input type="hidden" name="parent" value="" />\
+ </form>\
+ </div>\
+ </div>';
+
+ var commentTemplate = '\
+ <div id="cd<%id%>" class="sphinx-comment<%css_class%>">\
+ <div class="vote">\
+ <div class="arrow">\
+ <a href="#" id="uv<%id%>" class="vote" title="vote up">\
+ <img src="<%upArrow%>" />\
+ </a>\
+ <a href="#" id="uu<%id%>" class="un vote" title="vote up">\
+ <img src="<%upArrowPressed%>" />\
+ </a>\
+ </div>\
+ <div class="arrow">\
+ <a href="#" id="dv<%id%>" class="vote" title="vote down">\
+ <img src="<%downArrow%>" id="da<%id%>" />\
+ </a>\
+ <a href="#" id="du<%id%>" class="un vote" title="vote down">\
+ <img src="<%downArrowPressed%>" />\
+ </a>\
+ </div>\
+ </div>\
+ <div class="comment-content">\
+ <p class="tagline comment">\
+ <span class="user-id"><%username%></span>\
+ <span class="rating"><%pretty_rating%></span>\
+ <span class="delta"><%time.delta%></span>\
+ </p>\
+ <div class="comment-text comment"><#text#></div>\
+ <p class="comment-opts comment">\
+ <a href="#" class="reply hidden" id="rl<%id%>">reply ▹</a>\
+ <a href="#" class="close-reply" id="cr<%id%>">reply ▿</a>\
+ <a href="#" id="sp<%id%>" class="show-proposal">proposal ▹</a>\
+ <a href="#" id="hp<%id%>" class="hide-proposal">proposal ▿</a>\
+ <a href="#" id="dc<%id%>" class="delete-comment hidden">delete</a>\
+ <span id="cm<%id%>" class="moderation hidden">\
+ <a href="#" id="ac<%id%>" class="accept-comment">accept</a>\
+ </span>\
+ </p>\
+ <pre class="proposal" id="pr<%id%>">\
+<#proposal_diff#>\
+ </pre>\
+ <ul class="comment-children" id="cl<%id%>"></ul>\
+ </div>\
+ <div class="clearleft"></div>\
+ </div>\
+ </div>';
+
+ var replyTemplate = '\
+ <li>\
+ <div class="reply-div" id="rd<%id%>">\
+ <form id="rf<%id%>">\
+ <textarea name="comment" cols="80"></textarea>\
+ <input type="submit" value="Add reply" />\
+ <input type="button" value="Cancel" />\
+ <input type="hidden" name="parent" value="<%id%>" />\
+ <input type="hidden" name="node" value="" />\
+ </form>\
+ </div>\
+ </li>';
+
+ $(document).ready(function() {
+ init();
+ });
+})(jQuery);
+
+$(document).ready(function() {
+ // add comment anchors for all paragraphs that are commentable
+ $('.sphinx-has-comment').comment();
+
+ // highlight search words in search results
+ $("div.context").each(function() {
+ var params = $.getQueryParameters();
+ var terms = (params.q) ? params.q[0].split(/\s+/) : [];
+ var result = $(this);
+ $.each(terms, function() {
+ result.highlightText(this.toLowerCase(), 'highlighted');
+ });
+ });
+
+ // directly open comment window if requested
+ var anchor = document.location.hash;
+ if (anchor.substring(0, 9) == '#comment-') {
+ $('#ao' + anchor.substring(9)).click();
+ document.location.hash = '#s' + anchor.substring(9);
+ }
+});
diff --git a/doc/html/objects.inv b/doc/html/objects.inv
new file mode 100644
index 0000000..be6345c
Binary files /dev/null and b/doc/html/objects.inv differ
diff --git a/doc/html/searchindex.js b/doc/html/searchindex.js
new file mode 100644
index 0000000..0f01c5c
--- /dev/null
+++ b/doc/html/searchindex.js
@@ -0,0 +1 @@
+Search.setIndex({envversion:46,filenames:["blas","c-api","coneprog","copyright","fftw","index","intro","lapack","matrices","modeling","printing","solvers","spsolvers"],objects:{"":{CCS:[8,3,1,""],I:[8,3,1,""],J:[8,3,1,""],Matrix_New:[1,0,1,"c.Matrix_New"],Matrix_NewFromMatrix:[1,0,1,"c.Matrix_NewFromMatrix"],Matrix_NewFromSequence:[1,0,1,"c.Matrix_NewFromSequence"],SpMatrix_New:[1,0,1,"c.SpMatrix_New"],SpMatrix_NewFromIJV:[1,0,1,"c.SpMatrix_NewFromIJV"],SpMatrix_NewFromMatrix:[1,0,1,"c.S [...]
\ No newline at end of file
diff --git a/doc/source/.themes/sphinx_rtd_theme/LICENSE b/doc/source/.themes/sphinx_rtd_theme/LICENSE
new file mode 100644
index 0000000..921f073
--- /dev/null
+++ b/doc/source/.themes/sphinx_rtd_theme/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Dave Snider
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/doc/source/.themes/sphinx_rtd_theme/__init__.py b/doc/source/.themes/sphinx_rtd_theme/__init__.py
new file mode 100644
index 0000000..1440863
--- /dev/null
+++ b/doc/source/.themes/sphinx_rtd_theme/__init__.py
@@ -0,0 +1,17 @@
+"""Sphinx ReadTheDocs theme.
+
+From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
+
+"""
+import os
+
+VERSION = (0, 1, 5)
+
+__version__ = ".".join(str(v) for v in VERSION)
+__version_full__ = __version__
+
+
+def get_html_theme_path():
+ """Return list of HTML theme paths."""
+ cur_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+ return cur_dir
diff --git a/doc/source/.themes/sphinx_rtd_theme/static/css/badge_only.css b/doc/source/.themes/sphinx_rtd_theme/static/css/badge_only.css
new file mode 100644
index 0000000..4868a00
--- /dev/null
+++ b/doc/source/.themes/sphinx_rtd_theme/static/css/badge_only.css
@@ -0,0 +1 @@
+.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg# [...]
diff --git a/doc/source/.themes/sphinx_rtd_theme/static/css/theme.css b/doc/source/.themes/sphinx_rtd_theme/static/css/theme.css
new file mode 100644
index 0000000..8123d3a
--- /dev/null
+++ b/doc/source/.themes/sphinx_rtd_theme/static/css/theme.css
@@ -0,0 +1,4 @@
+*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[ [...]
+ * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
+ * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.0.3");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff?v=4.0.3") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.0.3") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa,.rst-content .admonition-title,.rst-content h1 .headerlink,. [...]
diff --git a/doc/source/.themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf b/doc/source/.themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
new file mode 100644
index 0000000..8b0f54e
Binary files /dev/null and b/doc/source/.themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf differ
diff --git a/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot b/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
new file mode 100644
index 0000000..7c79c6a
Binary files /dev/null and b/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot differ
diff --git a/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg b/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
new file mode 100644
index 0000000..45fdf33
--- /dev/null
+++ b/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
@@ -0,0 +1,414 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="fontawesomeregular" horiz-adv-x="1536" >
+<font-face units-per-em="1792" ascent="1536" descent="-256" />
+<missing-glyph horiz-adv-x="448" />
+<glyph unicode=" " horiz-adv-x="448" />
+<glyph unicode="	" horiz-adv-x="448" />
+<glyph unicode=" " horiz-adv-x="448" />
+<glyph unicode="¨" horiz-adv-x="1792" />
+<glyph unicode="©" horiz-adv-x="1792" />
+<glyph unicode="®" horiz-adv-x="1792" />
+<glyph unicode="´" horiz-adv-x="1792" />
+<glyph unicode="Æ" horiz-adv-x="1792" />
+<glyph unicode=" " horiz-adv-x="768" />
+<glyph unicode=" " />
+<glyph unicode=" " horiz-adv-x="768" />
+<glyph unicode=" " />
+<glyph unicode=" " horiz-adv-x="512" />
+<glyph unicode=" " horiz-adv-x="384" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode=" " horiz-adv-x="192" />
+<glyph unicode=" " horiz-adv-x="307" />
+<glyph unicode=" " horiz-adv-x="85" />
+<glyph unicode=" " horiz-adv-x="307" />
+<glyph unicode=" " horiz-adv-x="384" />
+<glyph unicode="™" horiz-adv-x="1792" />
+<glyph unicode="∞" horiz-adv-x="1792" />
+<glyph unicode="≠" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+<glyph unicode="" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 [...]
+<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t [...]
+<glyph unicode="" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
+<glyph unicode="" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t2 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q4 [...]
+<glyph unicode="" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
+<glyph unicode="" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+<glyph unicode="" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 2 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 [...]
+<glyph unicode="" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -1 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 [...]
+<glyph unicode="" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+<glyph unicode="" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+<glyph unicode="" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+<glyph unicode="" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l7 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 - [...]
+<glyph unicode="" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q- [...]
+<glyph unicode="" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 [...]
+<glyph unicode="" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -7 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q- [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
+<glyph unicode="" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+<glyph unicode="" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+<glyph unicode="" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 12 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
+<glyph unicode="" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+<glyph unicode="" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
+<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
+<glyph unicode="" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 - [...]
+<glyph unicode="" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-38 [...]
+<glyph unicode="" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h [...]
+<glyph unicode="" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385. [...]
+<glyph unicode="" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+<glyph unicode="" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
+<glyph unicode="" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+<glyph unicode="" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+<glyph unicode="" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 3 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150. [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+<glyph unicode="" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h28 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -1 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+<glyph unicode="" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t [...]
+<glyph unicode="" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 [...]
+<glyph unicode="" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 4 [...]
+<glyph unicode="" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h [...]
+<glyph unicode="" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -6 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t4 [...]
+<glyph unicode="" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q2 [...]
+<glyph unicode="" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -2 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 4 [...]
+<glyph unicode="" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 [...]
+<glyph unicode="" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t- [...]
+<glyph unicode="" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216. [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+<glyph unicode="" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
+<glyph unicode="" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 - [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5 [...]
+<glyph unicode="" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q- [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117 [...]
+<glyph unicode="" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-1 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32z [...]
+<glyph unicode="" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 - [...]
+<glyph unicode="" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -4 [...]
+<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+<glyph unicode="" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -7 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3. [...]
+<glyph unicode="" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
+<glyph unicode="" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+<glyph unicode="" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 [...]
+<glyph unicode="" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 [...]
+<glyph unicode="" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22. [...]
+<glyph unicode="" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t- [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -3 [...]
+<glyph unicode="" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -1 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -2 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 [...]
+<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11 [...]
+<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 - [...]
+<glyph unicode="" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -1 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t11 [...]
+<glyph unicode="" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q [...]
+<glyph unicode="" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h [...]
+<glyph unicode="" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 2 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+<glyph unicode="" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 - [...]
+<glyph unicode="" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
+<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t1 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 15 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
+<glyph unicode="" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+<glyph unicode="" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+<glyph unicode="" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+<glyph unicode="" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 [...]
+<glyph unicode="" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 [...]
+<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+<glyph unicode="" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM16 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 [...]
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-2 [...]
+<glyph unicode="" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248 [...]
+<glyph unicode="" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136. [...]
+<glyph unicode="" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -1 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16z [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -9 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q [...]
+<glyph unicode="" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
+<glyph unicode="" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 - [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 13 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 [...]
+<glyph unicode="" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t- [...]
+<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t- [...]
+<glyph unicode="" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t [...]
+<glyph unicode="" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+<glyph unicode="" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-2 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+<glyph unicode="" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+<glyph unicode="" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+<glyph unicode="" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 [...]
+<glyph unicode="" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
+<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 2 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+<glyph unicode="" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23z [...]
+<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+<glyph unicode="" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+<glyph unicode="" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 [...]
+<glyph unicode="" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+<glyph unicode="" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-1 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l- [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 [...]
+<glyph unicode="" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 [...]
+<glyph unicode="" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -4 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 [...]
+<glyph unicode="" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86 [...]
+<glyph unicode="" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 [...]
+<glyph unicode="" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
+<glyph unicode="" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
+<glyph unicode="" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+<glyph unicode="" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
+<glyph unicode="" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-11 [...]
+<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+<glyph unicode="" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q- [...]
+<glyph unicode="" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 4 [...]
+<glyph unicode="" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
+<glyph unicode="" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+<glyph unicode="" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11 [...]
+<glyph unicode="" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+<glyph unicode="" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 [...]
+<glyph unicode="" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69 [...]
+<glyph unicode="" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q [...]
+<glyph unicode="" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 - [...]
+<glyph unicode="" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l [...]
+<glyph unicode="" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65. [...]
+<glyph unicode="" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 2 [...]
+<glyph unicode="" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 [...]
+<glyph unicode="" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91 [...]
+<glyph unicode="" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 [...]
+<glyph unicode="" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 [...]
+<glyph unicode="" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
+<glyph unicode="" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455 [...]
+<glyph unicode="" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t7 [...]
+<glyph unicode="" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 20 [...]
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf b/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
new file mode 100644
index 0000000..e89738d
Binary files /dev/null and b/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf differ
diff --git a/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff b/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
new file mode 100644
index 0000000..8c1748a
Binary files /dev/null and b/doc/source/.themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff differ
diff --git a/doc/source/.themes/sphinx_rtd_theme/static/js/theme.js b/doc/source/.themes/sphinx_rtd_theme/static/js/theme.js
new file mode 100644
index 0000000..60520cc
--- /dev/null
+++ b/doc/source/.themes/sphinx_rtd_theme/static/js/theme.js
@@ -0,0 +1,47 @@
+$( document ).ready(function() {
+ // Shift nav in mobile when clicking the menu.
+ $(document).on('click', "[data-toggle='wy-nav-top']", function() {
+ $("[data-toggle='wy-nav-shift']").toggleClass("shift");
+ $("[data-toggle='rst-versions']").toggleClass("shift");
+ });
+ // Close menu when you click a link.
+ $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
+ $("[data-toggle='wy-nav-shift']").removeClass("shift");
+ $("[data-toggle='rst-versions']").toggleClass("shift");
+ });
+ $(document).on('click', "[data-toggle='rst-current-version']", function() {
+ $("[data-toggle='rst-versions']").toggleClass("shift-up");
+ });
+ // Make tables responsive
+ $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");
+});
+
+window.SphinxRtdTheme = (function (jquery) {
+ var stickyNav = (function () {
+ var navBar,
+ win,
+ stickyNavCssClass = 'stickynav',
+ applyStickNav = function () {
+ if (navBar.height() <= win.height()) {
+ navBar.addClass(stickyNavCssClass);
+ } else {
+ navBar.removeClass(stickyNavCssClass);
+ }
+ },
+ enable = function () {
+ applyStickNav();
+ win.on('resize', applyStickNav);
+ },
+ init = function () {
+ navBar = jquery('nav.wy-nav-side:first');
+ win = jquery(window);
+ };
+ jquery(init);
+ return {
+ enable : enable
+ };
+ }());
+ return {
+ StickyNav : stickyNav
+ };
+}($));
diff --git a/doc/source/.themes/sphinx_rtd_theme/theme.conf b/doc/source/.themes/sphinx_rtd_theme/theme.conf
new file mode 100644
index 0000000..dcfbf8c
--- /dev/null
+++ b/doc/source/.themes/sphinx_rtd_theme/theme.conf
@@ -0,0 +1,8 @@
+[theme]
+inherit = basic
+stylesheet = css/theme.css
+
+[options]
+typekit_id = hiw1hhg
+analytics_id =
+sticky_navigation = False
diff --git a/doc/source/c-api.rst b/doc/source/c-api.rst
index 3d356ef..b6cccb0 100644
--- a/doc/source/c-api.rst
+++ b/doc/source/c-api.rst
@@ -10,7 +10,7 @@ matrix objects defined in CVXOPT must include the :const:`cvxopt.h` header
file in the :const:`src` directory of the distribution.
Before the C API can be used in an extension module it must be initialized
-by calling the macro :cmacro:`import_cvxopt`. As an example we show the
+by calling the macro :c:macro:`import_cvxopt`. As an example we show the
module initialization from the :mod:`cvxopt.blas` module, which itself uses
the API:
@@ -54,33 +54,33 @@ Dense Matrices
==============
As can be seen from the header file :const:`cvxopt.h`, a :class:`matrix` is
-essentially a structure with four fields. The fields :cmember:`nrows` and
-:cmember:`ncols` are two integers that specify the dimensions. The
-:cmember:`id` field controls the type of the matrix and can have values
-:const:`DOUBLE`, :const:`INT`, and :const:`COMPLEX`. The :cmember:`buffer`
+essentially a structure with four fields. The fields :c:member:`nrows` and
+:c:member:`ncols` are two integers that specify the dimensions. The
+:c:member:`id` field controls the type of the matrix and can have values
+:const:`DOUBLE`, :const:`INT`, and :const:`COMPLEX`. The :c:member:`buffer`
field is an array that contains the matrix elements stored contiguously in
column-major order.
The following C functions can be used to create matrices.
-.. cfunction:: matrix * Matrix_New(int nrows, int ncols, int id)
+.. c:function:: matrix * Matrix_New(int nrows, int ncols, int id)
Returns a :class:`matrix` object of type `id` with `nrows` rows and
`ncols` columns. The elements of the matrix are uninitialized.
-.. cfunction:: matrix * Matrix_NewFromMatrix(matrix *src, int id)
+.. c:function:: matrix * Matrix_NewFromMatrix(matrix *src, int id)
Returns a copy of the matrix `src` converted to type `id`. The
following type conversions are allowed: :const:`'i'` to :const:`'d'`,
:const:`'i'` to :const:`'z'`, and :const:`'d'` to :const:`'z'`.
-.. cfunction:: matrix * Matrix_NewFromSequence(PyListObject *x, int id)
+.. c:function:: matrix * Matrix_NewFromSequence(PyListObject *x, int id)
Creates a matrix of type `id` from the Python sequence type `x`. The
returned matrix has size ``(len(x), 1)``. The size can be changed
- by modifying the :cmember:`nrows` and :cmember:`ncols` fields of the
+ by modifying the :c:member:`nrows` and :c:member:`ncols` fields of the
returned matrix.
@@ -123,17 +123,17 @@ a general `nrows` by `ncols` sparse matrix with `nnz` nonzero entries this
means the following. The sparsity pattern and the nonzero values are
stored in three fields:
-:cmember:`values`
+:c:member:`values`
A :const:`'d'` or :const:`'z'` matrix of size ``(nnz,1)`` with the
nonzero entries of the matrix stored columnwise.
-:cmember:`rowind`
+:c:member:`rowind`
An array of integers of length `nnz` containing the row indices of
- the nonzero entries, stored in the same order as :cmember:`values`.
+ the nonzero entries, stored in the same order as :c:member:`values`.
-:cmember:`colptr`
+:c:member:`colptr`
An array of integers of length `ncols` + 1 with for each column of the
- matrix the index of the first element in :cmember:`values` from that
+ matrix the index of the first element in :c:member:`values` from that
column. More precisely, ``colptr[0]`` is :const:`0`, and for
k = 0, 1, ..., `ncols` - 1, ``colptr[k+1]`` is equal to
``colptr[k]`` plus the number of nonzeros in column `k` of the
@@ -152,59 +152,59 @@ For example, for the matrix
3 & 0 & 0 & 0
\end{array}\right]
-the elements of :cmember:`values`, :cmember:`rowind`, and :cmember:`colptr`
+the elements of :c:member:`values`, :c:member:`rowind`, and :c:member:`colptr`
are:
-:cmember:`values`:
+:c:member:`values`:
1.0, 2.0, 3.0, 4.0, 5.0, 6.0
-:cmember:`rowind`:
+:c:member:`rowind`:
0, 1,3, 1, 0, 2
-:cmember:`colptr`:
+:c:member:`colptr`:
0, 3, 3, 4, 6.
-It is crucial that for each column the row indices in :cmember:`rowind` are
+It is crucial that for each column the row indices in :c:member:`rowind` are
sorted; the equivalent representation
-:cmember:`values`:
+:c:member:`values`:
3.0, 2.0, 1.0, 4.0, 5.0, 6.0
-:cmember:`rowind`:
+:c:member:`rowind`:
3, 1, 0, 1, 0, 2
-:cmember:`colptr`:
+:c:member:`colptr`:
0, 3, 3, 4, 6
is not allowed (and will likely cause the program to crash).
-The :cmember:`nzmax` field specifies the number of non-zero elements the
-matrix can store. It is equal to the length of :cmember:`rowind` and
-:cmember:`values`; this number can be larger that ``colptr[nrows]``,
+The :c:member:`nzmax` field specifies the number of non-zero elements the
+matrix can store. It is equal to the length of :c:member:`rowind` and
+:c:member:`values`; this number can be larger that ``colptr[nrows]``,
but never less. This field makes it possible to preallocate a certain
amount of memory to avoid reallocations if the matrix is constructed
-sequentially by filling in elements. In general the :cmember:`nzmax` field
+sequentially by filling in elements. In general the :c:member:`nzmax` field
can safely be ignored, however, since it will always be adjusted
automatically as the number of non-zero elements grows.
-The :cmember:`id` field controls the type of the matrix and can have
+The :c:member:`id` field controls the type of the matrix and can have
values :const:`DOUBLE` and :const:`COMPLEX`.
Sparse matrices are created using the following functions from the API.
-.. cfunction:: spmatrix * SpMatrix_New(int nrows, int ncols, int nzmax, int id)
+.. c:function:: spmatrix * SpMatrix_New(int nrows, int ncols, int nzmax, int id)
Returns a sparse zero matrix with `nrows` rows and `ncols` columns.
`nzmax` is the number of elements that will be allocated (the length of
- the :cmember:`values` and :cmember:`rowind` fields).
+ the :c:member:`values` and :c:member:`rowind` fields).
-.. cfunction:: spmatrix * SpMatrix_NewFromMatrix(spmatrix *src, int id)
+.. c:function:: spmatrix * SpMatrix_NewFromMatrix(spmatrix *src, int id)
Returns a copy the sparse matrix \var{src}.
-.. cfunction:: spmatrix * SpMatrix_NewFromIJV(matrix *I, matrix *J, matrix *V, int nrows, int ncols, int nzmax, int id)
+.. c:function:: spmatrix * SpMatrix_NewFromIJV(matrix *I, matrix *J, matrix *V, int nrows, int ncols, int nzmax, int id)
Creates a sparse matrix with `nrows` rows and `ncols` columns from a
triplet description. `I` and `J` must be integer matrices and `V`
diff --git a/doc/source/coneprog.rst b/doc/source/coneprog.rst
index 5fa29c9..9b32866 100644
--- a/doc/source/coneprog.rst
+++ b/doc/source/coneprog.rst
@@ -827,7 +827,7 @@ Second-Order Cone Programming
=============================
The function :func:`socp <cvxopt.solvers.socp>` is a simpler interface to
-:func:`conelp <cvxopt.solvers.coneqp>` for
+:func:`conelp <cvxopt.solvers.conelp>` for
cone programs with no linear matrix inequality constraints.
.. function:: cvxopt.solvers.socp(c[, Gl, hl[, Gq, hq[, A, b[, solver[, primalstart[, dualstart]]]]]])
@@ -1116,7 +1116,7 @@ We illustrate the calling sequence with a small example.
\end{array}\right] +
x_3 \left[ \begin{array}{ccc}
-5 & 2 & -17 \\
- 2 & -6 & -7 \\
+ 2 & -6 & 8 \\
-17 & 8 & 6
\end{array}\right] \preceq
\left[ \begin{array}{ccc}
@@ -1133,7 +1133,7 @@ We illustrate the calling sequence with a small example.
[-2., -8., -8., 1.]]) ]
>>> G += [ matrix([[-21., -11., 0., -11., 10., 8., 0., 8., 5.],
[ 0., 10., 16., 10., -10., -10., 16., -10., 3.],
- [ -5., 2., -17., 2., -6., 8., -17., -7., 6.]]) ]
+ [ -5., 2., -17., 2., -6., 8., -17., 8., 6.]]) ]
>>> h = [ matrix([[33., -9.], [-9., 26.]]) ]
>>> h += [ matrix([[14., 9., 40.], [9., 91., 10.], [40., 10., 15.]]) ]
>>> sol = solvers.sdp(c, Gs=G, hs=h)
@@ -2111,7 +2111,7 @@ default values and can be customized by making an entry in
name of the GLPK parameter. For example, the command
>>> from cvxopt import solvers
->>> solvers.options['LPX_K_MSGLEV'] = 0
+>>> solvers.options['msg_lev'] = 'GLP_MSG_OFF'
turns off the screen output subsequent calls
:func:`lp <cvxopt.solvers.lp>` with the :const:`'glpk'` option.
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9aa5334..97d6441 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -35,16 +35,16 @@ source_suffix = '.rst'
master_doc = 'index'
# General substitutions.
-project = 'CVXOPT'
+project = "CVXOPT User's Guide"
#copyright = '2004-2009, Joachim Dahl, Lieven Vandenberghe'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.1.1'
+version = '1.1.8'
# The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.1.8'
# There are two options for replacing |today|: either, you set today to some
@@ -84,7 +84,9 @@ pygments_style = 'sphinx'
# The style sheet to use for HTML and HTML Help pages. A file of that name
# must exist either in Sphinx' static/ path, or in one of the custom paths
# given in html_static_path.
-html_style = 'cvxopt.css'
+#html_style = 'cvxopt.css'
+html_theme = "sphinx_rtd_theme"
+html_theme_path = [".themes", ]
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
@@ -161,7 +163,7 @@ htmlhelp_basename = 'CVXOPTdoc'
# (source start file, target name, title, author, document class [howto/manual]).
latex_documents = [
('index', 'CVXOPT.tex', 'CVXOPT Documentation',
- 'Joachim Dahl, Lieven Vandenberghe', 'manual'),
+ 'Martin S. Andersen, Joachim Dahl, and Lieven Vandenberghe', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
diff --git a/doc/source/copyright.rst b/doc/source/copyright.rst
index 4635d4a..1343677 100644
--- a/doc/source/copyright.rst
+++ b/doc/source/copyright.rst
@@ -5,9 +5,10 @@
Copyright and License
*********************
-|
+| :raw-html:`©` 2012-2015 M. Andersen and L. Vandenberghe.
| :raw-html:`©` 2010-2011 L. Vandenberghe.
| :raw-html:`©` 2004-2009 J. Dahl and L. Vandenberghe.
+|
CVXOPT is free software; you can redistribute it and/or modify it under
the terms of the
@@ -22,33 +23,30 @@ See the
`GNU General Public License <http://www.gnu.org/licenses/gpl-3.0.html>`_
for more details.
+----
-.. raw:: html
-
- <hr>
The CVXOPT distribution includes the source code of part of the
-`SuiteSparse <http://www.cise.ufl.edu/research/sparse>`_
+`SuiteSparse <http://www.suitesparse.com>`_
collection of sparse matrix algorithms. The copyright and license
information for the included libraries is as follows.
-* **AMD** Version 2.2. Copyright (c) 2007 by Timothy A. Davis,
+* **AMD** Version 2.4.1. Copyright (c) 2009-2014 by Timothy A. Davis,
Patrick R. Amestoy, and Iain S. Duff.
-* **CHOLMOD** Version 1.7.1. Copyright (c) 2005-2009 by the
+* **CHOLMOD** Version 3.0.6. Copyright (c) 2005-2015 by the
University of Florida, Timothy A. Davis, and W. Hager.
-* **COLAMD** Version 2.7. Copyright (c) 1998-2007 by Timothy A. Davis.
+* **COLAMD** Version 2.9.1. Copyright (c) 1998-2014 by Timothy A. Davis.
-* **UMFPACK** Version 5.4.0. Copyright (c) 1994-2009 by Timothy A. Davis.
+* **UMFPACK** Version 5.7.1. Copyright (c) 1995-2014 by Timothy A. Davis.
-UMFPACK and the Supernodal module of CHOLMOD are licensed under the terms
-of the `GNU General Public License, version 2
+UMFPACK and the Supernodal and MatrixOps modules of CHOLMOD are licensed
+under the terms of the `GNU General Public License, version 2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>`_ or higher.
The other CHOLMOD modules, AMD, and COLAMD are licensed under the terms of
the `GNU Lesser General Public License, version 2.1
<http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html>`_ or higher.
For more details, consult the README files in the source directories or
-the documentation at
-`www.cise.ufl.edu/research/sparse <http://www.cise.ufl.edu/research/sparse>`_.
+the documentation at `SuiteSparse <http://www.suitesparse.com>`_.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index c14d140..a2922bc 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,10 +1,12 @@
-######
-CVXOPT
-######
+.. title:: Table of Contents
-**Release 1.1.4 -- December 21, 2011**
+####################
+CVXOPT User's Guide
+####################
-**Joachim Dahl & Lieven Vandenberghe**
+**Release 1.1.8 -- September 22, 2015**
+
+**Martin Andersen, Joachim Dahl, and Lieven Vandenberghe**
.. toctree::
@@ -20,4 +22,4 @@ CVXOPT
modeling.rst
c-api.rst
printing.rst
-
+ cvxopt.org <http://cvxopt.org>
diff --git a/doc/source/matrices.rst b/doc/source/matrices.rst
index dc2c96f..2efe24c 100644
--- a/doc/source/matrices.rst
+++ b/doc/source/matrices.rst
@@ -106,7 +106,7 @@ type (integer, double, or complex) of the matrix.
[ 3.00e+00-j0.00e+00 6.00e+00-j0.00e+00]
- In Python 2.7 NumPy arrays can be converted to matrices.
+ NumPy arrays can be converted to matrices.
>>> from numpy import array
>>> x = array([[1., 2., 3.], [4., 5., 6.]])
@@ -903,7 +903,7 @@ result of an elementwise comparison.
[ 5.00e-01 1.50e+00 3.00e-01]
[-1.00e-01 2.00e-01 1.00e+00]
[ 2.00e+00 -1.00e-01 0.00e+00]
->>> print(matrix(list(map(lambda x: 0 <= x <= 1, A), A.size)))
+>>> print(matrix(list(map(lambda x: 0 <= x <= 1, A)), A.size))
[ 1 0 1]
[ 0 1 1]
[ 0 0 1]
@@ -1052,6 +1052,7 @@ The following functions can be imported from CVXOPT.
(list, tuple, range object, or generator) as its single argument,
if the iterable generates a list of dense or sparse matrices or
scalars.
+
>>> from cvxopt import matrix, spmatrix, max
>>> A = spmatrix([2, -3], [0, 1], [0, 1])
>>> print(max(A, -A, 1))
@@ -1141,52 +1142,3 @@ functions based on the :mod:`random` module.
:mod:`random` module can be managed via the functions
:func:`random.getstate` and :func:`random.setstate`.)
-
-.. _s-array-interface:
-
-The NumPy Array Interface
-=========================
-
-This section only applies to the Python 2 version of CVXOPT.
-
-The CVXOPT :class:`matrix` object is compatible with the NumPy Array
-Interface, which allows Python objects that represent multidimensional
-arrays to exchange data using information stored in the attribute
-:attr:`__array_struct__`.
-
-As already mentioned in the section :ref:`s-dense-matrices`, a
-two-dimensional array
-object (for example, a NumPy matrix or two-dimensional array) can be
-converted to a CVXOPT :class:`matrix` object by using
-the :func:`matrix <cvxopt.matrix>` constructor.
-Conversely, CVXOPT matrices can be used as array-like
-objects in NumPy. The following example illustrates the compatibility of
-CVXOPT matrices and NumPy arrays.
-
->>> from cvxopt import matrix
->>> a = matrix(range(6), (2,3), 'd')
->>> print(a)
-[ 0.00e+00 2.00e+00 4.00e+00]
-[ 1.00e+00 3.00e+00 5.00e+00]
->>> from numpy import array
->>> b = array(a)
->>> b
-array([[ 0. 2. 4.]
- [ 1. 3. 5.]])
->>> a*b
-array([[ 0. 4. 16.]
- [ 1. 9. 25.]])
->>> from numpy import mat
->>> c = mat(a)
->>> c
-matrix([[ 0. 2. 4.]
- [ 1. 3. 5.]])
->>> a.T * c
-matrix([[ 1., 3., 5.],
- [ 3., 13., 23.],
- [ 5., 23., 41.]])
-
-In the first product, ``a * b`` is interpreted as NumPy array
-multiplication, i.e., componentwise multiplication.
-The second product ``a.T * c`` is interpreted as NumPy matrix
-multiplication, i.e., standard matrix multiplication.
diff --git a/doc/source/modeling.rst b/doc/source/modeling.rst
index eae0758..4aad9d3 100644
--- a/doc/source/modeling.rst
+++ b/doc/source/modeling.rst
@@ -17,7 +17,7 @@ and nested evaluations of :func:`max <cvxopt.modeling.max>`,
:func:`sum <cvxopt.modeling.sum>` (see the section :ref:`s-functions`).
A more general Python convex modeling package is
-`CVXMOD <http://cvxmod.net>`_.
+`CVXPY <http://cvxpy.org>`_.
.. _s-variables:
@@ -617,16 +617,16 @@ We can solve the same LP in matrix form as follows.
The :class:`op` class also includes two methods for writing and reading
files in
-`MPS format <http://www-fp.mcs.anl.gov/otc/Guide/OptWeb/continuous/constrained/linearprog/mps.html>`_.
+`MPS format <http://lpsolve.sourceforge.net/5.5/mps-format.htm>`_.
-.. method:: tofile(filename)
+.. method:: tofile(filename) :noindex:
If the problem is an LP, writes it to the file `filename` using the
MPS format. Row and column labels are assigned based on the variable
and constraint names in the LP.
-.. method:: fromfile(filename)
+.. method:: fromfile(filename) :noindex:
Reads the LP from the file `filename`. The file must be a fixed-format
MPS file. Some features of the MPS format are not supported: comments
diff --git a/doc/source/spsolvers.rst b/doc/source/spsolvers.rst
index 453d619..dc24e6e 100644
--- a/doc/source/spsolvers.rst
+++ b/doc/source/spsolvers.rst
@@ -39,9 +39,6 @@ minimum degree orderings of sparse matrices.
.. seealso::
- * `AMD code, documentation, copyright, and license
- <http://www.cise.ufl.edu/research/sparse/amd>`_
-
* P. R. Amestoy, T. A. Davis, I. S. Duff, Algorithm 837: AMD, An
Approximate Minimum Degree Ordering Algorithm, ACM Transactions on
Mathematical Software, 30(3), 381-388, 2004.
@@ -91,9 +88,6 @@ described in the UMFPACK user guide.
.. seealso::
- * `UMFPACK code, documentation, copyright, and license
- <http://www.cise.ufl.edu/research/sparse/umfpack>`_
-
* T. A. Davis, Algorithm 832: UMFPACK -- an unsymmetric-pattern
multifrontal method with a column pre-ordering strategy, ACM
Transactions on Mathematical Software, 30(2), 196-199, 2004.
@@ -254,9 +248,11 @@ of symmetric indefinite matrices (with :math:`L` unit lower-triangular and
:math:`D` diagonal and nonsingular) if such a factorization exists.
.. seealso::
-
- `CHOLMOD code, documentation, copyright, and license
- <http://www.cise.ufl.edu/research/sparse/cholmod>`_
+
+ * Y. Chen, T. A. Davis, W. W. Hager, S. Rajamanickam,
+ Algorithm 887: CHOLMOD, Supernodal Sparse Cholesky Factorization
+ and Update/Downdate, ACM Transactions on Mathematical Software,
+ 35(3), 22:1-22:14, 2008.
.. function:: cvxopt.cholmod.linsolve(A, B[, p = None, uplo = 'L'])
@@ -271,8 +267,10 @@ of symmetric indefinite matrices (with :math:`L` unit lower-triangular and
``B`` is a dense matrix of the same type as ``A``. On exit it
is overwritten with the solution. The argument ``p`` is an integer
matrix with length equal to the order of :math:`A`, and specifies an
- optional reordering. If ``p`` is not specified, CHOLMOD uses a
- reordering from the AMD library.
+ optional reordering.
+ See the comment on
+ :attr:`options['nmethods']` for details on which ordering is used
+ by CHOLMOD.
Raises an :exc:`ArithmeticError` if the factorization does not exist.
@@ -310,6 +308,9 @@ As an example, we solve
``B`` is an :class:`spmatrix <cvxopt.spmatrix>` and
that the solution is returned as an output argument (as a new
:class:`spmatrix`). ``B`` is not modified.
+ See the comment on
+ :attr:`options['nmethods']` for details on which ordering is used
+ by CHOLMOD.
The following code computes the inverse of the coefficient matrix
@@ -357,11 +358,13 @@ The functions :func:`linsolve <cvxopt.cholmod.linsolve>` and
If ``uplo`` is :const:`'U'`, only the upper triangular part of ``A``
is accessed and the lower triangular part is ignored.
- If ``p`` is not provided, a reordering from the AMD library is used.
-
The symbolic factorization is returned as an opaque C object that
can be passed to :func:`numeric <cvxopt.cholmod.numeric>`.
+ See the comment on
+ :attr:`options['nmethods']` for details on which ordering is used
+ by CHOLMOD.
+
.. function:: cvxopt.cholmod.numeric(A, F)
@@ -456,11 +459,13 @@ For the same example as above:
In the functions listed above, the default values of the control
parameters described in the CHOLMOD user guide are used, except for
-:cdata:`Common->print` which is set to 0 instead of 3 and
-:cdata:`Common->supernodal` which is set to 2 instead of 1.
+:c:data:`Common->print` which is set to 0 instead of 3 and
+:c:data:`Common->supernodal` which is set to 2 instead of 1.
These parameters (and a few others) can be modified by making an
entry in the dictionary :attr:`cholmod.options`.
-The meaning of these parameters is as follows.
+The meaning of the options :attr:`options['supernodal']` and
+:attr:`options['nmethods']` is summarized as follows (and described
+in detail in the CHOLMOD user guide).
:attr:`options['supernodal']`
If equal to 0, a factorization :eq:`e-chol-ldl` is computed using a
@@ -469,10 +474,21 @@ The meaning of these parameters is as follows.
efficient of the two factorizations is selected, based on the sparsity
pattern. Default: 2.
-:attr:`options['print']`
- A nonnegative integer that controls the amount of output printed to
- the screen. Default: 0 (no output).
-
+:attr:`options['nmethods']`
+ The default ordering used by the CHOLMOD is the ordering in the AMD
+ library, but depending on the value of :attr:`options['nmethods']`.
+ other orderings are also considered.
+ If ``nmethods`` is equal to 2, the ordering specified
+ by the user and the AMD ordering are compared, and the best of the two
+ orderings is used. If the user does not specify an ordering, the AMD
+ ordering is used.
+ If equal to 1, the user must specify an ordering, and the ordering
+ provided by the user is used.
+ If equal to 0, all available orderings are compared and the best
+ ordering is used. The available orderings include the AMD ordering,
+ the ordering specified by the user (if any), and possibly other
+ orderings if they are installed during the CHOLMOD installation.
+ Default: 0.
As an example that illustrates :func:`diag <cvxopt.cholmod.diag>` and the
use of :attr:`cholmod.options`, we compute the logarithm of the determinant
diff --git a/examples/book/chap4/portfolio.py b/examples/book/chap4/portfolio.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap4/rls.py b/examples/book/chap4/rls.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/basispursuit.py b/examples/book/chap6/basispursuit.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/consumerpref.py b/examples/book/chap6/consumerpref.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/cvxfit.py b/examples/book/chap6/cvxfit.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/huber.py b/examples/book/chap6/huber.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/inputdesign.py b/examples/book/chap6/inputdesign.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/penalties.py b/examples/book/chap6/penalties.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/polapprox.py b/examples/book/chap6/polapprox.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/regsel.py b/examples/book/chap6/regsel.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/robls.py b/examples/book/chap6/robls.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/smoothrec.py b/examples/book/chap6/smoothrec.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap6/tv.py b/examples/book/chap6/tv.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap7/chernoff.py b/examples/book/chap7/chernoff.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap7/expdesign.py b/examples/book/chap7/expdesign.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap7/logreg.py b/examples/book/chap7/logreg.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap7/maxent.py b/examples/book/chap7/maxent.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap7/probbounds.py b/examples/book/chap7/probbounds.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap8/centers.py b/examples/book/chap8/centers.py
old mode 100644
new mode 100755
index 68fe026..595e530
--- a/examples/book/chap8/centers.py
+++ b/examples/book/chap8/centers.py
@@ -171,12 +171,12 @@ def F(x=None, z=None):
f = -sum(log(y))
Df = (y**-1).T * G
if z is None: return matrix(f), Df
- H = G.T * spdiag(y**-1) * G
+ H = G.T * spdiag(y**-2) * G
return matrix(f), Df, z[0]*H
sol = solvers.cp(F)
xac = sol['x']
-Hac = G.T * spdiag((h-G*xac)**-1) * G
+Hac = G.T * spdiag((h-G*xac)**-2) * G
if pylab_installed:
pylab.figure(3, facecolor='w')
diff --git a/examples/book/chap8/ellipsoids.py b/examples/book/chap8/ellipsoids.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap8/floorplan.py b/examples/book/chap8/floorplan.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap8/linsep.py b/examples/book/chap8/linsep.py
old mode 100644
new mode 100755
diff --git a/examples/book/chap8/placement.py b/examples/book/chap8/placement.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap10/l1svc.py b/examples/doc/chap10/l1svc.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap10/lp.py b/examples/doc/chap10/lp.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap10/normappr.py b/examples/doc/chap10/normappr.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap10/roblp.py b/examples/doc/chap10/roblp.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap4/acent.py b/examples/doc/chap4/acent.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap7/covsel.py b/examples/doc/chap7/covsel.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/conelp.py b/examples/doc/chap8/conelp.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/coneqp.py b/examples/doc/chap8/coneqp.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/l1.py b/examples/doc/chap8/l1.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/l1regls.py b/examples/doc/chap8/l1regls.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/lp.py b/examples/doc/chap8/lp.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/mcsdp.py b/examples/doc/chap8/mcsdp.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/portfolio.py b/examples/doc/chap8/portfolio.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/qcl1.py b/examples/doc/chap8/qcl1.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/sdp.py b/examples/doc/chap8/sdp.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap8/socp.py b/examples/doc/chap8/socp.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap9/acent.py b/examples/doc/chap9/acent.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap9/acent2.py b/examples/doc/chap9/acent2.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap9/floorplan.py b/examples/doc/chap9/floorplan.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap9/gp.py b/examples/doc/chap9/gp.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap9/l2ac.py b/examples/doc/chap9/l2ac.py
old mode 100644
new mode 100755
diff --git a/examples/doc/chap9/robls.py b/examples/doc/chap9/robls.py
old mode 100644
new mode 100755
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..031ad53
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,259 @@
+try:
+ from setuptools import setup, Extension
+except ImportError:
+ from distutils.core import setup, Extension
+from glob import glob
+import os
+
+# Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
+BLAS_LIB_DIR = '/usr/lib'
+
+# Default names of BLAS and LAPACK libraries
+BLAS_LIB = ['blas']
+LAPACK_LIB = ['lapack']
+BLAS_EXTRA_LINK_ARGS = []
+
+# Set environment variable BLAS_NOUNDERSCORES=1 if your BLAS/LAPACK do
+# not use trailing underscores
+BLAS_NOUNDERSCORES = False
+
+# Set to 1 if you are using the random number generators in the GNU
+# Scientific Library.
+BUILD_GSL = 0
+
+# Directory containing libgsl (used only when BUILD_GSL = 1).
+GSL_LIB_DIR = '/usr/lib'
+
+# Directory containing the GSL header files (used only when BUILD_GSL = 1).
+GSL_INC_DIR = '/usr/include/gsl'
+
+# Set to 1 if you are installing the fftw module.
+BUILD_FFTW = 0
+
+# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
+FFTW_LIB_DIR = '/usr/lib'
+
+# Directory containing fftw.h (used only when BUILD_FFTW = 1).
+FFTW_INC_DIR = '/usr/include'
+
+# Set to 1 if you are installing the glpk module.
+BUILD_GLPK = 0
+
+# Directory containing libglpk (used only when BUILD_GLPK = 1).
+GLPK_LIB_DIR = '/usr/lib'
+
+# Directory containing glpk.h (used only when BUILD_GLPK = 1).
+GLPK_INC_DIR = '/usr/include'
+
+# Set to 1 if you are installing the DSDP module.
+BUILD_DSDP = 0
+
+# Directory containing libdsdp (used only when BUILD_DSDP = 1).
+DSDP_LIB_DIR = '/usr/lib'
+
+# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
+DSDP_INC_DIR = '/usr/include/dsdp'
+
+# Set to 1 to use external SuiteSparse library
+SUITESPARSE_EXT_LIB = 0
+
+# Directory containing external SuiteSparse library
+SUITESPARSE_LIB_DIR = '/usr/local/lib'
+
+# Directory containing SuiteSparse header files
+SUITESPARSE_INC_DIR = '/usr/local/include'
+
+# No modifications should be needed below this line.
+
+BLAS_NOUNDERSCORES = int(os.environ.get("CVXOPT_BLAS_NOUNDERSCORES",BLAS_NOUNDERSCORES)) == True
+BLAS_LIB = os.environ.get("CVXOPT_BLAS_LIB",BLAS_LIB)
+LAPACK_LIB = os.environ.get("CVXOPT_LAPACK_LIB",LAPACK_LIB)
+BLAS_LIB_DIR = os.environ.get("CVXOPT_BLAS_LIB_DIR",BLAS_LIB_DIR)
+BLAS_EXTRA_LINK_ARGS = os.environ.get("CVXOPT_BLAS_EXTRA_LINK_ARGS",BLAS_EXTRA_LINK_ARGS)
+if type(BLAS_LIB) is str: BLAS_LIB = BLAS_LIB.strip().split(',')
+if type(LAPACK_LIB) is str: LAPACK_LIB = LAPACK_LIB.strip().split(',')
+if type(BLAS_EXTRA_LINK_ARGS) is str: BLAS_EXTRA_LINK_ARGS = BLAS_EXTRA_LINK_ARGS.strip().split(',')
+BUILD_GSL = int(os.environ.get("CVXOPT_BUILD_GSL",BUILD_GSL))
+GSL_LIB_DIR = os.environ.get("CVXOPT_GSL_LIB_DIR",GSL_LIB_DIR)
+GSL_INC_DIR = os.environ.get("CVXOPT_GSL_INC_DIR",GSL_INC_DIR)
+BUILD_FFTW = int(os.environ.get("CVXOPT_BUILD_FFTW",BUILD_FFTW))
+FFTW_LIB_DIR = os.environ.get("CVXOPT_FFTW_LIB_DIR",FFTW_LIB_DIR)
+FFTW_INC_DIR = os.environ.get("CVXOPT_FFTW_INC_DIR",FFTW_INC_DIR)
+BUILD_GLPK = int(os.environ.get("CVXOPT_BUILD_GLPK",BUILD_GLPK))
+GLPK_LIB_DIR = os.environ.get("CVXOPT_GLPK_LIB_DIR",GLPK_LIB_DIR)
+GLPK_INC_DIR = os.environ.get("CVXOPT_GLPK_INC_DIR",GLPK_INC_DIR)
+BUILD_DSDP = int(os.environ.get("CVXOPT_BUILD_DSDP",BUILD_DSDP))
+DSDP_LIB_DIR = os.environ.get("CVXOPT_DSDP_LIB_DIR",DSDP_LIB_DIR)
+DSDP_INC_DIR = os.environ.get("CVXOPT_DSDP_INC_DIR",DSDP_INC_DIR)
+SUITESPARSE_EXT_LIB = os.environ.get("CVXOPT_SUITESPARSE_EXT_LIB",SUITESPARSE_EXT_LIB)
+SUITESPARSE_LIB_DIR = os.environ.get("CVXOPT_AMD_EXT_LIB",SUITESPARSE_LIB_DIR)
+SUITESPARSE_INC_DIR = os.environ.get("CVXOPT_AMD_EXT_LIB",SUITESPARSE_INC_DIR)
+
+extmods = []
+
+# Macros
+MACROS = []
+if BLAS_NOUNDERSCORES: MACROS.append(('BLAS_NO_UNDERSCORE',''))
+
+# optional modules
+
+if BUILD_GSL:
+ gsl = Extension('gsl', libraries = ['m', 'gsl'] + BLAS_LIB,
+ include_dirs = [ GSL_INC_DIR ],
+ library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ],
+ extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ sources = ['src/C/gsl.c'] )
+ extmods += [gsl];
+
+if BUILD_FFTW:
+ fftw = Extension('fftw', libraries = ['fftw3'] + BLAS_LIB,
+ include_dirs = [ FFTW_INC_DIR ],
+ library_dirs = [ FFTW_LIB_DIR, BLAS_LIB_DIR ],
+ extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ sources = ['src/C/fftw.c'] )
+ extmods += [fftw];
+
+if BUILD_GLPK:
+ glpk = Extension('glpk', libraries = ['glpk'],
+ include_dirs = [ GLPK_INC_DIR ],
+ library_dirs = [ GLPK_LIB_DIR ],
+ sources = ['src/C/glpk.c'] )
+ extmods += [glpk];
+
+if BUILD_DSDP:
+ dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB + BLAS_LIB,
+ include_dirs = [ DSDP_INC_DIR ],
+ library_dirs = [ DSDP_LIB_DIR, BLAS_LIB_DIR ],
+ extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ sources = ['src/C/dsdp.c'] )
+ extmods += [dsdp];
+
+# Required modules
+
+base = Extension('base', libraries = ['m'] + LAPACK_LIB + BLAS_LIB,
+ library_dirs = [ BLAS_LIB_DIR ],
+ define_macros = MACROS,
+ extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ sources = ['src/C/base.c','src/C/dense.c','src/C/sparse.c'])
+
+blas = Extension('blas', libraries = BLAS_LIB,
+ library_dirs = [ BLAS_LIB_DIR ],
+ define_macros = MACROS,
+ extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ sources = ['src/C/blas.c'] )
+
+lapack = Extension('lapack', libraries = LAPACK_LIB + BLAS_LIB,
+ library_dirs = [ BLAS_LIB_DIR ],
+ define_macros = MACROS,
+ extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ sources = ['src/C/lapack.c'] )
+
+if SUITESPARSE_EXT_LIB:
+ umfpack = Extension('umfpack',
+ libraries = ['amd','colamd','suitesparseconfig','cholmod','umfpack'],
+ include_dirs = [SUITESPARSE_INC_DIR],
+ library_dirs = [SUITESPARSE_LIB_DIR],
+ sources = ['src/C/umfpack.c'])
+else:
+ umfpack = Extension('umfpack',
+ include_dirs = [ 'src/C/SuiteSparse/UMFPACK/Include',
+ 'src/C/SuiteSparse/AMD/Include',
+ 'src/C/SuiteSparse/AMD/Source',
+ 'src/C/SuiteSparse/SuiteSparse_config' ],
+ library_dirs = [ BLAS_LIB_DIR ],
+ define_macros = MACROS + [('NTIMER', '1'), ('NCHOLMOD', '1')],
+ libraries = LAPACK_LIB + BLAS_LIB,
+ extra_compile_args = ['-Wno-unknown-pragmas'],
+ extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ sources = [ 'src/C/umfpack.c',
+ 'src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
+ 'src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
+ ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] +
+ glob('src/C/SuiteSparse_cvxopt_extra/umfpack/*'))
+
+# Build for int or long?
+import sys
+if sys.maxsize > 2**31: MACROS += [('DLONG',None)]
+
+if SUITESPARSE_EXT_LIB:
+ cholmod = Extension('cholmod',
+ libraries = ['amd','colamd','suitesparseconfig','cholmod'],
+ include_dirs = [SUITESPARSE_INC_DIR],
+ library_dirs = [SUITESPARSE_LIB_DIR],
+ sources = [ 'src/C/cholmod.c' ])
+else:
+ cholmod = Extension('cholmod',
+ library_dirs = [ BLAS_LIB_DIR ],
+ libraries = LAPACK_LIB + BLAS_LIB,
+ include_dirs = [ 'src/C/SuiteSparse/CHOLMOD/Include',
+ 'src/C/SuiteSparse/COLAMD',
+ 'src/C/SuiteSparse/AMD/Include',
+ 'src/C/SuiteSparse/COLAMD/Include',
+ 'src/C/SuiteSparse/SuiteSparse_config' ],
+ define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
+ extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ sources = [ 'src/C/cholmod.c' ] +
+ ['src/C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
+ 'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
+ ['src/C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
+ 'colamd_global.c']] +
+ ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] +
+ glob('src/C/SuiteSparse/CHOLMOD/Core/c*.c') +
+ glob('src/C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
+ ['src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
+ glob('src/C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
+
+if SUITESPARSE_EXT_LIB:
+ amd = Extension('amd',
+ libraries = ['amd','suitesparseconfig'],
+ include_dirs = [SUITESPARSE_INC_DIR],
+ library_dirs = [SUITESPARSE_LIB_DIR],
+ sources = ['src/C/amd.c'])
+else:
+ amd = Extension('amd',
+ include_dirs = [ 'src/C/SuiteSparse/AMD/Include',
+ 'src/C/SuiteSparse/SuiteSparse_config' ],
+ define_macros = MACROS,
+ sources = [ 'src/C/amd.c', 'src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] +
+ glob('src/C/SuiteSparse/AMD/Source/*.c') )
+
+misc_solvers = Extension('misc_solvers',
+ libraries = LAPACK_LIB + BLAS_LIB,
+ library_dirs = [ BLAS_LIB_DIR ],
+ define_macros = MACROS,
+ extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ sources = ['src/C/misc_solvers.c'] )
+
+extmods += [base, blas, lapack, umfpack, cholmod, amd, misc_solvers]
+
+setup (name = 'cvxopt',
+ description = 'Convex optimization package',
+ version = '1.1.8',
+ long_description = '''
+CVXOPT is a free software package for convex optimization based on the
+Python programming language. It can be used with the interactive Python
+interpreter, on the command line by executing Python scripts, or
+integrated in other software via Python extension modules. Its main
+purpose is to make the development of software for convex optimization
+applications straightforward by building on Python's extensive standard
+library and on the strengths of Python as a high-level programming
+language.''',
+ author = 'M. Andersen, J. Dahl, and L. Vandenberghe',
+ author_email = 'martin.skovgaard.andersen at gmail.com, dahl.joachim at gmail.com, vandenbe at ee.ucla.edu',
+ url = 'http://cvxopt.org',
+ license = 'GNU GPL version 3',
+ ext_package = "cvxopt",
+ ext_modules = extmods,
+ package_dir = {"cvxopt": "src/python"},
+ packages = ["cvxopt"],
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Science/Research',
+ 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: C',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 3',
+ 'Topic :: Scientific/Engineering',
+ ],
+ )
diff --git a/src/C/SuiteSparse/AMD/Doc/AMD_UserGuide.tex b/src/C/SuiteSparse/AMD/Doc/AMD_UserGuide.tex
index 9381142..f0e7af8 100644
--- a/src/C/SuiteSparse/AMD/Doc/AMD_UserGuide.tex
+++ b/src/C/SuiteSparse/AMD/Doc/AMD_UserGuide.tex
@@ -13,15 +13,13 @@
\begin{document}
%------------------------------------------------------------------------------
-\title{AMD Version 2.2 User Guide}
+\title{AMD User Guide}
\author{Patrick R. Amestoy\thanks{ENSEEIHT-IRIT,
2 rue Camichel 31017 Toulouse, France.
email: amestoy at enseeiht.fr. http://www.enseeiht.fr/$\sim$amestoy.}
\and Timothy A. Davis\thanks{
-Dept.~of Computer and Information Science and Engineering,
-Univ.~of Florida, Gainesville, FL, USA.
-email: davis at cise.ufl.edu.
-http://www.cise.ufl.edu/$\sim$davis.
+email: DrTimothyAldenDavis at gmail.com,
+http://www.suitesparse.com.
This work was supported by the National
Science Foundation, under grants ASC-9111263, DMS-9223088, and CCR-0203270.
Portions of the work were done while on sabbatical at Stanford University
@@ -34,7 +32,7 @@ http://www.numerical.rl.ac.uk/people/isd/isd.html.
This work was supported by the EPSRC under grant GR/R46441.
}}
-\date{May 31, 2007}
+\date{VERSION 2.4.1, Oct 10, 2014}
\maketitle
%------------------------------------------------------------------------------
@@ -47,10 +45,7 @@ A MATLAB interface is included.
\end{abstract}
%------------------------------------------------------------------------------
-Technical report TR-04-002 (revised), CISE Department, University of Florida,
-Gainesville, FL, 2007.
-
-AMD Version 2.2, Copyright\copyright 2007 by Timothy A.
+AMD Copyright\copyright 2013 by Timothy A.
Davis, Patrick R. Amestoy, and Iain S. Duff. All Rights Reserved.
AMD is available under alternate licences; contact T. Davis for details.
@@ -84,7 +79,7 @@ AMD is available under alternate licences; contact T. Davis for details.
and a notice that the code was modified is included.
{\bf Availability:}
- http://www.cise.ufl.edu/research/sparse/amd
+ http://www.suitesparse.com
{\bf Acknowledgments:}
@@ -174,7 +169,7 @@ see \cite{GeorgeLiu89}.
%------------------------------------------------------------------------------
In addition to appearing as a Collected Algorithm of the ACM, \newline
-AMD is available at http://www.cise.ufl.edu/research/sparse.
+AMD is available at http://www.suitesparse.com.
The Fortran version is available as the routine {\tt MC47} in HSL
(formerly the Harwell Subroutine Library) \cite{hsl:2002}.
@@ -212,7 +207,7 @@ UMFPACK Version 4.1 in MATLAB 7.0 and later
uses several strategies, including a symmetric pivoting strategy, and
will give you better results if you want to factorize an unsymmetric matrix
of this type. Refer to the UMFPACK User Guide for more details, at
-http://www.cise.ufl.edu/research/sparse/umfpack.
+http://www.suitesparse.com.
The AMD mexFunction is much faster than the built-in MATLAB symmetric minimum
degree ordering methods, SYMAMD and SYMMMD. Its ordering quality is
@@ -690,7 +685,8 @@ primary {\tt Source} directory.
The following discussion assumes you have the {\tt make} program, either in
Unix, or in Windows with Cygwin.
-System-dependent configurations are in the {\tt ../UFconfig/UFconfig.mk}
+System-dependent configurations are in the
+{\tt ../SuiteSparse\_config/SuiteSparse\_config.mk}
file. You can edit that file to customize the compilation. The default
settings will work on most systems.
Sample configuration files are provided
@@ -713,7 +709,8 @@ The output will be compared with an output file in the distribution.
Typing {\tt make clean} will remove all but the final compiled libraries
and demo programs. Typing {\tt make purge} or {\tt make distclean}
removes all files not in the original distribution.
-If you compile AMD and then later change the {\tt ../UFconfig/UFconfig.mk} file
+If you compile AMD and then later change the
+{\tt ../SuiteSparse\_config/SuiteSparse\_config.mk} file
then you should type {\tt make purge} and then {\tt make} to recompile.
When you compile your program that uses the C-callable AMD library,
@@ -731,11 +728,6 @@ This works on any system with MATLAB, including Windows.
Alternately, type {\tt make} in the {\tt AMD/MATLAB} directory,
or just use the built-in {\tt amd} in MATLAB 7.3 or later.
-If you have MATLAB 7.2 or earlier, you must first edit UFconfig/UFconfig.h to
-remove the "-largeArrayDims" option from the MEX command, prior to
-{\tt make mex} or {\tt make} in the MATLAB directory
-(or just use {\tt amd\_make.m} inside MATLAB.
-
If you are including AMD as a subset of a larger library and do not want
to link the C standard I/O library, or if you simply do not need to use
them, you can safely remove the {\tt amd\_control.c} and {\tt amd\_info.c}
@@ -776,422 +768,7 @@ describes each user-callable routine in the C version of AMD,
and gives details on their use.
{\footnotesize
-\begin{verbatim}
-
-/* ========================================================================= */
-/* === AMD: approximate minimum degree ordering =========================== */
-/* ========================================================================= */
-
-/* ------------------------------------------------------------------------- */
-/* AMD Version 2.2, Copyright (c) 2007 by Timothy A. Davis, */
-/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
-/* ------------------------------------------------------------------------- */
-
-/* AMD finds a symmetric ordering P of a matrix A so that the Cholesky
- * factorization of P*A*P' has fewer nonzeros and takes less work than the
- * Cholesky factorization of A. If A is not symmetric, then it performs its
- * ordering on the matrix A+A'. Two sets of user-callable routines are
- * provided, one for int integers and the other for UF_long integers.
- *
- * The method is based on the approximate minimum degree algorithm, discussed
- * in Amestoy, Davis, and Duff, "An approximate degree ordering algorithm",
- * SIAM Journal of Matrix Analysis and Applications, vol. 17, no. 4, pp.
- * 886-905, 1996. This package can perform both the AMD ordering (with
- * aggressive absorption), and the AMDBAR ordering (without aggressive
- * absorption) discussed in the above paper. This package differs from the
- * Fortran codes discussed in the paper:
- *
- * (1) it can ignore "dense" rows and columns, leading to faster run times
- * (2) it computes the ordering of A+A' if A is not symmetric
- * (3) it is followed by a depth-first post-ordering of the assembly tree
- * (or supernodal elimination tree)
- *
- * For historical reasons, the Fortran versions, amd.f and amdbar.f, have
- * been left (nearly) unchanged. They compute the identical ordering as
- * described in the above paper.
- */
-
-#ifndef AMD_H
-#define AMD_H
-
-/* make it easy for C++ programs to include AMD */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* get the definition of size_t: */
-#include <stddef.h>
-
-/* define UF_long */
-#include "UFconfig.h"
-
-int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
- * AMD_INVALID, or AMD_OUT_OF_MEMORY */
-(
- int n, /* A is n-by-n. n must be >= 0. */
- const int Ap [ ], /* column pointers for A, of size n+1 */
- const int Ai [ ], /* row indices of A, of size nz = Ap [n] */
- int P [ ], /* output permutation, of size n */
- double Control [ ], /* input Control settings, of size AMD_CONTROL */
- double Info [ ] /* output Info statistics, of size AMD_INFO */
-) ;
-
-UF_long amd_l_order /* see above for description of arguments */
-(
- UF_long n,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
- UF_long P [ ],
- double Control [ ],
- double Info [ ]
-) ;
-
-/* Input arguments (not modified):
- *
- * n: the matrix A is n-by-n.
- * Ap: an int/UF_long array of size n+1, containing column pointers of A.
- * Ai: an int/UF_long array of size nz, containing the row indices of A,
- * where nz = Ap [n].
- * Control: a double array of size AMD_CONTROL, containing control
- * parameters. Defaults are used if Control is NULL.
- *
- * Output arguments (not defined on input):
- *
- * P: an int/UF_long array of size n, containing the output permutation. If
- * row i is the kth pivot row, then P [k] = i. In MATLAB notation,
- * the reordered matrix is A (P,P).
- * Info: a double array of size AMD_INFO, containing statistical
- * information. Ignored if Info is NULL.
- *
- * On input, the matrix A is stored in column-oriented form. The row indices
- * of nonzero entries in column j are stored in Ai [Ap [j] ... Ap [j+1]-1].
- *
- * If the row indices appear in ascending order in each column, and there
- * are no duplicate entries, then amd_order is slightly more efficient in
- * terms of time and memory usage. If this condition does not hold, a copy
- * of the matrix is created (where these conditions do hold), and the copy is
- * ordered. This feature is new to v2.0 (v1.2 and earlier required this
- * condition to hold for the input matrix).
- *
- * Row indices must be in the range 0 to
- * n-1. Ap [0] must be zero, and thus nz = Ap [n] is the number of nonzeros
- * in A. The array Ap is of size n+1, and the array Ai is of size nz = Ap [n].
- * The matrix does not need to be symmetric, and the diagonal does not need to
- * be present (if diagonal entries are present, they are ignored except for
- * the output statistic Info [AMD_NZDIAG]). The arrays Ai and Ap are not
- * modified. This form of the Ap and Ai arrays to represent the nonzero
- * pattern of the matrix A is the same as that used internally by MATLAB.
- * If you wish to use a more flexible input structure, please see the
- * umfpack_*_triplet_to_col routines in the UMFPACK package, at
- * http://www.cise.ufl.edu/research/sparse/umfpack.
- *
- * Restrictions: n >= 0. Ap [0] = 0. Ap [j] <= Ap [j+1] for all j in the
- * range 0 to n-1. nz = Ap [n] >= 0. Ai [0..nz-1] must be in the range 0
- * to n-1. Finally, Ai, Ap, and P must not be NULL. If any of these
- * restrictions are not met, AMD returns AMD_INVALID.
- *
- * AMD returns:
- *
- * AMD_OK if the matrix is valid and sufficient memory can be allocated to
- * perform the ordering.
- *
- * AMD_OUT_OF_MEMORY if not enough memory can be allocated.
- *
- * AMD_INVALID if the input arguments n, Ap, Ai are invalid, or if P is
- * NULL.
- *
- * AMD_OK_BUT_JUMBLED if the matrix had unsorted columns, and/or duplicate
- * entries, but was otherwise valid.
- *
- * The AMD routine first forms the pattern of the matrix A+A', and then
- * computes a fill-reducing ordering, P. If P [k] = i, then row/column i of
- * the original is the kth pivotal row. In MATLAB notation, the permuted
- * matrix is A (P,P), except that 0-based indexing is used instead of the
- * 1-based indexing in MATLAB.
- *
- * The Control array is used to set various parameters for AMD. If a NULL
- * pointer is passed, default values are used. The Control array is not
- * modified.
- *
- * Control [AMD_DENSE]: controls the threshold for "dense" rows/columns.
- * A dense row/column in A+A' can cause AMD to spend a lot of time in
- * ordering the matrix. If Control [AMD_DENSE] >= 0, rows/columns
- * with more than Control [AMD_DENSE] * sqrt (n) entries are ignored
- * during the ordering, and placed last in the output order. The
- * default value of Control [AMD_DENSE] is 10. If negative, no
- * rows/columns are treated as "dense". Rows/columns with 16 or
- * fewer off-diagonal entries are never considered "dense".
- *
- * Control [AMD_AGGRESSIVE]: controls whether or not to use aggressive
- * absorption, in which a prior element is absorbed into the current
- * element if is a subset of the current element, even if it is not
- * adjacent to the current pivot element (refer to Amestoy, Davis,
- * & Duff, 1996, for more details). The default value is nonzero,
- * which means to perform aggressive absorption. This nearly always
- * leads to a better ordering (because the approximate degrees are
- * more accurate) and a lower execution time. There are cases where
- * it can lead to a slightly worse ordering, however. To turn it off,
- * set Control [AMD_AGGRESSIVE] to 0.
- *
- * Control [2..4] are not used in the current version, but may be used in
- * future versions.
- *
- * The Info array provides statistics about the ordering on output. If it is
- * not present, the statistics are not returned. This is not an error
- * condition.
- *
- * Info [AMD_STATUS]: the return value of AMD, either AMD_OK,
- * AMD_OK_BUT_JUMBLED, AMD_OUT_OF_MEMORY, or AMD_INVALID.
- *
- * Info [AMD_N]: n, the size of the input matrix
- *
- * Info [AMD_NZ]: the number of nonzeros in A, nz = Ap [n]
- *
- * Info [AMD_SYMMETRY]: the symmetry of the matrix A. It is the number
- * of "matched" off-diagonal entries divided by the total number of
- * off-diagonal entries. An entry A(i,j) is matched if A(j,i) is also
- * an entry, for any pair (i,j) for which i != j. In MATLAB notation,
- * S = spones (A) ;
- * B = tril (S, -1) + triu (S, 1) ;
- * symmetry = nnz (B & B') / nnz (B) ;
- *
- * Info [AMD_NZDIAG]: the number of entries on the diagonal of A.
- *
- * Info [AMD_NZ_A_PLUS_AT]: the number of nonzeros in A+A', excluding the
- * diagonal. If A is perfectly symmetric (Info [AMD_SYMMETRY] = 1)
- * with a fully nonzero diagonal, then Info [AMD_NZ_A_PLUS_AT] = nz-n
- * (the smallest possible value). If A is perfectly unsymmetric
- * (Info [AMD_SYMMETRY] = 0, for an upper triangular matrix, for
- * example) with no diagonal, then Info [AMD_NZ_A_PLUS_AT] = 2*nz
- * (the largest possible value).
- *
- * Info [AMD_NDENSE]: the number of "dense" rows/columns of A+A' that were
- * removed from A prior to ordering. These are placed last in the
- * output order P.
- *
- * Info [AMD_MEMORY]: the amount of memory used by AMD, in bytes. In the
- * current version, this is 1.2 * Info [AMD_NZ_A_PLUS_AT] + 9*n
- * times the size of an integer. This is at most 2.4nz + 9n. This
- * excludes the size of the input arguments Ai, Ap, and P, which have
- * a total size of nz + 2*n + 1 integers.
- *
- * Info [AMD_NCMPA]: the number of garbage collections performed.
- *
- * Info [AMD_LNZ]: the number of nonzeros in L (excluding the diagonal).
- * This is a slight upper bound because mass elimination is combined
- * with the approximate degree update. It is a rough upper bound if
- * there are many "dense" rows/columns. The rest of the statistics,
- * below, are also slight or rough upper bounds, for the same reasons.
- * The post-ordering of the assembly tree might also not exactly
- * correspond to a true elimination tree postordering.
- *
- * Info [AMD_NDIV]: the number of divide operations for a subsequent LDL'
- * or LU factorization of the permuted matrix A (P,P).
- *
- * Info [AMD_NMULTSUBS_LDL]: the number of multiply-subtract pairs for a
- * subsequent LDL' factorization of A (P,P).
- *
- * Info [AMD_NMULTSUBS_LU]: the number of multiply-subtract pairs for a
- * subsequent LU factorization of A (P,P), assuming that no numerical
- * pivoting is required.
- *
- * Info [AMD_DMAX]: the maximum number of nonzeros in any column of L,
- * including the diagonal.
- *
- * Info [14..19] are not used in the current version, but may be used in
- * future versions.
- */
-
-/* ------------------------------------------------------------------------- */
-/* direct interface to AMD */
-/* ------------------------------------------------------------------------- */
-
-/* amd_2 is the primary AMD ordering routine. It is not meant to be
- * user-callable because of its restrictive inputs and because it destroys
- * the user's input matrix. It does not check its inputs for errors, either.
- * However, if you can work with these restrictions it can be faster than
- * amd_order and use less memory (assuming that you can create your own copy
- * of the matrix for AMD to destroy). Refer to AMD/Source/amd_2.c for a
- * description of each parameter. */
-
-void amd_2
-(
- int n,
- int Pe [ ],
- int Iw [ ],
- int Len [ ],
- int iwlen,
- int pfree,
- int Nv [ ],
- int Next [ ],
- int Last [ ],
- int Head [ ],
- int Elen [ ],
- int Degree [ ],
- int W [ ],
- double Control [ ],
- double Info [ ]
-) ;
-
-void amd_l2
-(
- UF_long n,
- UF_long Pe [ ],
- UF_long Iw [ ],
- UF_long Len [ ],
- UF_long iwlen,
- UF_long pfree,
- UF_long Nv [ ],
- UF_long Next [ ],
- UF_long Last [ ],
- UF_long Head [ ],
- UF_long Elen [ ],
- UF_long Degree [ ],
- UF_long W [ ],
- double Control [ ],
- double Info [ ]
-) ;
-
-/* ------------------------------------------------------------------------- */
-/* amd_valid */
-/* ------------------------------------------------------------------------- */
-
-/* Returns AMD_OK or AMD_OK_BUT_JUMBLED if the matrix is valid as input to
- * amd_order; the latter is returned if the matrix has unsorted and/or
- * duplicate row indices in one or more columns. Returns AMD_INVALID if the
- * matrix cannot be passed to amd_order. For amd_order, the matrix must also
- * be square. The first two arguments are the number of rows and the number
- * of columns of the matrix. For its use in AMD, these must both equal n.
- *
- * NOTE: this routine returned TRUE/FALSE in v1.2 and earlier.
- */
-
-int amd_valid
-(
- int n_row, /* # of rows */
- int n_col, /* # of columns */
- const int Ap [ ], /* column pointers, of size n_col+1 */
- const int Ai [ ] /* row indices, of size Ap [n_col] */
-) ;
-
-UF_long amd_l_valid
-(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ]
-) ;
-
-/* ------------------------------------------------------------------------- */
-/* AMD memory manager and printf routines */
-/* ------------------------------------------------------------------------- */
-
-/* The user can redefine these to change the malloc, free, and printf routines
- * that AMD uses. */
-
-#ifndef EXTERN
-#define EXTERN extern
-#endif
-
-EXTERN void *(*amd_malloc) (size_t) ; /* pointer to malloc */
-EXTERN void (*amd_free) (void *) ; /* pointer to free */
-EXTERN void *(*amd_realloc) (void *, size_t) ; /* pointer to realloc */
-EXTERN void *(*amd_calloc) (size_t, size_t) ; /* pointer to calloc */
-EXTERN int (*amd_printf) (const char *, ...) ; /* pointer to printf */
-
-/* ------------------------------------------------------------------------- */
-/* AMD Control and Info arrays */
-/* ------------------------------------------------------------------------- */
-
-/* amd_defaults: sets the default control settings */
-void amd_defaults (double Control [ ]) ;
-void amd_l_defaults (double Control [ ]) ;
-
-/* amd_control: prints the control settings */
-void amd_control (double Control [ ]) ;
-void amd_l_control (double Control [ ]) ;
-
-/* amd_info: prints the statistics */
-void amd_info (double Info [ ]) ;
-void amd_l_info (double Info [ ]) ;
-
-#define AMD_CONTROL 5 /* size of Control array */
-#define AMD_INFO 20 /* size of Info array */
-
-/* contents of Control */
-#define AMD_DENSE 0 /* "dense" if degree > Control [0] * sqrt (n) */
-#define AMD_AGGRESSIVE 1 /* do aggressive absorption if Control [1] != 0 */
-
-/* default Control settings */
-#define AMD_DEFAULT_DENSE 10.0 /* default "dense" degree 10*sqrt(n) */
-#define AMD_DEFAULT_AGGRESSIVE 1 /* do aggressive absorption by default */
-
-/* contents of Info */
-#define AMD_STATUS 0 /* return value of amd_order and amd_l_order */
-#define AMD_N 1 /* A is n-by-n */
-#define AMD_NZ 2 /* number of nonzeros in A */
-#define AMD_SYMMETRY 3 /* symmetry of pattern (1 is sym., 0 is unsym.) */
-#define AMD_NZDIAG 4 /* # of entries on diagonal */
-#define AMD_NZ_A_PLUS_AT 5 /* nz in A+A' */
-#define AMD_NDENSE 6 /* number of "dense" rows/columns in A */
-#define AMD_MEMORY 7 /* amount of memory used by AMD */
-#define AMD_NCMPA 8 /* number of garbage collections in AMD */
-#define AMD_LNZ 9 /* approx. nz in L, excluding the diagonal */
-#define AMD_NDIV 10 /* number of fl. point divides for LU and LDL' */
-#define AMD_NMULTSUBS_LDL 11 /* number of fl. point (*,-) pairs for LDL' */
-#define AMD_NMULTSUBS_LU 12 /* number of fl. point (*,-) pairs for LU */
-#define AMD_DMAX 13 /* max nz. in any column of L, incl. diagonal */
-
-/* ------------------------------------------------------------------------- */
-/* return values of AMD */
-/* ------------------------------------------------------------------------- */
-
-#define AMD_OK 0 /* success */
-#define AMD_OUT_OF_MEMORY -1 /* malloc failed, or problem too large */
-#define AMD_INVALID -2 /* input arguments are not valid */
-#define AMD_OK_BUT_JUMBLED 1 /* input matrix is OK for amd_order, but
- * columns were not sorted, and/or duplicate entries were present. AMD had
- * to do extra work before ordering the matrix. This is a warning, not an
- * error. */
-
-/* ========================================================================== */
-/* === AMD version ========================================================== */
-/* ========================================================================== */
-
-/* AMD Version 1.2 and later include the following definitions.
- * As an example, to test if the version you are using is 1.2 or later:
- *
- * #ifdef AMD_VERSION
- * if (AMD_VERSION >= AMD_VERSION_CODE (1,2)) ...
- * #endif
- *
- * This also works during compile-time:
- *
- * #if defined(AMD_VERSION) && (AMD_VERSION >= AMD_VERSION_CODE (1,2))
- * printf ("This is version 1.2 or later\n") ;
- * #else
- * printf ("This is an early version\n") ;
- * #endif
- *
- * Versions 1.1 and earlier of AMD do not include a #define'd version number.
- */
-
-#define AMD_DATE "May 31, 2007"
-#define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
-#define AMD_MAIN_VERSION 2
-#define AMD_SUB_VERSION 2
-#define AMD_SUBSUB_VERSION 0
-#define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-#endif
-\end{verbatim}
+\input{amd_h.tex}
}
diff --git a/src/C/SuiteSparse/AMD/Doc/ChangeLog b/src/C/SuiteSparse/AMD/Doc/ChangeLog
index 9b98e38..89dd783 100644
--- a/src/C/SuiteSparse/AMD/Doc/ChangeLog
+++ b/src/C/SuiteSparse/AMD/Doc/ChangeLog
@@ -1,3 +1,35 @@
+Oct 10, 2014: version 2.4.1
+
+ modified MATLAB/amd_make.m. No change to C code except version number.
+
+July 31, 2013: version 2.4.0
+
+ * changed malloc and printf pointers to use SuiteSparse_config
+
+Jun 20, 2012: verison 2.3.1
+
+ * minor update for Windows (removed filesep)
+
+Jun 1, 2012: version 2.3.0
+
+ * changed from UFconfig to SuiteSparse_config
+
+May 15, 2012: version 2.2.4
+
+ * minor fix to SIZE_T_MAX definition (finicky compiler workaround)
+
+Dec 7, 2011: version 2.2.3
+
+ * fixed the Makefile to better align with CFLAGS and other standards
+
+Jan 25, 2011: version 2.2.2
+
+ * minor fix to "make install"
+
+Nov 30, 2009: version 2.2.1
+
+ * added "make install" and "make uninstall"
+
May 31, 2007: version 2.2.0
* port to 64-bit MATLAB
diff --git a/src/C/SuiteSparse/AMD/Doc/License b/src/C/SuiteSparse/AMD/Doc/License
deleted file mode 100644
index b01008a..0000000
--- a/src/C/SuiteSparse/AMD/Doc/License
+++ /dev/null
@@ -1,39 +0,0 @@
-AMD, Copyright (c) by Timothy A. Davis,
-Patrick R. Amestoy, and Iain S. Duff. All Rights Reserved.
-AMD is available under alternate licenses, contact T. Davis for details.
-
-AMD License:
-
- Your use or distribution of AMD or any modified version of
- AMD implies that you agree to this License.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
- USA
-
- Permission is hereby granted to use or copy this program under the
- terms of the GNU LGPL, provided that the Copyright, this License,
- and the Availability of the original version is retained on all copies.
- User documentation of any code that uses this code or any modified
- version of this code must cite the Copyright, this License, the
- Availability note, and "Used by permission." Permission to modify
- the code and to distribute modified code is granted, provided the
- Copyright, this License, and the Availability note are retained,
- and a notice that the code was modified is included.
-
-Availability:
-
- http://www.cise.ufl.edu/research/sparse/amd
-
--------------------------------------------------------------------------------
diff --git a/src/C/SuiteSparse/AMD/Doc/License.txt b/src/C/SuiteSparse/AMD/Doc/License.txt
new file mode 100644
index 0000000..05f154c
--- /dev/null
+++ b/src/C/SuiteSparse/AMD/Doc/License.txt
@@ -0,0 +1,91 @@
+AMD, Copyright (c), 1996-2015, Timothy A. Davis,
+Patrick R. Amestoy, and Iain S. Duff. All Rights Reserved.
+
+AMD License: At the user's option, you may use AMD under either the LGPL
+version 2.1 license, or the BSD 3-clause license. You may not use both
+licenses, nor may you mix-and-match clauses from each license. To use a
+license, in the documentation for your application simply state either of the
+following, replacing <YOUR APPLICATION> with the name of your application:
+
+ AMD, Copyright (c), 1996-2015, Timothy A. Davis,
+ Patrick R. Amestoy, and Iain S. Duff. All Rights Reserved.
+ Used in <YOUR APPLICATION> under the BSD 3-clause license.
+
+or
+
+ AMD, Copyright (c), 1996-2015, Timothy A. Davis,
+ Patrick R. Amestoy, and Iain S. Duff. All Rights Reserved.
+ Used in <YOUR APPLICATION> under the LGPL v2.1 license.
+
+In the event that your package <A> includes another package <B> by another
+author, and <A> and <B> use AMD under different licenses, you may select
+one license to apply to both uses of AMD in the combined application.
+
+Availability:
+
+ http://www.suitesparse.com
+
+-------------------------------------------------------------------------------
+BSD 3-clause:
+-------------------------------------------------------------------------------
+
+ Copyright (c), 1996-2015, Timothy A. Davis,
+ Patrick R. Amestoy, and Iain S. Duff. All Rights Reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the organizations to which the authors are
+ affiliated, nor the names of its contributors may be used to endorse
+ or promote products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+-------------------------------------------------------------------------------
+LGPL version 2.1:
+-------------------------------------------------------------------------------
+
+ Your use or distribution of AMD or any modified version of
+ AMD implies that you agree to this License.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+ USA
+
+ Permission is hereby granted to use or copy this program under the
+ terms of the GNU LGPL, provided that the Copyright, this License,
+ and the Availability of the original version is retained on all copies.
+ User documentation of any code that uses this code or any modified
+ version of this code must cite the Copyright, this License, the
+ Availability note, and "Used by permission." Permission to modify
+ the code and to distribute modified code is granted, provided the
+ Copyright, this License, and the Availability note are retained,
+ and a notice that the code was modified is included.
+
+-------------------------------------------------------------------------------
diff --git a/src/C/SuiteSparse/AMD/Doc/Makefile b/src/C/SuiteSparse/AMD/Doc/Makefile
index 8b593fa..0fea143 100644
--- a/src/C/SuiteSparse/AMD/Doc/Makefile
+++ b/src/C/SuiteSparse/AMD/Doc/Makefile
@@ -4,7 +4,7 @@
default: dist
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
#------------------------------------------------------------------------------
# Remove all but the files in the original distribution
@@ -22,12 +22,15 @@ distclean: clean
# Create the User Guide and Quick Start Guide
#------------------------------------------------------------------------------
-AMD_UserGuide.pdf: AMD_UserGuide.tex AMD_UserGuide.bib
+AMD_UserGuide.pdf: AMD_UserGuide.tex AMD_UserGuide.bib ../Include/amd.h
+ echo '\\begin{verbatim}' > amd_h.tex
+ expand -8 ../Include/amd.h >> amd_h.tex
+ echo '\end{verbatim}' >> amd_h.tex
pdflatex AMD_UserGuide
bibtex AMD_UserGuide
pdflatex AMD_UserGuide
pdflatex AMD_UserGuide
dist: AMD_UserGuide.pdf
- - $(RM) *.aux *.bbl *.blg *.log *.toc
+ - $(RM) *.aux *.bbl *.blg *.log *.toc amd_h.tex
diff --git a/src/C/SuiteSparse/AMD/Include/amd.h b/src/C/SuiteSparse/AMD/Include/amd.h
index e4fd47e..c80de1a 100644
--- a/src/C/SuiteSparse/AMD/Include/amd.h
+++ b/src/C/SuiteSparse/AMD/Include/amd.h
@@ -3,17 +3,16 @@
/* ========================================================================= */
/* ------------------------------------------------------------------------- */
-/* AMD Version 2.2, Copyright (c) 2007 by Timothy A. Davis, */
+/* AMD Version 2.4, Copyright (c) 1996-2013 by Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* AMD finds a symmetric ordering P of a matrix A so that the Cholesky
* factorization of P*A*P' has fewer nonzeros and takes less work than the
* Cholesky factorization of A. If A is not symmetric, then it performs its
* ordering on the matrix A+A'. Two sets of user-callable routines are
- * provided, one for int integers and the other for UF_long integers.
+ * provided, one for int integers and the other for SuiteSparse_long integers.
*
* The method is based on the approximate minimum degree algorithm, discussed
* in Amestoy, Davis, and Duff, "An approximate degree ordering algorithm",
@@ -23,10 +22,10 @@
* absorption) discussed in the above paper. This package differs from the
* Fortran codes discussed in the paper:
*
- * (1) it can ignore "dense" rows and columns, leading to faster run times
- * (2) it computes the ordering of A+A' if A is not symmetric
- * (3) it is followed by a depth-first post-ordering of the assembly tree
- * (or supernodal elimination tree)
+ * (1) it can ignore "dense" rows and columns, leading to faster run times
+ * (2) it computes the ordering of A+A' if A is not symmetric
+ * (3) it is followed by a depth-first post-ordering of the assembly tree
+ * (or supernodal elimination tree)
*
* For historical reasons, the Fortran versions, amd.f and amdbar.f, have
* been left (nearly) unchanged. They compute the identical ordering as
@@ -44,46 +43,46 @@ extern "C" {
/* get the definition of size_t: */
#include <stddef.h>
-/* define UF_long */
-#include "UFconfig.h"
+#include "SuiteSparse_config.h"
-int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
- * AMD_INVALID, or AMD_OUT_OF_MEMORY */
+int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
+ * AMD_INVALID, or AMD_OUT_OF_MEMORY */
(
- int n, /* A is n-by-n. n must be >= 0. */
- const int Ap [ ], /* column pointers for A, of size n+1 */
- const int Ai [ ], /* row indices of A, of size nz = Ap [n] */
- int P [ ], /* output permutation, of size n */
- double Control [ ], /* input Control settings, of size AMD_CONTROL */
- double Info [ ] /* output Info statistics, of size AMD_INFO */
+ int n, /* A is n-by-n. n must be >= 0. */
+ const int Ap [ ], /* column pointers for A, of size n+1 */
+ const int Ai [ ], /* row indices of A, of size nz = Ap [n] */
+ int P [ ], /* output permutation, of size n */
+ double Control [ ], /* input Control settings, of size AMD_CONTROL */
+ double Info [ ] /* output Info statistics, of size AMD_INFO */
) ;
-UF_long amd_l_order /* see above for description of arguments */
+SuiteSparse_long amd_l_order /* see above for description of arguments */
(
- UF_long n,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
- UF_long P [ ],
+ SuiteSparse_long n,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
+ SuiteSparse_long P [ ],
double Control [ ],
double Info [ ]
) ;
/* Input arguments (not modified):
*
- * n: the matrix A is n-by-n.
- * Ap: an int/UF_long array of size n+1, containing column pointers of A.
- * Ai: an int/UF_long array of size nz, containing the row indices of A,
- * where nz = Ap [n].
- * Control: a double array of size AMD_CONTROL, containing control
- * parameters. Defaults are used if Control is NULL.
+ * n: the matrix A is n-by-n.
+ * Ap: an int/SuiteSparse_long array of size n+1, containing column
+ * pointers of A.
+ * Ai: an int/SuiteSparse_long array of size nz, containing the row
+ * indices of A, where nz = Ap [n].
+ * Control: a double array of size AMD_CONTROL, containing control
+ * parameters. Defaults are used if Control is NULL.
*
* Output arguments (not defined on input):
*
- * P: an int/UF_long array of size n, containing the output permutation. If
- * row i is the kth pivot row, then P [k] = i. In MATLAB notation,
- * the reordered matrix is A (P,P).
- * Info: a double array of size AMD_INFO, containing statistical
- * information. Ignored if Info is NULL.
+ * P: an int/SuiteSparse_long array of size n, containing the output
+ * permutation. If row i is the kth pivot row, then P [k] = i. In
+ * MATLAB notation, the reordered matrix is A (P,P).
+ * Info: a double array of size AMD_INFO, containing statistical
+ * information. Ignored if Info is NULL.
*
* On input, the matrix A is stored in column-oriented form. The row indices
* of nonzero entries in column j are stored in Ai [Ap [j] ... Ap [j+1]-1].
@@ -105,25 +104,25 @@ UF_long amd_l_order /* see above for description of arguments */
* pattern of the matrix A is the same as that used internally by MATLAB.
* If you wish to use a more flexible input structure, please see the
* umfpack_*_triplet_to_col routines in the UMFPACK package, at
- * http://www.cise.ufl.edu/research/sparse/umfpack.
+ * http://www.suitesparse.com.
*
* Restrictions: n >= 0. Ap [0] = 0. Ap [j] <= Ap [j+1] for all j in the
- * range 0 to n-1. nz = Ap [n] >= 0. Ai [0..nz-1] must be in the range 0
- * to n-1. Finally, Ai, Ap, and P must not be NULL. If any of these
- * restrictions are not met, AMD returns AMD_INVALID.
+ * range 0 to n-1. nz = Ap [n] >= 0. Ai [0..nz-1] must be in the range 0
+ * to n-1. Finally, Ai, Ap, and P must not be NULL. If any of these
+ * restrictions are not met, AMD returns AMD_INVALID.
*
* AMD returns:
*
- * AMD_OK if the matrix is valid and sufficient memory can be allocated to
- * perform the ordering.
+ * AMD_OK if the matrix is valid and sufficient memory can be allocated to
+ * perform the ordering.
*
- * AMD_OUT_OF_MEMORY if not enough memory can be allocated.
+ * AMD_OUT_OF_MEMORY if not enough memory can be allocated.
*
- * AMD_INVALID if the input arguments n, Ap, Ai are invalid, or if P is
- * NULL.
+ * AMD_INVALID if the input arguments n, Ap, Ai are invalid, or if P is
+ * NULL.
*
- * AMD_OK_BUT_JUMBLED if the matrix had unsorted columns, and/or duplicate
- * entries, but was otherwise valid.
+ * AMD_OK_BUT_JUMBLED if the matrix had unsorted columns, and/or duplicate
+ * entries, but was otherwise valid.
*
* The AMD routine first forms the pattern of the matrix A+A', and then
* computes a fill-reducing ordering, P. If P [k] = i, then row/column i of
@@ -135,93 +134,93 @@ UF_long amd_l_order /* see above for description of arguments */
* pointer is passed, default values are used. The Control array is not
* modified.
*
- * Control [AMD_DENSE]: controls the threshold for "dense" rows/columns.
- * A dense row/column in A+A' can cause AMD to spend a lot of time in
- * ordering the matrix. If Control [AMD_DENSE] >= 0, rows/columns
- * with more than Control [AMD_DENSE] * sqrt (n) entries are ignored
- * during the ordering, and placed last in the output order. The
- * default value of Control [AMD_DENSE] is 10. If negative, no
- * rows/columns are treated as "dense". Rows/columns with 16 or
- * fewer off-diagonal entries are never considered "dense".
- *
- * Control [AMD_AGGRESSIVE]: controls whether or not to use aggressive
- * absorption, in which a prior element is absorbed into the current
- * element if is a subset of the current element, even if it is not
- * adjacent to the current pivot element (refer to Amestoy, Davis,
- * & Duff, 1996, for more details). The default value is nonzero,
- * which means to perform aggressive absorption. This nearly always
- * leads to a better ordering (because the approximate degrees are
- * more accurate) and a lower execution time. There are cases where
- * it can lead to a slightly worse ordering, however. To turn it off,
- * set Control [AMD_AGGRESSIVE] to 0.
- *
- * Control [2..4] are not used in the current version, but may be used in
- * future versions.
+ * Control [AMD_DENSE]: controls the threshold for "dense" rows/columns.
+ * A dense row/column in A+A' can cause AMD to spend a lot of time in
+ * ordering the matrix. If Control [AMD_DENSE] >= 0, rows/columns
+ * with more than Control [AMD_DENSE] * sqrt (n) entries are ignored
+ * during the ordering, and placed last in the output order. The
+ * default value of Control [AMD_DENSE] is 10. If negative, no
+ * rows/columns are treated as "dense". Rows/columns with 16 or
+ * fewer off-diagonal entries are never considered "dense".
+ *
+ * Control [AMD_AGGRESSIVE]: controls whether or not to use aggressive
+ * absorption, in which a prior element is absorbed into the current
+ * element if is a subset of the current element, even if it is not
+ * adjacent to the current pivot element (refer to Amestoy, Davis,
+ * & Duff, 1996, for more details). The default value is nonzero,
+ * which means to perform aggressive absorption. This nearly always
+ * leads to a better ordering (because the approximate degrees are
+ * more accurate) and a lower execution time. There are cases where
+ * it can lead to a slightly worse ordering, however. To turn it off,
+ * set Control [AMD_AGGRESSIVE] to 0.
+ *
+ * Control [2..4] are not used in the current version, but may be used in
+ * future versions.
*
* The Info array provides statistics about the ordering on output. If it is
* not present, the statistics are not returned. This is not an error
* condition.
*
- * Info [AMD_STATUS]: the return value of AMD, either AMD_OK,
- * AMD_OK_BUT_JUMBLED, AMD_OUT_OF_MEMORY, or AMD_INVALID.
- *
- * Info [AMD_N]: n, the size of the input matrix
- *
- * Info [AMD_NZ]: the number of nonzeros in A, nz = Ap [n]
- *
- * Info [AMD_SYMMETRY]: the symmetry of the matrix A. It is the number
- * of "matched" off-diagonal entries divided by the total number of
- * off-diagonal entries. An entry A(i,j) is matched if A(j,i) is also
- * an entry, for any pair (i,j) for which i != j. In MATLAB notation,
- * S = spones (A) ;
- * B = tril (S, -1) + triu (S, 1) ;
- * symmetry = nnz (B & B') / nnz (B) ;
- *
- * Info [AMD_NZDIAG]: the number of entries on the diagonal of A.
- *
- * Info [AMD_NZ_A_PLUS_AT]: the number of nonzeros in A+A', excluding the
- * diagonal. If A is perfectly symmetric (Info [AMD_SYMMETRY] = 1)
- * with a fully nonzero diagonal, then Info [AMD_NZ_A_PLUS_AT] = nz-n
- * (the smallest possible value). If A is perfectly unsymmetric
- * (Info [AMD_SYMMETRY] = 0, for an upper triangular matrix, for
- * example) with no diagonal, then Info [AMD_NZ_A_PLUS_AT] = 2*nz
- * (the largest possible value).
- *
- * Info [AMD_NDENSE]: the number of "dense" rows/columns of A+A' that were
- * removed from A prior to ordering. These are placed last in the
- * output order P.
- *
- * Info [AMD_MEMORY]: the amount of memory used by AMD, in bytes. In the
- * current version, this is 1.2 * Info [AMD_NZ_A_PLUS_AT] + 9*n
- * times the size of an integer. This is at most 2.4nz + 9n. This
- * excludes the size of the input arguments Ai, Ap, and P, which have
- * a total size of nz + 2*n + 1 integers.
- *
- * Info [AMD_NCMPA]: the number of garbage collections performed.
- *
- * Info [AMD_LNZ]: the number of nonzeros in L (excluding the diagonal).
- * This is a slight upper bound because mass elimination is combined
- * with the approximate degree update. It is a rough upper bound if
- * there are many "dense" rows/columns. The rest of the statistics,
- * below, are also slight or rough upper bounds, for the same reasons.
- * The post-ordering of the assembly tree might also not exactly
- * correspond to a true elimination tree postordering.
- *
- * Info [AMD_NDIV]: the number of divide operations for a subsequent LDL'
- * or LU factorization of the permuted matrix A (P,P).
- *
- * Info [AMD_NMULTSUBS_LDL]: the number of multiply-subtract pairs for a
- * subsequent LDL' factorization of A (P,P).
- *
- * Info [AMD_NMULTSUBS_LU]: the number of multiply-subtract pairs for a
- * subsequent LU factorization of A (P,P), assuming that no numerical
- * pivoting is required.
- *
- * Info [AMD_DMAX]: the maximum number of nonzeros in any column of L,
- * including the diagonal.
- *
- * Info [14..19] are not used in the current version, but may be used in
- * future versions.
+ * Info [AMD_STATUS]: the return value of AMD, either AMD_OK,
+ * AMD_OK_BUT_JUMBLED, AMD_OUT_OF_MEMORY, or AMD_INVALID.
+ *
+ * Info [AMD_N]: n, the size of the input matrix
+ *
+ * Info [AMD_NZ]: the number of nonzeros in A, nz = Ap [n]
+ *
+ * Info [AMD_SYMMETRY]: the symmetry of the matrix A. It is the number
+ * of "matched" off-diagonal entries divided by the total number of
+ * off-diagonal entries. An entry A(i,j) is matched if A(j,i) is also
+ * an entry, for any pair (i,j) for which i != j. In MATLAB notation,
+ * S = spones (A) ;
+ * B = tril (S, -1) + triu (S, 1) ;
+ * symmetry = nnz (B & B') / nnz (B) ;
+ *
+ * Info [AMD_NZDIAG]: the number of entries on the diagonal of A.
+ *
+ * Info [AMD_NZ_A_PLUS_AT]: the number of nonzeros in A+A', excluding the
+ * diagonal. If A is perfectly symmetric (Info [AMD_SYMMETRY] = 1)
+ * with a fully nonzero diagonal, then Info [AMD_NZ_A_PLUS_AT] = nz-n
+ * (the smallest possible value). If A is perfectly unsymmetric
+ * (Info [AMD_SYMMETRY] = 0, for an upper triangular matrix, for
+ * example) with no diagonal, then Info [AMD_NZ_A_PLUS_AT] = 2*nz
+ * (the largest possible value).
+ *
+ * Info [AMD_NDENSE]: the number of "dense" rows/columns of A+A' that were
+ * removed from A prior to ordering. These are placed last in the
+ * output order P.
+ *
+ * Info [AMD_MEMORY]: the amount of memory used by AMD, in bytes. In the
+ * current version, this is 1.2 * Info [AMD_NZ_A_PLUS_AT] + 9*n
+ * times the size of an integer. This is at most 2.4nz + 9n. This
+ * excludes the size of the input arguments Ai, Ap, and P, which have
+ * a total size of nz + 2*n + 1 integers.
+ *
+ * Info [AMD_NCMPA]: the number of garbage collections performed.
+ *
+ * Info [AMD_LNZ]: the number of nonzeros in L (excluding the diagonal).
+ * This is a slight upper bound because mass elimination is combined
+ * with the approximate degree update. It is a rough upper bound if
+ * there are many "dense" rows/columns. The rest of the statistics,
+ * below, are also slight or rough upper bounds, for the same reasons.
+ * The post-ordering of the assembly tree might also not exactly
+ * correspond to a true elimination tree postordering.
+ *
+ * Info [AMD_NDIV]: the number of divide operations for a subsequent LDL'
+ * or LU factorization of the permuted matrix A (P,P).
+ *
+ * Info [AMD_NMULTSUBS_LDL]: the number of multiply-subtract pairs for a
+ * subsequent LDL' factorization of A (P,P).
+ *
+ * Info [AMD_NMULTSUBS_LU]: the number of multiply-subtract pairs for a
+ * subsequent LU factorization of A (P,P), assuming that no numerical
+ * pivoting is required.
+ *
+ * Info [AMD_DMAX]: the maximum number of nonzeros in any column of L,
+ * including the diagonal.
+ *
+ * Info [14..19] are not used in the current version, but may be used in
+ * future versions.
*/
/* ------------------------------------------------------------------------- */
@@ -257,19 +256,19 @@ void amd_2
void amd_l2
(
- UF_long n,
- UF_long Pe [ ],
- UF_long Iw [ ],
- UF_long Len [ ],
- UF_long iwlen,
- UF_long pfree,
- UF_long Nv [ ],
- UF_long Next [ ],
- UF_long Last [ ],
- UF_long Head [ ],
- UF_long Elen [ ],
- UF_long Degree [ ],
- UF_long W [ ],
+ SuiteSparse_long n,
+ SuiteSparse_long Pe [ ],
+ SuiteSparse_long Iw [ ],
+ SuiteSparse_long Len [ ],
+ SuiteSparse_long iwlen,
+ SuiteSparse_long pfree,
+ SuiteSparse_long Nv [ ],
+ SuiteSparse_long Next [ ],
+ SuiteSparse_long Last [ ],
+ SuiteSparse_long Head [ ],
+ SuiteSparse_long Elen [ ],
+ SuiteSparse_long Degree [ ],
+ SuiteSparse_long W [ ],
double Control [ ],
double Info [ ]
) ;
@@ -290,36 +289,25 @@ void amd_l2
int amd_valid
(
- int n_row, /* # of rows */
- int n_col, /* # of columns */
- const int Ap [ ], /* column pointers, of size n_col+1 */
- const int Ai [ ] /* row indices, of size Ap [n_col] */
+ int n_row, /* # of rows */
+ int n_col, /* # of columns */
+ const int Ap [ ], /* column pointers, of size n_col+1 */
+ const int Ai [ ] /* row indices, of size Ap [n_col] */
) ;
-UF_long amd_l_valid
+SuiteSparse_long amd_l_valid
(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ]
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ]
) ;
/* ------------------------------------------------------------------------- */
/* AMD memory manager and printf routines */
/* ------------------------------------------------------------------------- */
-/* The user can redefine these to change the malloc, free, and printf routines
- * that AMD uses. */
-
-#ifndef EXTERN
-#define EXTERN extern
-#endif
-
-EXTERN void *(*amd_malloc) (size_t) ; /* pointer to malloc */
-EXTERN void (*amd_free) (void *) ; /* pointer to free */
-EXTERN void *(*amd_realloc) (void *, size_t) ; /* pointer to realloc */
-EXTERN void *(*amd_calloc) (size_t, size_t) ; /* pointer to calloc */
-EXTERN int (*amd_printf) (const char *, ...) ; /* pointer to printf */
+ /* moved to SuiteSparse_config.c */
/* ------------------------------------------------------------------------- */
/* AMD Control and Info arrays */
@@ -337,41 +325,41 @@ void amd_l_control (double Control [ ]) ;
void amd_info (double Info [ ]) ;
void amd_l_info (double Info [ ]) ;
-#define AMD_CONTROL 5 /* size of Control array */
-#define AMD_INFO 20 /* size of Info array */
+#define AMD_CONTROL 5 /* size of Control array */
+#define AMD_INFO 20 /* size of Info array */
/* contents of Control */
-#define AMD_DENSE 0 /* "dense" if degree > Control [0] * sqrt (n) */
+#define AMD_DENSE 0 /* "dense" if degree > Control [0] * sqrt (n) */
#define AMD_AGGRESSIVE 1 /* do aggressive absorption if Control [1] != 0 */
/* default Control settings */
-#define AMD_DEFAULT_DENSE 10.0 /* default "dense" degree 10*sqrt(n) */
+#define AMD_DEFAULT_DENSE 10.0 /* default "dense" degree 10*sqrt(n) */
#define AMD_DEFAULT_AGGRESSIVE 1 /* do aggressive absorption by default */
/* contents of Info */
-#define AMD_STATUS 0 /* return value of amd_order and amd_l_order */
-#define AMD_N 1 /* A is n-by-n */
-#define AMD_NZ 2 /* number of nonzeros in A */
-#define AMD_SYMMETRY 3 /* symmetry of pattern (1 is sym., 0 is unsym.) */
-#define AMD_NZDIAG 4 /* # of entries on diagonal */
+#define AMD_STATUS 0 /* return value of amd_order and amd_l_order */
+#define AMD_N 1 /* A is n-by-n */
+#define AMD_NZ 2 /* number of nonzeros in A */
+#define AMD_SYMMETRY 3 /* symmetry of pattern (1 is sym., 0 is unsym.) */
+#define AMD_NZDIAG 4 /* # of entries on diagonal */
#define AMD_NZ_A_PLUS_AT 5 /* nz in A+A' */
-#define AMD_NDENSE 6 /* number of "dense" rows/columns in A */
-#define AMD_MEMORY 7 /* amount of memory used by AMD */
-#define AMD_NCMPA 8 /* number of garbage collections in AMD */
-#define AMD_LNZ 9 /* approx. nz in L, excluding the diagonal */
-#define AMD_NDIV 10 /* number of fl. point divides for LU and LDL' */
+#define AMD_NDENSE 6 /* number of "dense" rows/columns in A */
+#define AMD_MEMORY 7 /* amount of memory used by AMD */
+#define AMD_NCMPA 8 /* number of garbage collections in AMD */
+#define AMD_LNZ 9 /* approx. nz in L, excluding the diagonal */
+#define AMD_NDIV 10 /* number of fl. point divides for LU and LDL' */
#define AMD_NMULTSUBS_LDL 11 /* number of fl. point (*,-) pairs for LDL' */
#define AMD_NMULTSUBS_LU 12 /* number of fl. point (*,-) pairs for LU */
-#define AMD_DMAX 13 /* max nz. in any column of L, incl. diagonal */
+#define AMD_DMAX 13 /* max nz. in any column of L, incl. diagonal */
/* ------------------------------------------------------------------------- */
/* return values of AMD */
/* ------------------------------------------------------------------------- */
-#define AMD_OK 0 /* success */
-#define AMD_OUT_OF_MEMORY -1 /* malloc failed, or problem too large */
-#define AMD_INVALID -2 /* input arguments are not valid */
-#define AMD_OK_BUT_JUMBLED 1 /* input matrix is OK for amd_order, but
+#define AMD_OK 0 /* success */
+#define AMD_OUT_OF_MEMORY -1 /* malloc failed, or problem too large */
+#define AMD_INVALID -2 /* input arguments are not valid */
+#define AMD_OK_BUT_JUMBLED 1 /* input matrix is OK for amd_order, but
* columns were not sorted, and/or duplicate entries were present. AMD had
* to do extra work before ordering the matrix. This is a warning, not an
* error. */
@@ -384,25 +372,25 @@ void amd_l_info (double Info [ ]) ;
* As an example, to test if the version you are using is 1.2 or later:
*
* #ifdef AMD_VERSION
- * if (AMD_VERSION >= AMD_VERSION_CODE (1,2)) ...
+ * if (AMD_VERSION >= AMD_VERSION_CODE (1,2)) ...
* #endif
*
* This also works during compile-time:
*
- * #if defined(AMD_VERSION) && (AMD_VERSION >= AMD_VERSION_CODE (1,2))
- * printf ("This is version 1.2 or later\n") ;
- * #else
- * printf ("This is an early version\n") ;
- * #endif
+ * #if defined(AMD_VERSION) && (AMD_VERSION >= AMD_VERSION_CODE (1,2))
+ * printf ("This is version 1.2 or later\n") ;
+ * #else
+ * printf ("This is an early version\n") ;
+ * #endif
*
* Versions 1.1 and earlier of AMD do not include a #define'd version number.
*/
-#define AMD_DATE "May 31, 2007"
+#define AMD_DATE "Oct 10, 2014"
#define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
#define AMD_MAIN_VERSION 2
-#define AMD_SUB_VERSION 2
-#define AMD_SUBSUB_VERSION 0
+#define AMD_SUB_VERSION 4
+#define AMD_SUBSUB_VERSION 1
#define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)
#ifdef __cplusplus
diff --git a/src/C/SuiteSparse/AMD/Include/amd_internal.h b/src/C/SuiteSparse/AMD/Include/amd_internal.h
index d515b64..6730527 100644
--- a/src/C/SuiteSparse/AMD/Include/amd_internal.h
+++ b/src/C/SuiteSparse/AMD/Include/amd_internal.h
@@ -3,29 +3,14 @@
/* ========================================================================= */
/* ------------------------------------------------------------------------- */
-/* AMD, Copyright (c) Timothy A. Davis, */
+/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* This file is for internal use in AMD itself, and does not normally need to
* be included in user code (it is included in UMFPACK, however). All others
* should use amd.h instead.
- *
- * The following compile-time definitions affect how AMD is compiled.
- *
- * -DNPRINT
- *
- * Disable all printing. stdio.h will not be included. Printing can
- * be re-enabled at run-time by setting the global pointer amd_printf
- * to printf (or mexPrintf for a MATLAB mexFunction).
- *
- * -DNMALLOC
- *
- * No memory manager is defined at compile-time. You MUST define the
- * function pointers amd_malloc, amd_free, amd_realloc, and
- * amd_calloc at run-time for AMD to work properly.
*/
/* ========================================================================= */
@@ -154,21 +139,25 @@
/* largest value of size_t */
#ifndef SIZE_T_MAX
+#ifdef SIZE_MAX
+/* C99 only */
+#define SIZE_T_MAX SIZE_MAX
+#else
#define SIZE_T_MAX ((size_t) (-1))
#endif
+#endif
/* ------------------------------------------------------------------------- */
-/* integer type for AMD: int or UF_long */
+/* integer type for AMD: int or SuiteSparse_long */
/* ------------------------------------------------------------------------- */
-/* define UF_long */
-#include "UFconfig.h"
+#include "amd.h"
#if defined (DLONG) || defined (ZLONG)
-#define Int UF_long
-#define ID UF_long_id
-#define Int_MAX UF_long_max
+#define Int SuiteSparse_long
+#define ID SuiteSparse_long_id
+#define Int_MAX SuiteSparse_long_max
#define AMD_order amd_l_order
#define AMD_defaults amd_l_defaults
@@ -208,19 +197,6 @@
#endif
-/* ========================================================================= */
-/* === PRINTF macro ======================================================== */
-/* ========================================================================= */
-
-/* All output goes through the PRINTF macro. */
-#define PRINTF(params) { if (amd_printf != NULL) (void) amd_printf params ; }
-
-/* ------------------------------------------------------------------------- */
-/* AMD routine definitions (user-callable) */
-/* ------------------------------------------------------------------------- */
-
-#include "amd.h"
-
/* ------------------------------------------------------------------------- */
/* AMD routine definitions (not user-callable) */
/* ------------------------------------------------------------------------- */
@@ -331,11 +307,11 @@ GLOBAL void AMD_dump
#define ASSERT(expression) (assert (expression))
#endif
-#define AMD_DEBUG0(params) { PRINTF (params) ; }
-#define AMD_DEBUG1(params) { if (AMD_debug >= 1) PRINTF (params) ; }
-#define AMD_DEBUG2(params) { if (AMD_debug >= 2) PRINTF (params) ; }
-#define AMD_DEBUG3(params) { if (AMD_debug >= 3) PRINTF (params) ; }
-#define AMD_DEBUG4(params) { if (AMD_debug >= 4) PRINTF (params) ; }
+#define AMD_DEBUG0(params) { SUITESPARSE_PRINTF (params) ; }
+#define AMD_DEBUG1(params) { if (AMD_debug >= 1) SUITESPARSE_PRINTF (params) ; }
+#define AMD_DEBUG2(params) { if (AMD_debug >= 2) SUITESPARSE_PRINTF (params) ; }
+#define AMD_DEBUG3(params) { if (AMD_debug >= 3) SUITESPARSE_PRINTF (params) ; }
+#define AMD_DEBUG4(params) { if (AMD_debug >= 4) SUITESPARSE_PRINTF (params) ; }
#else
diff --git a/src/C/SuiteSparse/AMD/Lib/GNUmakefile b/src/C/SuiteSparse/AMD/Lib/GNUmakefile
index f59b1d6..8e6d899 100644
--- a/src/C/SuiteSparse/AMD/Lib/GNUmakefile
+++ b/src/C/SuiteSparse/AMD/Lib/GNUmakefile
@@ -2,11 +2,11 @@
# AMD Makefile for compiling on Unix systems (for GNU make only)
#-------------------------------------------------------------------------------
-default: ../Lib/libamd.a
+default: libamd.a
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
+C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
#-------------------------------------------------------------------------------
# source files
@@ -15,9 +15,9 @@ C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \
amd_order amd_control amd_info amd_valid amd_preprocess
-UFCONFIG = ../../UFconfig/UFconfig.h
+CONFIG = ../../SuiteSparse_config/SuiteSparse_config.h
-INC = ../Include/amd.h ../Include/amd_internal.h $(UFCONFIG)
+INC = ../Include/amd.h ../Include/amd_internal.h $(CONFIG)
#-------------------------------------------------------------------------------
# object files for each version
@@ -30,9 +30,6 @@ AMDL = $(addsuffix .o, $(subst amd_,amd_l_,$(AMD)))
# compile each int and long routine (with no real/complex version)
#-------------------------------------------------------------------------------
-amd_global.o: ../Source/amd_global.c $(INC)
- $(C) -c $< -o $@
-
amd_i_%.o: ../Source/amd_%.c $(INC)
$(C) -DDINT -c $< -o $@
@@ -43,15 +40,15 @@ amd_l_%.o: ../Source/amd_%.c $(INC)
# Create the libamd.a library (C versions only)
#-------------------------------------------------------------------------------
-../Lib/libamd.a: amd_global.o $(AMDI) $(AMDL)
- $(AR) ../Lib/libamd.a $^
- - $(RANLIB) ../Lib/libamd.a
+libamd.a: $(AMDI) $(AMDL)
+ $(ARCHIVE) libamd.a $^
+ - $(RANLIB) libamd.a
#-------------------------------------------------------------------------------
# compile the Fortran versions and the libamdf77.a library
#-------------------------------------------------------------------------------
-fortran: ../Lib/libamdf77.a
+fortran: libamdf77.a
AMDF77 = amd.o amdbar.o
@@ -61,9 +58,9 @@ amd.o: ../Source/amd.f
amdbar.o: ../Source/amdbar.f
$(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o
-../Lib/libamdf77.a: $(AMDF77)
- $(AR) ../Lib/libamdf77.a $^
- - $(RANLIB) ../Lib/libamdf77.a
+libamdf77.a: $(AMDF77)
+ $(ARCHIVE) libamdf77.a $^
+ - $(RANLIB) libamdf77.a
#-------------------------------------------------------------------------------
# Remove all but the files in the original distribution
@@ -75,4 +72,4 @@ clean:
purge: distclean
distclean: clean
- - $(RM) ../Lib/libamd.a ../Lib/libamdf77.a
+ - $(RM) libamd.a libamdf77.a
diff --git a/src/C/SuiteSparse/AMD/Lib/Makefile b/src/C/SuiteSparse/AMD/Lib/Makefile
index 8e0f197..ac3424e 100644
--- a/src/C/SuiteSparse/AMD/Lib/Makefile
+++ b/src/C/SuiteSparse/AMD/Lib/Makefile
@@ -8,9 +8,9 @@
default: everything
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
+C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
everything:
$(C) -DDINT -c ../Source/amd_aat.c -o amd_i_aat.o
@@ -26,7 +26,7 @@ everything:
$(C) -DDINT -c ../Source/amd_valid.c -o amd_i_valid.o
$(C) -DDINT -c ../Source/amd_preprocess.c -o amd_i_preprocess.o
$(C) -DDLONG -c ../Source/amd_aat.c -o amd_l_aat.o
- $(C) -DDLONG -c ../Source/amd_1.c -o ../Source/amd_l_1.o
+ $(C) -DDLONG -c ../Source/amd_1.c -o amd_l_1.o
$(C) -DDLONG -c ../Source/amd_2.c -o amd_l_2.o
$(C) -DDLONG -c ../Source/amd_dump.c -o amd_l_dump.o
$(C) -DDLONG -c ../Source/amd_postorder.c -o amd_l_postorder.o
@@ -37,13 +37,13 @@ everything:
$(C) -DDLONG -c ../Source/amd_info.c -o amd_l_info.o
$(C) -DDLONG -c ../Source/amd_valid.c -o amd_l_valid.o
$(C) -DDLONG -c ../Source/amd_preprocess.c -o amd_l_preprocess.o
- $(C) -c ../Source/amd_global.c
- $(AR) ../Lib/libamd.a amd_i_aat.o amd_i_1.o amd_i_2.o amd_i_dump.o \
+ $(ARCHIVE) ../Lib/libamd.a \
+ amd_i_aat.o amd_i_1.o amd_i_2.o amd_i_dump.o \
amd_i_postorder.o amd_i_post_tree.o amd_i_defaults.o amd_i_order.o \
amd_i_control.o amd_i_info.o amd_i_valid.o amd_l_aat.o amd_l_1.o \
amd_l_2.o amd_l_dump.o amd_l_postorder.o amd_l_post_tree.o \
amd_l_defaults.o amd_l_order.o amd_l_control.o amd_l_info.o \
- amd_l_valid.o amd_i_preprocess.o amd_l_preprocess.o amd_global.o
+ amd_l_valid.o amd_i_preprocess.o amd_l_preprocess.o
- $(RANLIB) ../Lib/libamd.a
#-------------------------------------------------------------------------------
@@ -53,7 +53,7 @@ everything:
fortran:
$(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o
$(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o
- $(AR) ../Lib/libamdf77.a amd.o amdbar.o
+ $(ARCHIVE) ../Lib/libamdf77.a amd.o amdbar.o
- $(RANLIB) ../Lib/libamdf77.a
#-------------------------------------------------------------------------------
diff --git a/src/C/SuiteSparse/AMD/Makefile b/src/C/SuiteSparse/AMD/Makefile
index ce727aa..0b1e01b 100644
--- a/src/C/SuiteSparse/AMD/Makefile
+++ b/src/C/SuiteSparse/AMD/Makefile
@@ -2,24 +2,20 @@
# AMD Makefile (for GNU Make or original make)
#------------------------------------------------------------------------------
-default: demo
+VERSION = 2.4.1
-include ../UFconfig/UFconfig.mk
+default: all
-# Compile all C code, including the C-callable routines.
-# Do not compile the FORTRAN versions, or MATLAB interface.
-demo:
- ( cd Lib ; $(MAKE) )
- ( cd Demo ; $(MAKE) )
+include ../SuiteSparse_config/SuiteSparse_config.mk
+
+demos: all
-# Compile all C code, including the C-callable routine and the mexFunctions.
-# Do not compile the FORTRAN versions.
+# Compile all C code. Do not compile the FORTRAN versions.
all:
( cd Lib ; $(MAKE) )
( cd Demo ; $(MAKE) )
- ( cd MATLAB ; $(MAKE) )
-# compile just the C-callable libraries (not mexFunctions or Demos)
+# compile just the C-callable libraries (not Demos)
library:
( cd Lib ; $(MAKE) )
@@ -37,20 +33,20 @@ cross:
clean:
( cd Lib ; $(MAKE) clean )
( cd Demo ; $(MAKE) clean )
- ( cd MATLAB ; $(MAKE) clean )
+ ( cd MATLAB ; $(RM) $(CLEAN) )
( cd Doc ; $(MAKE) clean )
# clean, and then remove compiled programs and library archives
purge:
( cd Lib ; $(MAKE) purge )
( cd Demo ; $(MAKE) purge )
- ( cd MATLAB ; $(MAKE) purge )
+ ( cd MATLAB ; $(RM) $(CLEAN) ; $(RM) *.mex* )
( cd Doc ; $(MAKE) purge )
distclean: purge
# create PDF documents for the original distribution
-doc:
+docs:
( cd Doc ; $(MAKE) )
# get ready for distribution
@@ -62,6 +58,16 @@ ccode: library
lib: library
-# compile the MATLAB mexFunction
-mex:
- ( cd MATLAB ; $(MAKE) )
+# install AMD
+install:
+ $(CP) Lib/libamd.a $(INSTALL_LIB)/libamd.$(VERSION).a
+ ( cd $(INSTALL_LIB) ; ln -sf libamd.$(VERSION).a libamd.a )
+ $(CP) Include/amd.h $(INSTALL_INCLUDE)
+ chmod 644 $(INSTALL_LIB)/libamd*
+ chmod 644 $(INSTALL_INCLUDE)/amd.h
+
+# uninstall AMD
+uninstall:
+ $(RM) $(INSTALL_LIB)/libamd*.a
+ $(RM) $(INSTALL_INCLUDE)/amd.h
+
diff --git a/src/C/SuiteSparse/AMD/README.txt b/src/C/SuiteSparse/AMD/README.txt
index c6fd2e0..f6c970d 100644
--- a/src/C/SuiteSparse/AMD/README.txt
+++ b/src/C/SuiteSparse/AMD/README.txt
@@ -1,32 +1,30 @@
-AMD Version 2.2, Copyright (c) 2007 by Timothy A.
-Davis, Patrick R. Amestoy, and Iain S. Duff. All Rights Reserved.
-AMD is available under alternate licences; contact T. Davis for details.
+AMD, Copyright (c) 2009-2013 by Timothy A. Davis (http://www.suitesparse.com),
+Patrick R. Amestoy, and Iain S. Duff. All Rights Reserved. AMD is available
+under alternate licences; contact T. Davis for details.
AMD: a set of routines for permuting sparse matrices prior to
factorization. Includes a version in C, a version in Fortran, and a MATLAB
mexFunction.
-Requires UFconfig, in the ../UFconfig directory relative to this directory.
+Requires SuiteSparse_config, in the ../SuiteSparse_config directory relative to
+this directory.
Quick start (Unix, or Windows with Cygwin):
To compile, test, and install AMD, you may wish to first configure the
- installation by editting the ../UFconfig/UFconfig.mk file. Next, cd to this
- directory (AMD) and type "make" (or "make lib" if you do not have MATLAB).
- To compile and run a demo program for the Fortran version, type
- "make fortran". When done, type "make clean" to remove unused *.o files
- (keeps the compiled libraries and demo programs). See the User Guide
- (Doc/AMD_UserGuide.pdf), or ../UFconfig/UFconfig.mk for more details.
+ installation by editting the ../SuiteSparse_config/SuiteSparse_config.mk
+ file. Next, cd to this directory (AMD) and type "make" (or "make lib" if
+ you do not have MATLAB). To compile and run a demo program for the Fortran
+ version, type "make fortran". When done, type "make clean" to remove
+ unused *.o files (keeps the compiled libraries and demo programs). See the
+ User Guide (Doc/AMD_UserGuide.pdf), or
+ ../SuiteSparse_config/SuiteSparse_config.mk for more details.
Quick start (for MATLAB users);
To compile, test, and install the AMD mexFunction, cd to the
AMD/MATLAB directory and type amd_make at the MATLAB prompt.
-If you have MATLAB 7.2 or earlier and use "make mex", you must first edit
-UFconfig/UFconfig.h to remove the "-largeArrayDims" option from the MEX command
-(or just use amd_make.m inside MATLAB).
-
-------------------------------------------------------------------------------
AMD License:
@@ -61,7 +59,7 @@ AMD License:
Availability:
- http://www.cise.ufl.edu/research/sparse/amd
+ http://www.suitesparse.com
-------------------------------------------------------------------------------
@@ -78,7 +76,7 @@ Description:
Authors:
- Timothy A. Davis (davis at cise.ufl.edu), University of Florida.
+ Timothy A. Davis (DrTimothyAldenDavis at gmail.com)
Patrick R. Amestory, ENSEEIHT, Toulouse, France.
Iain S. Duff, Rutherford Appleton Laboratory, UK.
@@ -171,7 +169,7 @@ Files and directories in the AMD distribution:
amd_demo2.c C demo program for AMD, jumbled matrix
amd_demo2.out output of amd_demo2.c
- amd_l_demo.c C demo program for AMD (UF_long version)
+ amd_l_demo.c C demo program for AMD (long integer version)
amd_l_demo.out output of amd_l_demo.c
amd_simple.c simple C demo program for AMD
diff --git a/src/C/SuiteSparse/AMD/Source/amd_1.c b/src/C/SuiteSparse/AMD/Source/amd_1.c
index 30cb277..2be486e 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_1.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_1.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* AMD_1: Construct A+A' for a sparse matrix A and perform the AMD ordering.
diff --git a/src/C/SuiteSparse/AMD/Source/amd_2.c b/src/C/SuiteSparse/AMD/Source/amd_2.c
index 97b4f7a..f144722 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_2.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_2.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* AMD_2: performs the AMD ordering on a symmetric sparse matrix A, followed
@@ -120,9 +119,9 @@ GLOBAL void AMD_2
* ouput. Many of these functions are also provided by the Fortran
* Harwell Subroutine Library routine MC47A.
*
- * (6) both int and UF_long versions are provided. In the descriptions below
- * and integer is and int or UF_long depending on which version is
- * being used.
+ * (6) both int and SuiteSparse_long versions are provided. In the
+ * descriptions below and integer is and int or SuiteSparse_long depending
+ * on which version is being used.
**********************************************************************
***** CAUTION: ARGUMENTS ARE NOT CHECKED FOR ERRORS ON INPUT. ******
@@ -495,8 +494,9 @@ GLOBAL void AMD_2
* nvj: the number of variables in a supervariable j (= Nv [j])
* nvpiv: number of pivots in current element
* slenme: number of variables in variable list of pivotal variable
- * wbig: = INT_MAX - n for the int version, UF_long_max - n for the
- * UF_long version. wflg is not allowed to be >= wbig.
+ * wbig: = (INT_MAX - n) for the int version, (SuiteSparse_long_max - n)
+ * for the SuiteSparse_long version. wflg is not allowed to
+ * be >= wbig.
* we: W [e]
* wflg: used for flagging the W array. See description of Iw.
* wnvi: wflg - Nv [i]
diff --git a/src/C/SuiteSparse/AMD/Source/amd_aat.c b/src/C/SuiteSparse/AMD/Source/amd_aat.c
index 4f02b75..67c03f7 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_aat.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_aat.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* AMD_aat: compute the symmetry of the pattern of A, and count the number of
diff --git a/src/C/SuiteSparse/AMD/Source/amd_control.c b/src/C/SuiteSparse/AMD/Source/amd_control.c
index c2aec9f..f6a5e9a 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_control.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_control.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* User-callable. Prints the control parameters for AMD. See amd.h
@@ -35,17 +34,18 @@ GLOBAL void AMD_control
aggressive = AMD_DEFAULT_AGGRESSIVE ;
}
- PRINTF (("\nAMD version %d.%d.%d, %s: approximate minimum degree ordering\n"
+ SUITESPARSE_PRINTF ((
+ "\nAMD version %d.%d.%d, %s: approximate minimum degree ordering\n"
" dense row parameter: %g\n", AMD_MAIN_VERSION, AMD_SUB_VERSION,
AMD_SUBSUB_VERSION, AMD_DATE, alpha)) ;
if (alpha < 0)
{
- PRINTF ((" no rows treated as dense\n")) ;
+ SUITESPARSE_PRINTF ((" no rows treated as dense\n")) ;
}
else
{
- PRINTF ((
+ SUITESPARSE_PRINTF ((
" (rows with more than max (%g * sqrt (n), 16) entries are\n"
" considered \"dense\", and placed last in output permutation)\n",
alpha)) ;
@@ -53,12 +53,12 @@ GLOBAL void AMD_control
if (aggressive)
{
- PRINTF ((" aggressive absorption: yes\n")) ;
+ SUITESPARSE_PRINTF ((" aggressive absorption: yes\n")) ;
}
else
{
- PRINTF ((" aggressive absorption: no\n")) ;
+ SUITESPARSE_PRINTF ((" aggressive absorption: no\n")) ;
}
- PRINTF ((" size of AMD integer: %d\n\n", sizeof (Int))) ;
+ SUITESPARSE_PRINTF ((" size of AMD integer: %d\n\n", sizeof (Int))) ;
}
diff --git a/src/C/SuiteSparse/AMD/Source/amd_defaults.c b/src/C/SuiteSparse/AMD/Source/amd_defaults.c
index ffe3f4b..b9a9079 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_defaults.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_defaults.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* User-callable. Sets default control parameters for AMD. See amd.h
diff --git a/src/C/SuiteSparse/AMD/Source/amd_dump.c b/src/C/SuiteSparse/AMD/Source/amd_dump.c
index 89d67b8..e58aaf5 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_dump.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_dump.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* Debugging routines for AMD. Not used if NDEBUG is not defined at compile-
diff --git a/src/C/SuiteSparse/AMD/Source/amd_global.c b/src/C/SuiteSparse/AMD/Source/amd_global.c
index 93f2b45..453e970 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_global.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_global.c
@@ -5,80 +5,10 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
-#include <stdlib.h>
-
-#ifdef MATLAB_MEX_FILE
-#include "mex.h"
-#include "matrix.h"
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-/* ========================================================================= */
-/* === Default AMD memory manager ========================================== */
-/* ========================================================================= */
-
-/* The user can redefine these global pointers at run-time to change the memory
- * manager used by AMD. AMD only uses malloc and free; realloc and calloc are
- * include for completeness, in case another package wants to use the same
- * memory manager as AMD.
- *
- * If compiling as a MATLAB mexFunction, the default memory manager is mxMalloc.
- * You can also compile AMD as a standard ANSI-C library and link a mexFunction
- * against it, and then redefine these pointers at run-time, in your
- * mexFunction.
- *
- * If -DNMALLOC is defined at compile-time, no memory manager is specified at
- * compile-time. You must then define these functions at run-time, before
- * calling AMD, for AMD to work properly.
+/* In prior versions of AMD, this file declared the amd_malloc, amd_free,
+ amd_realloc, amd_calloc, and amd_printf functions. They are now replaced
+ by functions defined in SuiteSparse_config/SuiteSparse_config.c.
*/
-
-#ifndef NMALLOC
-#ifdef MATLAB_MEX_FILE
-/* MATLAB mexFunction: */
-void *(*amd_malloc) (size_t) = mxMalloc ;
-void (*amd_free) (void *) = mxFree ;
-void *(*amd_realloc) (void *, size_t) = mxRealloc ;
-void *(*amd_calloc) (size_t, size_t) = mxCalloc ;
-#else
-/* standard ANSI-C: */
-void *(*amd_malloc) (size_t) = malloc ;
-void (*amd_free) (void *) = free ;
-void *(*amd_realloc) (void *, size_t) = realloc ;
-void *(*amd_calloc) (size_t, size_t) = calloc ;
-#endif
-#else
-/* no memory manager defined at compile-time; you MUST define one at run-time */
-void *(*amd_malloc) (size_t) = NULL ;
-void (*amd_free) (void *) = NULL ;
-void *(*amd_realloc) (void *, size_t) = NULL ;
-void *(*amd_calloc) (size_t, size_t) = NULL ;
-#endif
-
-/* ========================================================================= */
-/* === Default AMD printf routine ========================================== */
-/* ========================================================================= */
-
-/* The user can redefine this global pointer at run-time to change the printf
- * routine used by AMD. If NULL, no printing occurs.
- *
- * If -DNPRINT is defined at compile-time, stdio.h is not included. Printing
- * can then be enabled at run-time by setting amd_printf to a non-NULL function.
- */
-
-#ifndef NPRINT
-#ifdef MATLAB_MEX_FILE
-int (*amd_printf) (const char *, ...) = mexPrintf ;
-#else
-#include <stdio.h>
-int (*amd_printf) (const char *, ...) = printf ;
-#endif
-#else
-int (*amd_printf) (const char *, ...) = NULL ;
-#endif
diff --git a/src/C/SuiteSparse/AMD/Source/amd_info.c b/src/C/SuiteSparse/AMD/Source/amd_info.c
index 0a842ad..062651f 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_info.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_info.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* User-callable. Prints the output statistics for AMD. See amd.h
@@ -15,7 +14,7 @@
#include "amd_internal.h"
-#define PRI(format,x) { if (x >= 0) { PRINTF ((format, x)) ; }}
+#define PRI(format,x) { if (x >= 0) { SUITESPARSE_PRINTF ((format, x)) ; }}
GLOBAL void AMD_info
(
@@ -24,7 +23,7 @@ GLOBAL void AMD_info
{
double n, ndiv, nmultsubs_ldl, nmultsubs_lu, lnz, lnzd ;
- PRINTF (("\nAMD version %d.%d.%d, %s, results:\n",
+ SUITESPARSE_PRINTF (("\nAMD version %d.%d.%d, %s, results:\n",
AMD_MAIN_VERSION, AMD_SUB_VERSION, AMD_SUBSUB_VERSION, AMD_DATE)) ;
if (!Info)
@@ -40,26 +39,26 @@ GLOBAL void AMD_info
lnzd = (n >= 0 && lnz >= 0) ? (n + lnz) : (-1) ;
/* AMD return status */
- PRINTF ((" status: ")) ;
+ SUITESPARSE_PRINTF ((" status: ")) ;
if (Info [AMD_STATUS] == AMD_OK)
{
- PRINTF (("OK\n")) ;
+ SUITESPARSE_PRINTF (("OK\n")) ;
}
else if (Info [AMD_STATUS] == AMD_OUT_OF_MEMORY)
{
- PRINTF (("out of memory\n")) ;
+ SUITESPARSE_PRINTF (("out of memory\n")) ;
}
else if (Info [AMD_STATUS] == AMD_INVALID)
{
- PRINTF (("invalid matrix\n")) ;
+ SUITESPARSE_PRINTF (("invalid matrix\n")) ;
}
else if (Info [AMD_STATUS] == AMD_OK_BUT_JUMBLED)
{
- PRINTF (("OK, but jumbled\n")) ;
+ SUITESPARSE_PRINTF (("OK, but jumbled\n")) ;
}
else
{
- PRINTF (("unknown\n")) ;
+ SUITESPARSE_PRINTF (("unknown\n")) ;
}
/* statistics about the input matrix */
@@ -82,7 +81,7 @@ GLOBAL void AMD_info
Info [AMD_NCMPA]) ;
/* statistics about the ordering quality */
- PRINTF (("\n"
+ SUITESPARSE_PRINTF (("\n"
" The following approximate statistics are for a subsequent\n"
" factorization of A(P,P) + A(P,P)'. They are slight upper\n"
" bounds if there are no dense rows/columns in A+A', and become\n"
@@ -105,7 +104,7 @@ GLOBAL void AMD_info
if (n >= 0 && ndiv >= 0 && nmultsubs_ldl >= 0 && nmultsubs_lu >= 0)
{
- PRINTF (("\n"
+ SUITESPARSE_PRINTF (("\n"
" chol flop count for real A, sqrt counted as 1 flop: %.20g\n"
" LDL' flop count for real A: %.20g\n"
" LDL' flop count for complex A: %.20g\n"
diff --git a/src/C/SuiteSparse/AMD/Source/amd_order.c b/src/C/SuiteSparse/AMD/Source/amd_order.c
index d3f6853..7f199ae 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_order.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_order.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* User-callable AMD minimum degree ordering routine. See amd.h for
@@ -90,15 +89,15 @@ GLOBAL Int AMD_order
}
/* allocate two size-n integer workspaces */
- Len = amd_malloc (n * sizeof (Int)) ;
- Pinv = amd_malloc (n * sizeof (Int)) ;
+ Len = SuiteSparse_malloc (n, sizeof (Int)) ;
+ Pinv = SuiteSparse_malloc (n, sizeof (Int)) ;
mem += n ;
mem += n ;
if (!Len || !Pinv)
{
/* :: out of memory :: */
- amd_free (Len) ;
- amd_free (Pinv) ;
+ SuiteSparse_free (Len) ;
+ SuiteSparse_free (Pinv) ;
if (info) Info [AMD_STATUS] = AMD_OUT_OF_MEMORY ;
return (AMD_OUT_OF_MEMORY) ;
}
@@ -107,17 +106,17 @@ GLOBAL Int AMD_order
{
/* sort the input matrix and remove duplicate entries */
AMD_DEBUG1 (("Matrix is jumbled\n")) ;
- Rp = amd_malloc ((n+1) * sizeof (Int)) ;
- Ri = amd_malloc (MAX (nz,1) * sizeof (Int)) ;
+ Rp = SuiteSparse_malloc (n+1, sizeof (Int)) ;
+ Ri = SuiteSparse_malloc (nz, sizeof (Int)) ;
mem += (n+1) ;
mem += MAX (nz,1) ;
if (!Rp || !Ri)
{
/* :: out of memory :: */
- amd_free (Rp) ;
- amd_free (Ri) ;
- amd_free (Len) ;
- amd_free (Pinv) ;
+ SuiteSparse_free (Rp) ;
+ SuiteSparse_free (Ri) ;
+ SuiteSparse_free (Len) ;
+ SuiteSparse_free (Pinv) ;
if (info) Info [AMD_STATUS] = AMD_OUT_OF_MEMORY ;
return (AMD_OUT_OF_MEMORY) ;
}
@@ -161,16 +160,16 @@ GLOBAL Int AMD_order
ok = ok && (slen < Int_MAX) ; /* S[i] for Int i must be OK */
if (ok)
{
- S = amd_malloc (slen * sizeof (Int)) ;
+ S = SuiteSparse_malloc (slen, sizeof (Int)) ;
}
AMD_DEBUG1 (("slen %g\n", (double) slen)) ;
if (!S)
{
/* :: out of memory :: (or problem too large) */
- amd_free (Rp) ;
- amd_free (Ri) ;
- amd_free (Len) ;
- amd_free (Pinv) ;
+ SuiteSparse_free (Rp) ;
+ SuiteSparse_free (Ri) ;
+ SuiteSparse_free (Len) ;
+ SuiteSparse_free (Pinv) ;
if (info) Info [AMD_STATUS] = AMD_OUT_OF_MEMORY ;
return (AMD_OUT_OF_MEMORY) ;
}
@@ -190,11 +189,11 @@ GLOBAL Int AMD_order
/* free the workspace */
/* --------------------------------------------------------------------- */
- amd_free (Rp) ;
- amd_free (Ri) ;
- amd_free (Len) ;
- amd_free (Pinv) ;
- amd_free (S) ;
+ SuiteSparse_free (Rp) ;
+ SuiteSparse_free (Ri) ;
+ SuiteSparse_free (Len) ;
+ SuiteSparse_free (Pinv) ;
+ SuiteSparse_free (S) ;
if (info) Info [AMD_STATUS] = status ;
return (status) ; /* successful ordering */
}
diff --git a/src/C/SuiteSparse/AMD/Source/amd_post_tree.c b/src/C/SuiteSparse/AMD/Source/amd_post_tree.c
index b4e063d..516c95c 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_post_tree.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_post_tree.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* Post-ordering of a supernodal elimination tree. */
diff --git a/src/C/SuiteSparse/AMD/Source/amd_postorder.c b/src/C/SuiteSparse/AMD/Source/amd_postorder.c
index 4adcea3..e5aea7b 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_postorder.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_postorder.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* Perform a postordering (via depth-first search) of an assembly tree. */
diff --git a/src/C/SuiteSparse/AMD/Source/amd_preprocess.c b/src/C/SuiteSparse/AMD/Source/amd_preprocess.c
index 86ea07f..a8139c3 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_preprocess.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_preprocess.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* Sorts, removes duplicate entries, and transposes from the nonzero pattern of
diff --git a/src/C/SuiteSparse/AMD/Source/amd_valid.c b/src/C/SuiteSparse/AMD/Source/amd_valid.c
index 4d05925..609abca 100644
--- a/src/C/SuiteSparse/AMD/Source/amd_valid.c
+++ b/src/C/SuiteSparse/AMD/Source/amd_valid.c
@@ -5,8 +5,7 @@
/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
-/* email: davis at cise.ufl.edu CISE Department, Univ. of Florida. */
-/* web: http://www.cise.ufl.edu/research/sparse/amd */
+/* email: DrTimothyAldenDavis at gmail.com */
/* ------------------------------------------------------------------------- */
/* Check if a column-form matrix is valid or not. The matrix A is
diff --git a/src/C/SuiteSparse/CHOLMOD/Check/License.txt b/src/C/SuiteSparse/CHOLMOD/Check/License.txt
index 8a20b17..ba50e66 100644
--- a/src/C/SuiteSparse/CHOLMOD/Check/License.txt
+++ b/src/C/SuiteSparse/CHOLMOD/Check/License.txt
@@ -1,6 +1,6 @@
CHOLMOD/Check Module. Copyright (C) 2005-2006, Timothy A. Davis
CHOLMOD is also available under other licenses; contact authors for details.
-http://www.cise.ufl.edu/research/sparse
+http://www.suitesparse.com
Note that this license is for the CHOLMOD/Check module only.
All CHOLMOD modules are licensed separately.
diff --git a/src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c b/src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c
index ddf24b5..4fa9cd2 100644
--- a/src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c
+++ b/src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c
@@ -3,11 +3,10 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Check Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * CHOLMOD/Check Module. Copyright (C) 2005-2013, Timothy A. Davis
* The CHOLMOD/Check Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Routines to check and print the contents of the 5 CHOLMOD objects:
@@ -55,7 +54,7 @@
* Common->precise controls the # of digits printed for numerical entries
* (5 if FALSE, 15 if TRUE).
*
- * If Common->print_function is NULL, then no printing occurs. The
+ * If SuiteSparse_config.printf_func is NULL, then no printing occurs. The
* cholmod_check_* and cholmod_print_* routines still check their inputs and
* return TRUE/FALSE if the object is valid or not.
*
@@ -82,9 +81,9 @@
#define PR(i,format,arg) \
{ \
- if (print >= i && Common->print_function != NULL) \
+ if (print >= i && SuiteSparse_config.printf_func != NULL) \
{ \
- (Common->print_function) (format, arg) ; \
+ SuiteSparse_config.printf_func (format, arg) ; \
} \
}
@@ -204,7 +203,7 @@ static int check_common
double fl, lnz ;
double *Xwork ;
Int *Flag, *Head ;
- UF_long mark ;
+ SuiteSparse_long mark ;
Int i, nrow, nmethods, ordering, xworksize, amd_backup, init_print ;
const char *type = "common" ;
@@ -249,6 +248,10 @@ static int check_common
P1 ("%s", "status: ERROR, method not installed\n") ;
break ;
+ case CHOLMOD_GPU_PROBLEM:
+ P1 ("%s", "status: ERROR, GPU had a fatal error\n") ;
+ break ;
+
case CHOLMOD_NOT_POSDEF:
P1 ("%s", "status: warning, matrix not positive definite\n") ;
break ;
@@ -263,7 +266,7 @@ static int check_common
P2 (" Architecture: %s\n", CHOLMOD_ARCHITECTURE) ;
P3 (" sizeof(int): %d\n", (int) sizeof (int)) ;
- P3 (" sizeof(UF_long): %d\n", (int) sizeof (UF_long)) ;
+ P3 (" sizeof(SuiteSparse_long): %d\n", (int) sizeof (SuiteSparse_long));
P3 (" sizeof(void *): %d\n", (int) sizeof (void *)) ;
P3 (" sizeof(double): %d\n", (int) sizeof (double)) ;
P3 (" sizeof(Int): %d (CHOLMOD's basic integer)\n", (int) sizeof (Int)) ;
@@ -594,6 +597,59 @@ int CHOLMOD(print_common)
/* ========================================================================== */
+/* === cholmod_gpu_stats ==================================================== */
+/* ========================================================================== */
+
+/* Print CPU / GPU statistics. If the timer is not installed, the times are
+ reported as zero, but this function still works. Likewise, the function
+ still works if the GPU BLAS is not installed. */
+
+int CHOLMOD(gpu_stats)
+(
+ cholmod_common *Common /* input */
+)
+{
+ double cpu_time, gpu_time ;
+ int print ;
+
+ RETURN_IF_NULL_COMMON (FALSE) ;
+ print = Common->print ;
+
+ P2 ("%s", "\nCHOLMOD GPU/CPU statistics:\n") ;
+ P2 ("SYRK CPU calls %12.0f", (double) Common->CHOLMOD_CPU_SYRK_CALLS) ;
+ P2 (" time %12.4e\n", Common->CHOLMOD_CPU_SYRK_TIME) ;
+ P2 (" GPU calls %12.0f", (double) Common->CHOLMOD_GPU_SYRK_CALLS) ;
+ P2 (" time %12.4e\n", Common->CHOLMOD_GPU_SYRK_TIME) ;
+ P2 ("GEMM CPU calls %12.0f", (double) Common->CHOLMOD_CPU_GEMM_CALLS) ;
+ P2 (" time %12.4e\n", Common->CHOLMOD_CPU_GEMM_TIME) ;
+ P2 (" GPU calls %12.0f", (double) Common->CHOLMOD_GPU_GEMM_CALLS) ;
+ P2 (" time %12.4e\n", Common->CHOLMOD_GPU_GEMM_TIME) ;
+ P2 ("POTRF CPU calls %12.0f", (double) Common->CHOLMOD_CPU_POTRF_CALLS) ;
+ P2 (" time %12.4e\n", Common->CHOLMOD_CPU_POTRF_TIME) ;
+ P2 (" GPU calls %12.0f", (double) Common->CHOLMOD_GPU_POTRF_CALLS) ;
+ P2 (" time %12.4e\n", Common->CHOLMOD_GPU_POTRF_TIME) ;
+ P2 ("TRSM CPU calls %12.0f", (double) Common->CHOLMOD_CPU_TRSM_CALLS) ;
+ P2 (" time %12.4e\n", Common->CHOLMOD_CPU_TRSM_TIME) ;
+ P2 (" GPU calls %12.0f", (double) Common->CHOLMOD_GPU_TRSM_CALLS) ;
+ P2 (" time %12.4e\n", Common->CHOLMOD_GPU_TRSM_TIME) ;
+
+ cpu_time = Common->CHOLMOD_CPU_SYRK_TIME + Common->CHOLMOD_CPU_TRSM_TIME +
+ Common->CHOLMOD_CPU_GEMM_TIME + Common->CHOLMOD_CPU_POTRF_TIME ;
+
+ gpu_time = Common->CHOLMOD_GPU_SYRK_TIME + Common->CHOLMOD_GPU_TRSM_TIME +
+ Common->CHOLMOD_GPU_GEMM_TIME + Common->CHOLMOD_GPU_POTRF_TIME ;
+
+ P2 ("time in the BLAS: CPU %12.4e", cpu_time) ;
+ P2 (" GPU %12.4e", gpu_time) ;
+ P2 (" total: %12.4e\n", cpu_time + gpu_time) ;
+
+ P2 ("assembly time %12.4e", Common->CHOLMOD_ASSEMBLE_TIME) ;
+ P2 (" %12.4e\n", Common->CHOLMOD_ASSEMBLE_TIME2) ;
+ return (TRUE) ;
+}
+
+
+/* ========================================================================== */
/* === cholmod_check_sparse ================================================= */
/* ========================================================================== */
@@ -603,13 +659,13 @@ int CHOLMOD(print_common)
* workspace: Iwork (nrow)
*/
-static UF_long check_sparse
+static SuiteSparse_long check_sparse
(
Int *Wi,
Int print,
const char *name,
cholmod_sparse *A,
- UF_long *nnzdiag,
+ SuiteSparse_long *nnzdiag,
cholmod_common *Common
)
{
@@ -683,8 +739,9 @@ static UF_long check_sparse
switch (A->itype)
{
case CHOLMOD_INT: P4 ("%s", "\n scalar types: int, ") ; break ;
- case CHOLMOD_INTLONG: ERR ("mixed int/UF_long type unsupported") ;
- case CHOLMOD_LONG: P4 ("%s", "\n scalar types: UF_long, ") ; break ;
+ case CHOLMOD_INTLONG: ERR ("mixed int/long type unsupported") ;
+ case CHOLMOD_LONG: P4 ("%s", "\n scalar types: SuiteSparse_long, ");
+ break ;
default: ERR ("unknown itype") ;
}
@@ -861,7 +918,7 @@ int CHOLMOD(check_sparse)
cholmod_common *Common
)
{
- UF_long nnzdiag ;
+ SuiteSparse_long nnzdiag ;
RETURN_IF_NULL_COMMON (FALSE) ;
Common->status = CHOLMOD_OK ;
return (check_sparse (NULL, 0, NULL, A, &nnzdiag, Common)) ;
@@ -877,7 +934,7 @@ int CHOLMOD(print_sparse)
cholmod_common *Common
)
{
- UF_long nnzdiag ;
+ SuiteSparse_long nnzdiag ;
RETURN_IF_NULL_COMMON (FALSE) ;
Common->status = CHOLMOD_OK ;
return (check_sparse (NULL, Common->print, name, A, &nnzdiag, Common)) ;
@@ -1039,7 +1096,7 @@ int CHOLMOD(print_dense)
static int check_subset
(
Int *S,
- UF_long len,
+ SuiteSparse_long len,
size_t n,
Int print,
const char *name,
@@ -1115,7 +1172,7 @@ int CHOLMOD(check_subset)
(
/* ---- input ---- */
Int *Set, /* Set [0:len-1] is a subset of 0:n-1. Duplicates OK */
- UF_long len, /* size of Set (an integer array), or < 0 if 0:n-1 */
+ SuiteSparse_long len, /* size of Set (an integer array), or < 0 if 0:n-1 */
size_t n, /* 0:n-1 is valid range */
/* --------------- */
cholmod_common *Common
@@ -1131,7 +1188,7 @@ int CHOLMOD(print_subset)
(
/* ---- input ---- */
Int *Set, /* Set [0:len-1] is a subset of 0:n-1. Duplicates OK */
- UF_long len, /* size of Set (an integer array), or < 0 if 0:n-1 */
+ SuiteSparse_long len, /* size of Set (an integer array), or < 0 if 0:n-1 */
size_t n, /* 0:n-1 is valid range */
const char *name, /* printed name of Set */
/* --------------- */
@@ -1447,7 +1504,7 @@ static int check_factor
count, precise, init_print, ilast, lnz, head, tail, jprev, plast,
jnext, examine_super, nsuper, s, k1, k2, psi, psend, psx, nsrow, nscol,
ps2, psxend, ssize, xsize, maxcsize, maxesize, nsrow2, jj, ii, xtype ;
- Int for_cholesky ;
+ Int check_Lpx ;
const char *type = "factor" ;
/* ---------------------------------------------------------------------- */
@@ -1488,8 +1545,9 @@ static int check_factor
switch (L->itype)
{
case CHOLMOD_INT: P4 ("%s", "\n scalar types: int, ") ; break ;
- case CHOLMOD_INTLONG: ERR ("mixed int/UF_long type unsupported") ;
- case CHOLMOD_LONG: P4 ("%s", "\n scalar types: UF_long, ") ; break ;
+ case CHOLMOD_INTLONG: ERR ("mixed int/long type unsupported") ;
+ case CHOLMOD_LONG: P4 ("%s", "\n scalar types: SuiteSparse_long, ");
+ break ;
default: ERR ("unknown itype") ;
}
@@ -1833,8 +1891,11 @@ static int check_factor
ERR ("invalid: L->pi invalid") ;
}
- for_cholesky = (Lpx [0] != 123456) ;
- if (for_cholesky && (Lpx [0] != 0 || MAX (1, Lpx[nsuper]) != xsize))
+ /* If Lpx [0] is 123456, then supernodes are present but
+ Lpx [0...nsuper] is not defined, so don't check it. This is
+ used in the non-GPU accelerated SPQR */
+ check_Lpx = (Lpx [0] != 123456) ;
+ if (check_Lpx && (Lpx [0] != 0 || MAX (1, Lpx[nsuper]) != xsize))
{
ERR ("invalid: L->px invalid") ;
}
@@ -1851,7 +1912,7 @@ static int check_factor
nsrow2 = nsrow - nscol ;
ps2 = psi + nscol ;
- if (for_cholesky)
+ if (check_Lpx)
{
psx = Lpx [s] ;
psxend = Lpx [s+1] ;
@@ -1864,14 +1925,14 @@ static int check_factor
P4 ("to "ID". ", k2-1) ;
P4 ("nz in first col: "ID".\n", nsrow) ;
- if (for_cholesky)
+ if (check_Lpx)
{
P4 (" values start "ID", ", psx) ;
P4 ("end "ID"\n", psxend) ;
}
if (k1 > k2 || k1 < 0 || k2 > n || nsrow < nscol || nsrow2 < 0
- || (for_cholesky && psxend - psx != nsrow * nscol))
+ || (check_Lpx && psxend - psx != nsrow * nscol))
{
ERR ("invalid supernode") ;
}
@@ -2060,8 +2121,9 @@ static int check_triplet
switch (T->itype)
{
case CHOLMOD_INT: P4 ("%s", "\n scalar types: int, ") ; break ;
- case CHOLMOD_INTLONG: ERR ("mixed int/UF_long type unsupported") ;
- case CHOLMOD_LONG: P4 ("%s", "\n scalar types: UF_long, ") ; break ;
+ case CHOLMOD_INTLONG: ERR ("mixed int/long type unsupported") ;
+ case CHOLMOD_LONG: P4 ("%s", "\n scalar types: SuiteSparse_long, ");
+ break ;
default: ERR ("unknown itype") ;
}
@@ -2195,15 +2257,13 @@ int CHOLMOD(dump_malloc) = -1 ;
void CHOLMOD(dump_init) (const char *s, cholmod_common *Common)
{
+ int i = 0 ;
FILE *f ;
f = fopen ("debug", "r") ;
- if (f == NULL)
+ CHOLMOD(dump) = 0 ;
+ if (f != NULL)
{
- CHOLMOD(dump) = 0 ;
- }
- else
- {
- fscanf (f, "%d", &CHOLMOD(dump)) ;
+ i = fscanf (f, "%d", &CHOLMOD(dump)) ;
fclose (f) ;
}
PRINT1 (("%s: cholmod_dump_init, D = %d\n", s, CHOLMOD(dump))) ;
@@ -2214,7 +2274,9 @@ void CHOLMOD(dump_init) (const char *s, cholmod_common *Common)
/* === cholmod_dump_sparse ================================================== */
/* ========================================================================== */
-UF_long CHOLMOD(dump_sparse) /* returns nnz (diag (A)) or EMPTY if error */
+/* returns nnz (diag (A)) or EMPTY if error */
+
+SuiteSparse_long CHOLMOD(dump_sparse)
(
cholmod_sparse *A,
const char *name,
@@ -2222,7 +2284,7 @@ UF_long CHOLMOD(dump_sparse) /* returns nnz (diag (A)) or EMPTY if error */
)
{
Int *Wi ;
- UF_long nnzdiag ;
+ SuiteSparse_long nnzdiag ;
Int ok ;
if (CHOLMOD(dump) < -1)
@@ -2391,12 +2453,12 @@ int CHOLMOD(dump_parent)
void CHOLMOD(dump_real)
(
const char *name,
- Real *X, UF_long nrow, UF_long ncol, int lower, int xentry,
- cholmod_common *Common
+ Real *X, SuiteSparse_long nrow, SuiteSparse_long ncol, int lower,
+ int xentry, cholmod_common *Common
)
{
/* dump an nrow-by-ncol real dense matrix */
- UF_long i, j ;
+ SuiteSparse_long i, j ;
double x, z ;
if (CHOLMOD(dump) < -1)
{
@@ -2438,7 +2500,7 @@ void CHOLMOD(dump_real)
void CHOLMOD(dump_super)
(
- UF_long s,
+ SuiteSparse_long s,
Int *Super, Int *Lpi, Int *Ls, Int *Lpx, double *Lx,
int xentry,
cholmod_common *Common
@@ -2485,11 +2547,11 @@ void CHOLMOD(dump_super)
int CHOLMOD(dump_mem)
(
const char *where,
- UF_long should,
+ SuiteSparse_long should,
cholmod_common *Common
)
{
- UF_long diff = should - Common->memory_inuse ;
+ SuiteSparse_long diff = should - Common->memory_inuse ;
if (diff != 0)
{
PRINT0 (("mem: %-15s peak %10g inuse %10g should %10g\n",
@@ -2512,12 +2574,12 @@ int CHOLMOD(dump_mem)
int CHOLMOD(dump_partition)
(
- UF_long n,
+ SuiteSparse_long n,
Int *Cp,
Int *Ci,
Int *Cnw,
Int *Part,
- UF_long sepsize,
+ SuiteSparse_long sepsize,
cholmod_common *Common
)
{
@@ -2574,7 +2636,7 @@ int CHOLMOD(dump_partition)
/* === cholmod_dump_work ==================================================== */
/* ========================================================================== */
-int CHOLMOD(dump_work) (int flag, int head, UF_long wsize,
+int CHOLMOD(dump_work) (int flag, int head, SuiteSparse_long wsize,
cholmod_common *Common)
{
double *W ;
diff --git a/src/C/SuiteSparse/CHOLMOD/Check/cholmod_read.c b/src/C/SuiteSparse/CHOLMOD/Check/cholmod_read.c
index 089f524..144fd60 100644
--- a/src/C/SuiteSparse/CHOLMOD/Check/cholmod_read.c
+++ b/src/C/SuiteSparse/CHOLMOD/Check/cholmod_read.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Check Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Read a sparse matrix in triplet or dense form. A triplet matrix can be
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/License.txt b/src/C/SuiteSparse/CHOLMOD/Cholesky/License.txt
index b444856..800ac5e 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/License.txt
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/License.txt
@@ -1,6 +1,6 @@
CHOLMOD/Cholesky module, Copyright (C) 2005-2006, Timothy A. Davis
CHOLMOD is also available under other licenses; contact authors for details.
-http://www.cise.ufl.edu/research/sparse
+http://www.suitesparse.com
Note that this license is for the CHOLMOD/Cholesky module only.
All CHOLMOD modules are licensed separately.
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_amd.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_amd.c
index 09f8ec1..f15d07b 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_amd.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_amd.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* CHOLMOD interface to the AMD ordering routine. Orders A if the matrix is
@@ -169,17 +168,6 @@ int CHOLMOD(amd)
Control [AMD_AGGRESSIVE] = Common->method [Common->current].aggressive ;
}
- /* AMD_2 does not use amd_malloc and amd_free, but set these pointers just
- * be safe. */
- amd_malloc = Common->malloc_memory ;
- amd_free = Common->free_memory ;
- amd_calloc = Common->calloc_memory ;
- amd_realloc = Common->realloc_memory ;
-
- /* AMD_2 doesn't print anything either, but future versions might,
- * so set the amd_printf pointer too. */
- amd_printf = Common->print_function ;
-
#ifdef LONG
amd_l2 (n, C->p, C->i, Len, C->nzmax, cnz, Nv, Next, Perm, Head, Elen,
Degree, Wi, Control, Info) ;
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_analyze.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_analyze.c
index 086d139..62f8606 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_analyze.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_analyze.c
@@ -3,11 +3,10 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Cholesky Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * CHOLMOD/Cholesky Module. Copyright (C) 2005-2013, Timothy A. Davis
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Order and analyze a matrix (either simplicial or supernodal), in prepartion
@@ -400,14 +399,14 @@ int CHOLMOD(analyze_ordering)
/* === cholmod_analyze_p2 =================================================== */
/* ========================================================================== */
-/* Ordering and analysis for sparse Cholesky or sparse QR. CHOLMOD itself
- * always uses for_cholesky = TRUE. The for_cholesky = FALSE option is
- * for SuiteSparseQR only. */
+/* Ordering and analysis for sparse Cholesky or sparse QR. */
cholmod_factor *CHOLMOD(analyze_p2)
(
/* ---- input ---- */
- int for_cholesky, /* if TRUE, then analyze for Cholesky; else for QR */
+ int for_whom, /* FOR_SPQR (0): for SPQR but not GPU-accelerated
+ FOR_CHOLESKY (1): for Cholesky (GPU or not)
+ FOR_SPQRGPU (2): for SPQR with GPU acceleration */
cholmod_sparse *A, /* matrix to order and analyze */
Int *UserPerm, /* user-provided permutation, size A->nrow */
Int *fset, /* subset of 0:(A->ncol)-1 */
@@ -454,7 +453,15 @@ cholmod_factor *CHOLMOD(analyze_p2)
skip_best = FALSE ;
nmethods = MIN (Common->nmethods, CHOLMOD_MAXMETHODS) ;
nmethods = MAX (0, nmethods) ;
- PRINT1 (("nmethods "ID"\n", nmethods)) ;
+
+#ifndef NDEBUG
+ PRINT1 (("cholmod_analyze_p2 :: nmethods "ID"\n", nmethods)) ;
+ for (method = 0 ; method < nmethods ; method++)
+ {
+ PRINT1 ((" "ID": ordering "ID"\n",
+ method, Common->method [method].ordering)) ;
+ }
+#endif
default_strategy = (nmethods == 0) ;
if (default_strategy)
@@ -816,7 +823,12 @@ cholmod_factor *CHOLMOD(analyze_p2)
* than CHOLMOD_OUT_OF_MEMORY, since the former implies something may
* be wrong with the user's input. CHOLMOD_OUT_OF_MEMORY is simply an
* indication of lack of resources. */
- ASSERT (status < CHOLMOD_OK) ;
+ if (status >= CHOLMOD_OK)
+ {
+ /* this can occur if nmethods = 1, ordering = CHOLMOD_GIVEN,
+ but UserPerm is NULL */
+ status = CHOLMOD_INVALID ;
+ }
ERROR (status, "all methods failed") ;
FREE_WORKSPACE_AND_RETURN ;
}
@@ -913,7 +925,7 @@ cholmod_factor *CHOLMOD(analyze_p2)
&A1, &A2, &S, &F, Common) ;
/* workspace: Flag (nrow), Head (nrow), Iwork (5*nrow) */
- CHOLMOD(super_symbolic2) (for_cholesky, S, F, Lparent, L, Common) ;
+ CHOLMOD(super_symbolic2) (for_whom, S, F, Lparent, L, Common) ;
PRINT1 (("status %d\n", Common->status)) ;
CHOLMOD(free_sparse) (&A1, Common) ;
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_colamd.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_colamd.c
index 1f20101..34046bc 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_colamd.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_colamd.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* CHOLMOD interface to the COLAMD ordering routine (version 2.4 or later).
@@ -119,9 +118,6 @@ int CHOLMOD(colamd)
/* allocate COLAMD workspace */
/* ---------------------------------------------------------------------- */
- /* colamd_printf is only available in colamd v2.4 or later */
- colamd_printf = Common->print_function ;
-
C = CHOLMOD(allocate_sparse) (ncol, nrow, alen, TRUE, TRUE, 0,
CHOLMOD_PATTERN, Common) ;
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_etree.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_etree.c
index 592cba8..0dcb85f 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_etree.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_etree.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Compute the elimination tree of A or A'*A
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_factorize.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_factorize.c
index 15544d3..884fdc7 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_factorize.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_factorize.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Computes the numerical factorization of a symmetric matrix. The primary
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_postorder.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_postorder.c
index 8629ad4..f66b1df 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_postorder.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_postorder.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Compute the postorder of a tree. */
@@ -139,7 +138,7 @@ static Int dfs /* return the new value of k */
* workspace: Head (n), Iwork (2*n)
*/
-UF_long CHOLMOD(postorder) /* return # of nodes postordered */
+SuiteSparse_long CHOLMOD(postorder) /* return # of nodes postordered */
(
/* ---- input ---- */
Int *Parent, /* size n. Parent [j] = p if p is the parent of j */
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rcond.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rcond.c
index 69f7412..f261e31 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rcond.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rcond.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Return a rough estimate of the reciprocal of the condition number:
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_resymbol.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_resymbol.c
index c1c0018..5b39cd9 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_resymbol.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_resymbol.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Recompute the symbolic pattern of L. Entries not in the symbolic pattern
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rowcolcounts.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rowcolcounts.c
index 62d5770..5b0290d 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rowcolcounts.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rowcolcounts.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Compute the row and column counts of the Cholesky factor L of the matrix
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rowfac.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rowfac.c
index 255bb9b..94ba960 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rowfac.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_rowfac.c
@@ -3,11 +3,10 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Cholesky Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * CHOLMOD/Cholesky Module. Copyright (C) 2005-2013, Timothy A. Davis
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Full or incremental numerical LDL' or LL' factorization (simplicial, not
@@ -357,12 +356,47 @@ int CHOLMOD(row_subtree)
/* ========================================================================== */
+/* === cholmod_lsolve_pattern =============================================== */
+/* ========================================================================== */
+
+/* Compute the nonzero pattern of Y=L\B. L must be simplicial, and B
+ * must be a single sparse column vector with B->stype = 0. The values of
+ * B are not used; it just specifies a nonzero pattern. The pattern of
+ * Y is not sorted, but is in topological order instead (suitable for a
+ * sparse forward/backsolve).
+ */
+
+int CHOLMOD(lsolve_pattern)
+(
+ /* ---- input ---- */
+ cholmod_sparse *B, /* sparse right-hand-side (a single sparse column) */
+ cholmod_factor *L, /* the factor L from which parent(i) is derived */
+ /* ---- output --- */
+ cholmod_sparse *Yset, /* pattern of Y=L\B, n-by-1 with Y->nzmax >= n */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ size_t krow ;
+ RETURN_IF_NULL (B, FALSE) ;
+ krow = B->nrow ;
+ return (CHOLMOD(row_lsubtree) (B, NULL, 0, krow, L, Yset, Common)) ;
+}
+
+
+/* ========================================================================== */
/* === cholmod_row_lsubtree ================================================= */
/* ========================================================================== */
/* Identical to cholmod_row_subtree, except that the elimination tree is
* obtained from L itself, as the first off-diagonal entry in each column.
- * L must be simplicial, not supernodal */
+ * L must be simplicial, not supernodal.
+ *
+ * If krow = A->nrow, then A must be a single sparse column vector, (A->stype
+ * must be zero), and the nonzero pattern of x=L\b is computed, where b=A(:,0)
+ * is the single sparse right-hand-side. The inputs Fi and fnz are ignored.
+ * See CHOLMOD(lsolve_pattern) above for a simpler interface for this case.
+ */
int CHOLMOD(row_lsubtree)
(
@@ -373,14 +407,14 @@ int CHOLMOD(row_lsubtree)
size_t krow, /* row k of L */
cholmod_factor *L, /* the factor L from which parent(i) is derived */
/* ---- output --- */
- cholmod_sparse *R, /* pattern of L(k,:), 1-by-n with R->nzmax >= n */
+ cholmod_sparse *R, /* pattern of L(k,:), n-by-1 with R->nzmax >= n */
/* --------------- */
cholmod_common *Common
)
{
Int *Rp, *Stack, *Flag, *Ap, *Ai, *Anz, *Lp, *Li, *Lnz ;
Int p, pend, parent, t, stype, nrow, k, pf, packed, sorted, top, len, i,
- mark ;
+ mark, ka ;
/* ---------------------------------------------------------------------- */
/* check inputs */
@@ -393,17 +427,46 @@ int CHOLMOD(row_lsubtree)
RETURN_IF_XTYPE_INVALID (A, CHOLMOD_PATTERN, CHOLMOD_ZOMPLEX, FALSE) ;
RETURN_IF_XTYPE_INVALID (R, CHOLMOD_PATTERN, CHOLMOD_ZOMPLEX, FALSE) ;
RETURN_IF_XTYPE_INVALID (L, CHOLMOD_REAL, CHOLMOD_ZOMPLEX, FALSE) ;
+
+ nrow = A->nrow ;
stype = A->stype ;
- if (stype == 0)
+ if (stype < 0)
{
- RETURN_IF_NULL (Fi, FALSE) ;
+ /* symmetric lower triangular form not supported */
+ ERROR (CHOLMOD_INVALID, "symmetric lower not supported") ;
+ return (FALSE) ;
}
- if (krow >= A->nrow)
+
+ if (krow > nrow)
{
- ERROR (CHOLMOD_INVALID, "lsubtree: k invalid") ;
- return (FALSE) ;
+ ERROR (CHOLMOD_INVALID, "lsubtree: krow invalid") ;
+ return (FALSE) ;
}
- if (R->ncol != 1 || A->nrow != R->nrow || A->nrow > R->nzmax)
+ else if (krow == nrow)
+ {
+ /* find pattern of x=L\b where b=A(:,0) */
+ k = nrow ; /* compute all of the result; don't stop in SUBTREE */
+ ka = 0 ; /* use column A(:,0) */
+ if (stype != 0 || A->ncol != 1)
+ {
+ /* A must be unsymmetric (it's a single sparse column vector) */
+ ERROR (CHOLMOD_INVALID, "lsubtree: A invalid") ;
+ return (FALSE) ;
+ }
+ }
+ else
+ {
+ /* find pattern of L(k,:) using A(:,k) and Fi if A unsymmetric */
+ k = krow ; /* which row of L to compute */
+ ka = k ; /* which column of A to use */
+ if (stype == 0)
+ {
+ RETURN_IF_NULL (Fi, FALSE) ;
+ }
+ }
+
+ if (R->ncol != 1 || nrow != R->nrow || nrow > R->nzmax ||
+ ((krow == nrow || stype != 0) && ka >= A->ncol))
{
ERROR (CHOLMOD_INVALID, "lsubtree: R invalid") ;
return (FALSE) ;
@@ -419,7 +482,6 @@ int CHOLMOD(row_lsubtree)
/* allocate workspace */
/* ---------------------------------------------------------------------- */
- nrow = A->nrow ;
CHOLMOD(allocate_work) (nrow, 0, 0, Common) ;
if (Common->status < CHOLMOD_OK)
{
@@ -431,20 +493,12 @@ int CHOLMOD(row_lsubtree)
/* get inputs */
/* ---------------------------------------------------------------------- */
- if (stype < 0)
- {
- /* symmetric lower triangular form not supported */
- ERROR (CHOLMOD_INVALID, "symmetric lower not supported") ;
- return (FALSE) ;
- }
-
Ap = A->p ;
Ai = A->i ;
Anz = A->nz ;
packed = A->packed ;
sorted = A->sorted ;
- k = krow ;
Stack = R->i ;
Lp = L->p ;
@@ -463,16 +517,19 @@ int CHOLMOD(row_lsubtree)
/* ---------------------------------------------------------------------- */
top = nrow ; /* Stack is empty */
- Flag [k] = mark ; /* do not include diagonal entry in Stack */
+ if (k < nrow)
+ {
+ Flag [k] = mark ; /* do not include diagonal entry in Stack */
+ }
#define SCATTER /* do not scatter numerical values */
#define PARENT(i) (Lnz [i] > 1) ? (Li [Lp [i] + 1]) : EMPTY
- if (stype != 0)
+ if (krow == nrow || stype != 0)
{
/* scatter kth col of triu (A), get pattern L(k,:) */
- p = Ap [k] ;
- pend = (packed) ? (Ap [k+1]) : (p + Anz [k]) ;
+ p = Ap [ka] ;
+ pend = (packed) ? (Ap [ka+1]) : (p + Anz [ka]) ;
SUBTREE ;
}
else
@@ -529,7 +586,7 @@ int CHOLMOD(rowfac)
cholmod_common *Common
)
{
- return (CHOLMOD(rowfac_mask) (A, F, beta, kstart, kend, NULL, NULL, L,
+ return (CHOLMOD(rowfac_mask2) (A, F, beta, kstart, kend, NULL, 0, NULL, L,
Common)) ;
}
@@ -556,6 +613,35 @@ int CHOLMOD(rowfac_mask)
cholmod_common *Common
)
{
+ Int maskmark = 0 ;
+ return (CHOLMOD(rowfac_mask2) (A, F, beta, kstart, kend, mask, maskmark,
+ RLinkUp, L, Common)) ;
+}
+
+/* ========================================================================== */
+/* === cholmod_rowfac_mask2 ================================================= */
+/* ========================================================================== */
+
+/* This is meant for use in LPDASA only. */
+
+int CHOLMOD(rowfac_mask2)
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* matrix to factorize */
+ cholmod_sparse *F, /* used for A*A' case only. F=A' or A(:,f)' */
+ double beta [2], /* factorize beta*I+A or beta*I+AA' */
+ size_t kstart, /* first row to factorize */
+ size_t kend, /* last row to factorize is kend-1 */
+ Int *mask, /* size A->nrow. if mask[i] >= maskmark row i is set
+ to zero */
+ Int maskmark, /* for mask [i] test */
+ Int *RLinkUp, /* size A->nrow. link list of rows to compute */
+ /* ---- in/out --- */
+ cholmod_factor *L,
+ /* --------------- */
+ cholmod_common *Common
+)
+{
Int n ;
size_t s ;
int ok = TRUE ;
@@ -659,17 +745,17 @@ int CHOLMOD(rowfac_mask)
{
case CHOLMOD_REAL:
ok = r_cholmod_rowfac_mask (A, F, beta, kstart, kend,
- mask, RLinkUp, L, Common) ;
+ mask, maskmark, RLinkUp, L, Common) ;
break ;
case CHOLMOD_COMPLEX:
ok = c_cholmod_rowfac_mask (A, F, beta, kstart, kend,
- mask, RLinkUp, L, Common) ;
+ mask, maskmark, RLinkUp, L, Common) ;
break ;
case CHOLMOD_ZOMPLEX:
ok = z_cholmod_rowfac_mask (A, F, beta, kstart, kend,
- mask, RLinkUp, L, Common) ;
+ mask, maskmark, RLinkUp, L, Common) ;
break ;
}
}
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_solve.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_solve.c
index 05473a3..df0c5d4 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_solve.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_solve.c
@@ -3,24 +3,24 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Cholesky Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * CHOLMOD/Cholesky Module. Copyright (C) 2005-2013, Timothy A. Davis
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
-/* Solve one of the following systems:
+/* Solve one of the following systems. D is identity for an LL' factorization,
+ * in which the D operation is skipped:
*
- * Ax=b 0: CHOLMOD_A also applies the permutation L->Perm
- * LDL'x=b 1: CHOLMOD_LDLt does not apply L->Perm
- * LDx=b 2: CHOLMOD_LD
- * DL'x=b 3: CHOLMOD_DLt
- * Lx=b 4: CHOLMOD_L
- * L'x=b 5: CHOLMOD_Lt
- * Dx=b 6: CHOLMOD_D
- * x=Pb 7: CHOLMOD_P apply a permutation (P is L->Perm)
- * x=P'b 8: CHOLMOD_Pt apply an inverse permutation
+ * Ax=b 0: CHOLMOD_A x = P' * (L' \ (D \ (L \ (P * b))))
+ * LDL'x=b 1: CHOLMOD_LDLt x = (L' \ (D \ (L \ ( b))))
+ * LDx=b 2: CHOLMOD_LD x = ( (D \ (L \ ( b))))
+ * DL'x=b 3: CHOLMOD_DLt x = (L' \ (D \ ( ( b))))
+ * Lx=b 4: CHOLMOD_L x = ( ( (L \ ( b))))
+ * L'x=b 5: CHOLMOD_Lt x = (L' \ ( ( ( b))))
+ * Dx=b 6: CHOLMOD_D x = ( (D \ ( ( b))))
+ * x=Pb 7: CHOLMOD_P x = ( ( ( (P * b))))
+ * x=P'b 8: CHOLMOD_Pt x = P' * ( ( ( ( b))))
*
* The factorization can be simplicial LDL', simplicial LL', or supernodal LL'.
* For an LL' factorization, D is the identity matrix. Thus CHOLMOD_LD and
@@ -957,30 +957,145 @@ cholmod_dense *CHOLMOD(solve)
)
{
cholmod_dense *Y = NULL, *X = NULL ;
- Int *Perm ;
- Int n, nrhs, ncols, ctype, xtype, k1, nr, ytype ;
+ cholmod_dense *E = NULL ;
+ int ok ;
+
+ /* do the solve, allocating workspaces as needed */
+ ok = CHOLMOD (solve2) (sys, L, B, NULL, &X, NULL, &Y, &E, Common) ;
+
+ /* free workspaces if allocated, and free result if an error occured */
+ CHOLMOD(free_dense) (&Y, Common) ;
+ CHOLMOD(free_dense) (&E, Common) ;
+ if (!ok)
+ {
+ CHOLMOD(free_dense) (&X, Common) ;
+ }
+ return (X) ;
+}
+
+
+/* ========================================================================== */
+/* === cholmod_solve2 ======================================================= */
+/* ========================================================================== */
+
+/* This function acts just like cholmod_solve, except that the solution X and
+ * the internal workspace (Y and E) can be passed in preallocated. If the
+ * solution X or any required workspaces are not allocated on input, or if they
+ * are the wrong size or type, then this function frees them and reallocates
+ * them as the proper size and type. Thus, if you have a sequence of solves to
+ * do, you can let this function allocate X, Y, and E on the first call.
+ * Subsequent calls to cholmod_solve2 can then reuse this space. You must
+ * then free the workspaces Y and E (and X if desired) when you are finished.
+ * For example, the first call to cholmod_l_solve2, below, will solve the
+ * requested system. The next 2 calls (with different right-hand-sides but
+ * the same value of "sys") will resuse the workspace and solution X from the
+ * first call. Finally, when all solves are done, you must free the workspaces
+ * Y and E (otherwise you will have a memory leak), and you should also free X
+ * when you are done with it. Note that on input, X, Y, and E must be either
+ * valid cholmod_dense matrices, or initialized to NULL. You cannot pass in an
+ * uninitialized X, Y, or E.
+ *
+ * cholmod_dense *X = NULL, *Y = NULL, *E = NULL ;
+ * ...
+ * cholmod_l_solve2 (sys, L, B1, NULL, &X, NULL, &Y, &E, Common) ;
+ * cholmod_l_solve2 (sys, L, B2, NULL, &X, NULL, &Y, &E, Common) ;
+ * cholmod_l_solve2 (sys, L, B3, NULL, &X, NULL, &Y, &E, Common) ;
+ * cholmod_l_free_dense (&X, Common) ;
+ * cholmod_l_free_dense (&Y, Common) ;
+ * cholmod_l_free_dense (&E, Common) ;
+ *
+ * The equivalent when using cholmod_l_solve is:
+ *
+ * cholmod_dense *X = NULL, *Y = NULL, *E = NULL ;
+ * ...
+ * X = cholmod_l_solve (sys, L, B1, Common) ;
+ * cholmod_l_free_dense (&X, Common) ;
+ * X = cholmod_l_solve (sys, L, B2, Common) ;
+ * cholmod_l_free_dense (&X, Common) ;
+ * X = cholmod_l_solve (sys, L, B3, Common) ;
+ * cholmod_l_free_dense (&X, Common) ;
+ *
+ * Both methods work fine, but in the 2nd method with cholmod_solve, the
+ * internal workspaces (Y and E) are allocated and freed on each call.
+ *
+ * Bset is an optional sparse column (pattern only) that specifies a set
+ * of row indices. It is ignored if NULL, or if sys is CHOLMOD_P or
+ * CHOLMOD_Pt. If it is present and not ignored, B must be a dense column
+ * vector, and only entries B(i) where i is in the pattern of Bset are
+ * considered. All others are treated as if they were zero (they are not
+ * accessed). L must be a simplicial factorization, not supernodal. L is
+ * converted from supernodal to simplicial if necessary. The solution X is
+ * defined only for entries in the output sparse pattern of Xset.
+ * The xtype (real/complex/zomplex) of L and B must match.
+ *
+ * NOTE: If Bset is present and L is supernodal, it is converted to simplicial
+ * on output.
+ */
+
+int CHOLMOD(solve2) /* returns TRUE on success, FALSE on failure */
+(
+ /* ---- input ---- */
+ int sys, /* system to solve */
+ cholmod_factor *L, /* factorization to use */
+ cholmod_dense *B, /* right-hand-side */
+ cholmod_sparse *Bset,
+ /* ---- output --- */
+ cholmod_dense **X_Handle, /* solution, allocated if need be */
+ cholmod_sparse **Xset_Handle,
+ /* ---- workspace */
+ cholmod_dense **Y_Handle, /* workspace, or NULL */
+ cholmod_dense **E_Handle, /* workspace, or NULL */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double *Yx, *Yz, *Bx, *Bz, *Xx, *Xz ;
+ cholmod_dense *Y = NULL, *X = NULL ;
+ cholmod_sparse *C, *Yset, C_header, Yset_header, *Xset ;
+ Int *Perm = NULL, *IPerm = NULL ;
+ Int n, nrhs, ncols, ctype, xtype, k1, nr, ytype, k, blen, p, i, d, nrow ;
+ Int Cp [2], Ysetp [2], *Ci, *Yseti, ysetlen ;
+ Int *Bsetp, *Bseti, *Bsetnz, *Xseti, *Xsetp, *Iwork ;
/* ---------------------------------------------------------------------- */
/* check inputs */
/* ---------------------------------------------------------------------- */
- RETURN_IF_NULL_COMMON (NULL) ;
- RETURN_IF_NULL (L, NULL) ;
- RETURN_IF_NULL (B, NULL) ;
- RETURN_IF_XTYPE_INVALID (L, CHOLMOD_REAL, CHOLMOD_ZOMPLEX, NULL) ;
- RETURN_IF_XTYPE_INVALID (B, CHOLMOD_REAL, CHOLMOD_ZOMPLEX, NULL) ;
+ RETURN_IF_NULL_COMMON (FALSE) ;
+ RETURN_IF_NULL (L, FALSE) ;
+ RETURN_IF_NULL (B, FALSE) ;
+ RETURN_IF_XTYPE_INVALID (L, CHOLMOD_REAL, CHOLMOD_ZOMPLEX, FALSE) ;
+ RETURN_IF_XTYPE_INVALID (B, CHOLMOD_REAL, CHOLMOD_ZOMPLEX, FALSE) ;
if (sys < CHOLMOD_A || sys > CHOLMOD_Pt)
{
ERROR (CHOLMOD_INVALID, "invalid system") ;
- return (NULL) ;
+ return (FALSE) ;
}
- if (B->d < L->n || B->nrow != L->n)
+ DEBUG (CHOLMOD(dump_factor) (L, "L", Common)) ;
+ DEBUG (CHOLMOD(dump_dense) (B, "B", Common)) ;
+ nrhs = B->ncol ;
+ n = (Int) L->n ;
+ d = (Int) B->d ;
+ nrow = (Int) B->nrow ;
+ if (d < n || nrow != n)
{
ERROR (CHOLMOD_INVALID, "dimensions of L and B do not match") ;
- return (NULL) ;
+ return (FALSE) ;
+ }
+ if (Bset)
+ {
+ if (nrhs != 1)
+ {
+ ERROR (CHOLMOD_INVALID, "Bset requires a single right-hand side") ;
+ return (FALSE) ;
+ }
+ if (L->xtype != B->xtype)
+ {
+ ERROR (CHOLMOD_INVALID, "Bset requires xtype of L and B to match") ;
+ return (FALSE) ;
+ }
+ DEBUG (CHOLMOD(dump_sparse) (Bset, "Bset", Common)) ;
}
- DEBUG (CHOLMOD(dump_factor) (L, "L", Common)) ;
- DEBUG (CHOLMOD(dump_dense) (B, "B", Common)) ;
Common->status = CHOLMOD_OK ;
/* ---------------------------------------------------------------------- */
@@ -990,24 +1105,21 @@ cholmod_dense *CHOLMOD(solve)
if ((sys == CHOLMOD_P || sys == CHOLMOD_Pt || sys == CHOLMOD_A)
&& L->ordering != CHOLMOD_NATURAL)
{
+ /* otherwise, Perm is NULL, and the identity permutation is used */
Perm = L->Perm ;
}
- else
- {
- /* do not use L->Perm; use the identity permutation instead */
- Perm = NULL ;
- }
-
- nrhs = B->ncol ;
- n = L->n ;
/* ---------------------------------------------------------------------- */
- /* allocate the result X */
+ /* allocate the result X (or resuse the space from a prior call) */
/* ---------------------------------------------------------------------- */
ctype = (Common->prefer_zomplex) ? CHOLMOD_ZOMPLEX : CHOLMOD_COMPLEX ;
- if (sys == CHOLMOD_P || sys == CHOLMOD_Pt)
+ if (Bset)
+ {
+ xtype = L->xtype ;
+ }
+ else if (sys == CHOLMOD_P || sys == CHOLMOD_Pt)
{
/* x=Pb and x=P'b return X real if B is real; X is the preferred
* complex/zcomplex type if B is complex or zomplex */
@@ -1024,17 +1136,392 @@ cholmod_dense *CHOLMOD(solve)
xtype = ctype ;
}
- X = CHOLMOD(allocate_dense) (n, nrhs, n, xtype, Common) ;
+ /* ensure X has the right size and type */
+ X = CHOLMOD(ensure_dense) (X_Handle, n, nrhs, n, xtype, Common) ;
if (Common->status < CHOLMOD_OK)
{
- return (NULL) ;
+ return (FALSE) ;
}
/* ---------------------------------------------------------------------- */
/* solve using L, D, L', P, or some combination */
/* ---------------------------------------------------------------------- */
- if (sys == CHOLMOD_P)
+ if (Bset)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* solve for a subset of x, with a sparse b */
+ /* ------------------------------------------------------------------ */
+
+ Int save_realloc_state ;
+
+#ifndef NSUPERNODAL
+ /* convert a supernodal L to simplicial when using Bset */
+ if (L->is_super)
+ {
+ /* Can only use Bset on a simplicial factorization. The supernodal
+ * factor L is converted to simplicial, leaving the xtype unchanged
+ * (real, complex, or zomplex). Since the supernodal factorization
+ * is already LL', it is left in that form. This conversion uses
+ * the ll_super_to_simplicial_numeric function in
+ * cholmod_change_factor.
+ */
+ CHOLMOD(change_factor) (
+ CHOLMOD_REAL, /* ignored, since L is already numeric */
+ TRUE, /* convert to LL' (no change to num. values) */
+ FALSE, /* convert to simplicial */
+ FALSE, /* do not pack the columns of L */
+ FALSE, /* (ignored) */
+ L, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory, L is returned unchanged */
+ return (FALSE) ;
+ }
+ }
+#endif
+
+ /* L, X, and B are all the same xtype */
+ /* ensure Y is the the right size */
+ Y = CHOLMOD(ensure_dense) (Y_Handle, 1, n, 1, L->xtype, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (FALSE) ;
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* get the inverse permutation, constructing it if needed */
+ /* ------------------------------------------------------------------ */
+
+ DEBUG (CHOLMOD (dump_perm) (Perm, n,n, "Perm", Common)) ;
+
+ if ((sys == CHOLMOD_A || sys == CHOLMOD_P) && Perm != NULL)
+ {
+ /* The inverse permutation IPerm is used for the c=Pb step,
+ which is needed only for solving Ax=b or x=Pb. No other
+ steps should use IPerm */
+ if (L->IPerm == NULL)
+ {
+ /* construct the inverse permutation. This is done only once
+ * and then stored in L permanently. */
+ L->IPerm = CHOLMOD(malloc) (n, sizeof (Int), Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (FALSE) ;
+ }
+ IPerm = L->IPerm ;
+ for (k = 0 ; k < n ; k++)
+ {
+ IPerm [Perm [k]] = k ;
+ }
+ }
+ /* x=A\b and x=Pb both need IPerm */
+ IPerm = L->IPerm ;
+ }
+
+ if (sys == CHOLMOD_P)
+ {
+ /* x=Pb needs to turn off the subsequent x=P'b permutation */
+ Perm = NULL ;
+ }
+
+ DEBUG (CHOLMOD (dump_perm) (Perm, n,n, "Perm", Common)) ;
+ DEBUG (CHOLMOD (dump_perm) (IPerm, n,n, "IPerm", Common)) ;
+
+ /* ------------------------------------------------------------------ */
+ /* ensure Xset is the right size and type */
+ /* ------------------------------------------------------------------ */
+
+ /* Xset is n-by-1, nzmax >= n, pattern-only, packed, unsorted */
+ Xset = *Xset_Handle ;
+ if (Xset == NULL || (Int) Xset->nrow != n || (Int) Xset->ncol != 1 ||
+ (Int) Xset->nzmax < n || Xset->itype != CHOLMOD_PATTERN)
+ {
+ /* this is done only once, for the 1st call to cholmod_solve */
+ CHOLMOD(free_sparse) (Xset_Handle, Common) ;
+ Xset = CHOLMOD(allocate_sparse) (n, 1, n, FALSE, TRUE, 0,
+ CHOLMOD_PATTERN, Common) ;
+ *Xset_Handle = Xset ;
+ }
+ Xset->sorted = FALSE ;
+ Xset->stype = 0 ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (FALSE) ;
+ }
+
+ /* -------------------------------------------------------------- */
+ /* ensure Flag of size n, and 3*n Int workspace is available */
+ /* -------------------------------------------------------------- */
+
+ /* does no work if prior calls already allocated enough space */
+ CHOLMOD(allocate_work) (n, 3*n, 0, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (FALSE) ;
+ }
+
+ /* [ use Iwork (n:3n-1) for Ci and Yseti */
+ Iwork = Common->Iwork ;
+ /* Iwork (0:n-1) is not used because it is used by check_perm,
+ print_perm, check_sparse, and print_sparse */
+ Ci = Iwork + n ;
+ Yseti = Ci + n ;
+
+ /* reallocating workspace would break Ci and Yseti */
+ save_realloc_state = Common->no_workspace_reallocate ;
+ Common->no_workspace_reallocate = TRUE ;
+
+ /* -------------------------------------------------------------- */
+ /* C = permuted Bset, to correspond to the permutation of L */
+ /* -------------------------------------------------------------- */
+
+ /* C = IPerm (Bset) */
+ DEBUG (CHOLMOD(dump_sparse) (Bset, "Bset", Common)) ;
+
+ Bsetp = Bset->p ;
+ Bseti = Bset->i ;
+ Bsetnz = Bset->nz ;
+ blen = (Bset->packed) ? Bsetp [1] : Bsetnz [0] ;
+
+ /* C = spones (P*B) or C = spones (B) if IPerm is NULL */
+ C = &C_header ;
+ C->nrow = n ;
+ C->ncol = 1 ;
+ C->nzmax = n ;
+ C->packed = TRUE ;
+ C->stype = 0 ;
+ C->itype = ITYPE ;
+ C->xtype = CHOLMOD_PATTERN ;
+ C->dtype = CHOLMOD_DOUBLE ;
+ C->nz = NULL ;
+ C->p = Cp ;
+ C->i = Ci ;
+ C->x = NULL ;
+ C->z = NULL ;
+ C->sorted = FALSE ;
+ Cp [0] = 0 ;
+ Cp [1] = blen ;
+ for (p = 0 ; p < blen ; p++)
+ {
+ Int iold = Bseti [p] ;
+ Ci [p] = IPerm ? IPerm [iold] : iold ;
+ }
+ DEBUG (CHOLMOD (dump_sparse) (C, "C", Common)) ;
+
+ /* create a sparse column Yset from Iwork (n:2n-1) */
+ Yset = &Yset_header ;
+ Yset->nrow = n ;
+ Yset->ncol = 1 ;
+ Yset->nzmax = n ;
+ Yset->packed = TRUE ;
+ Yset->stype = 0 ;
+ Yset->itype = ITYPE ;
+ Yset->xtype = CHOLMOD_PATTERN ;
+ Yset->dtype = CHOLMOD_DOUBLE ;
+ Yset->nz = NULL ;
+ Yset->p = Ysetp ;
+ Yset->i = Yseti ;
+ Yset->x = NULL ;
+ Yset->z = NULL ;
+ Yset->sorted = FALSE ;
+ Ysetp [0] = 0 ;
+ Ysetp [1] = 0 ;
+ DEBUG (CHOLMOD (dump_sparse) (Yset, "Yset empty", Common)) ;
+
+ /* -------------------------------------------------------------- */
+ /* Yset = nonzero pattern of L\C, or just C itself */
+ /* -------------------------------------------------------------- */
+
+ /* this takes O(ysetlen) time */
+ if (sys == CHOLMOD_P || sys == CHOLMOD_Pt || sys == CHOLMOD_D)
+ {
+ Ysetp [1] = blen ;
+ for (p = 0 ; p < blen ; p++)
+ {
+ Yseti [p] = Ci [p] ;
+ }
+ }
+ else
+ {
+ if (!CHOLMOD(lsolve_pattern) (C, L, Yset, Common))
+ {
+ Common->no_workspace_reallocate = save_realloc_state ;
+ return (FALSE) ;
+ }
+ }
+ DEBUG (CHOLMOD (dump_sparse) (Yset, "Yset", Common)) ;
+
+ /* -------------------------------------------------------------- */
+ /* clear the parts of Y that we will use in the solve */
+ /* -------------------------------------------------------------- */
+
+ Yx = Y->x ;
+ Yz = Y->z ;
+ ysetlen = Ysetp [1] ;
+
+ switch (L->xtype)
+ {
+
+ case CHOLMOD_REAL:
+ for (p = 0 ; p < ysetlen ; p++)
+ {
+ i = Yseti [p] ;
+ Yx [i] = 0 ;
+ }
+ break ;
+
+ case CHOLMOD_COMPLEX:
+ for (p = 0 ; p < ysetlen ; p++)
+ {
+ i = Yseti [p] ;
+ Yx [2*i ] = 0 ;
+ Yx [2*i+1] = 0 ;
+ }
+ break ;
+
+ case CHOLMOD_ZOMPLEX:
+ for (p = 0 ; p < ysetlen ; p++)
+ {
+ i = Yseti [p] ;
+ Yx [i] = 0 ;
+ Yz [i] = 0 ;
+ }
+ break ;
+ }
+
+ DEBUG (CHOLMOD (dump_dense) (Y, "Y (Yset) = 0", Common)) ;
+
+ /* -------------------------------------------------------------- */
+ /* scatter and permute B into Y */
+ /* -------------------------------------------------------------- */
+
+ /* Y (C) = B (Bset) */
+ Bx = B->x ;
+ Bz = B->z ;
+
+ switch (L->xtype)
+ {
+
+ case CHOLMOD_REAL:
+ for (p = 0 ; p < blen ; p++)
+ {
+ Int iold = Bseti [p] ;
+ Int inew = Ci [p] ;
+ Yx [inew] = Bx [iold] ;
+ }
+ break ;
+
+ case CHOLMOD_COMPLEX:
+ for (p = 0 ; p < blen ; p++)
+ {
+ Int iold = Bseti [p] ;
+ Int inew = Ci [p] ;
+ Yx [2*inew ] = Bx [2*iold ] ;
+ Yx [2*inew+1] = Bx [2*iold+1] ;
+ }
+ break ;
+
+ case CHOLMOD_ZOMPLEX:
+ for (p = 0 ; p < blen ; p++)
+ {
+ Int iold = Bseti [p] ;
+ Int inew = Ci [p] ;
+ Yx [inew] = Bx [iold] ;
+ Yz [inew] = Bz [iold] ;
+ }
+ break ;
+ }
+
+ DEBUG (CHOLMOD (dump_dense) (Y, "Y (C) = B (Bset)", Common)) ;
+
+ /* -------------------------------------------------------------- */
+ /* solve Y = (L' \ (L \ Y'))', or other system, with template */
+ /* -------------------------------------------------------------- */
+
+ /* the solve only iterates over columns in Yseti [0...ysetlen-1] */
+
+ if (! (sys == CHOLMOD_P || sys == CHOLMOD_Pt))
+ {
+ switch (L->xtype)
+ {
+ case CHOLMOD_REAL:
+ r_simplicial_solver (sys, L, Y, Yseti, ysetlen) ;
+ break ;
+
+ case CHOLMOD_COMPLEX:
+ c_simplicial_solver (sys, L, Y, Yseti, ysetlen) ;
+ break ;
+
+ case CHOLMOD_ZOMPLEX:
+ z_simplicial_solver (sys, L, Y, Yseti, ysetlen) ;
+ break ;
+ }
+ }
+
+ DEBUG (CHOLMOD (dump_dense) (Y, "Y after solve", Common)) ;
+
+ /* -------------------------------------------------------------- */
+ /* X = P'*Y, but only for rows in Yset, and create Xset */
+ /* -------------------------------------------------------------- */
+
+ /* X (Perm (Yset)) = Y (Yset) */
+ Xx = X->x ;
+ Xz = X->z ;
+ Xseti = Xset->i ;
+ Xsetp = Xset->p ;
+
+ switch (L->xtype)
+ {
+
+ case CHOLMOD_REAL:
+ for (p = 0 ; p < ysetlen ; p++)
+ {
+ Int inew = Yseti [p] ;
+ Int iold = Perm ? Perm [inew] : inew ;
+ Xx [iold] = Yx [inew] ;
+ Xseti [p] = iold ;
+ }
+ break ;
+
+ case CHOLMOD_COMPLEX:
+ for (p = 0 ; p < ysetlen ; p++)
+ {
+ Int inew = Yseti [p] ;
+ Int iold = Perm ? Perm [inew] : inew ;
+ Xx [2*iold ] = Yx [2*inew] ;
+ Xx [2*iold+1] = Yx [2*inew+1] ;
+ Xseti [p] = iold ;
+ }
+ break ;
+
+ case CHOLMOD_ZOMPLEX:
+ for (p = 0 ; p < ysetlen ; p++)
+ {
+ Int inew = Yseti [p] ;
+ Int iold = Perm ? Perm [inew] : inew ;
+ Xx [iold] = Yx [inew] ;
+ Xz [iold] = Yz [inew] ;
+ Xseti [p] = iold ;
+ }
+ break ;
+ }
+
+ Xsetp [0] = 0 ;
+ Xsetp [1] = ysetlen ;
+
+ DEBUG (CHOLMOD(dump_sparse) (Xset, "Xset", Common)) ;
+ DEBUG (CHOLMOD(dump_dense) (X, "X", Common)) ;
+ Common->no_workspace_reallocate = save_realloc_state ;
+ /* done using Iwork (n:3n-1) for Ci and Yseti ] */
+
+ }
+ else if (sys == CHOLMOD_P)
{
/* ------------------------------------------------------------------ */
@@ -1067,17 +1554,14 @@ cholmod_dense *CHOLMOD(solve)
Int dual ;
Common->blas_ok = TRUE ;
dual = (L->xtype == CHOLMOD_REAL && B->xtype != CHOLMOD_REAL) ? 2 : 1 ;
- Y = CHOLMOD(allocate_dense) (n, dual*nrhs, n, L->xtype, Common) ;
- E = CHOLMOD(allocate_dense) (dual*nrhs, L->maxesize, dual*nrhs,
+ Y = CHOLMOD(ensure_dense) (Y_Handle, n, dual*nrhs, n, L->xtype, Common);
+ E = CHOLMOD(ensure_dense) (E_Handle, dual*nrhs, L->maxesize, dual*nrhs,
L->xtype, Common) ;
if (Common->status < CHOLMOD_OK)
{
/* out of memory */
- CHOLMOD(free_dense) (&X, Common) ;
- CHOLMOD(free_dense) (&Y, Common) ;
- CHOLMOD(free_dense) (&E, Common) ;
- return (NULL) ;
+ return (FALSE) ;
}
perm (B, Perm, 0, nrhs, Y) ; /* Y = P*B */
@@ -1095,7 +1579,6 @@ cholmod_dense *CHOLMOD(solve)
{
CHOLMOD(super_ltsolve) (L, Y, E, Common) ; /* Y = L'\Y*/
}
- CHOLMOD(free_dense) (&E, Common) ;
iperm (Y, Perm, 0, nrhs, X) ; /* X = P'*Y */
@@ -1106,9 +1589,9 @@ cholmod_dense *CHOLMOD(solve)
* It might be possible for the calls to the BLAS to differ between
* factorization and forward/backsolves, however. This statement
* is untested; it does not appear in the compiled code if
- * CHECK_BLAS_INT is true (when the same integer is used in CHOLMOD
- * and the BLAS. */
- CHOLMOD(free_dense) (&X, Common) ;
+ * CHECK_BLAS_INT is true (when the same integer is used in
+ * CHOLMOD and the BLAS. */
+ return (FALSE) ;
}
#else
@@ -1124,16 +1607,17 @@ cholmod_dense *CHOLMOD(solve)
/* solve using a simplicial LL' or LDL' factorization */
/* ------------------------------------------------------------------ */
- if (L->xtype == CHOLMOD_REAL && B->xtype == CHOLMOD_REAL)
+ if (L->xtype == CHOLMOD_REAL && B->xtype == CHOLMOD_REAL)
{
/* L, B, and Y are all real */
/* solve with up to 4 columns of B at a time */
- ncols = 4 ;
- nr = MAX (4, nrhs) ;
+ ncols = 4 ;
+ nr = MAX (4, nrhs) ;
ytype = CHOLMOD_REAL ;
}
else if (L->xtype == CHOLMOD_REAL)
{
+ /* L is real and B is complex or zomplex */
/* solve with one column of B (real/imag), at a time */
ncols = 1 ;
nr = 2 ;
@@ -1148,53 +1632,50 @@ cholmod_dense *CHOLMOD(solve)
ytype = L->xtype ;
}
- Y = CHOLMOD(allocate_dense) (nr, n, nr, ytype, Common) ;
-
+ Y = CHOLMOD(ensure_dense) (Y_Handle, nr, n, nr, ytype, Common) ;
if (Common->status < CHOLMOD_OK)
{
/* out of memory */
- CHOLMOD(free_dense) (&X, Common) ;
- CHOLMOD(free_dense) (&Y, Common) ;
- return (NULL) ;
+ return (FALSE) ;
}
- for (k1 = 0 ; k1 < nrhs ; k1 += ncols)
- {
- /* -------------------------------------------------------------- */
- /* Y = B (P, k1:k1+ncols-1)' = (P * B (:,...))' */
- /* -------------------------------------------------------------- */
+ for (k1 = 0 ; k1 < nrhs ; k1 += ncols)
+ {
- ptrans (B, Perm, k1, ncols, Y) ;
+ /* -------------------------------------------------------------- */
+ /* Y = B (P, k1:k1+ncols-1)' = (P * B (:,...))' */
+ /* -------------------------------------------------------------- */
- /* -------------------------------------------------------------- */
- /* solve Y = (L' \ (L \ Y'))', or other system, with template */
- /* -------------------------------------------------------------- */
+ ptrans (B, Perm, k1, ncols, Y) ;
- switch (L->xtype)
- {
- case CHOLMOD_REAL:
- r_simplicial_solver (sys, L, Y) ;
- break ;
+ /* -------------------------------------------------------------- */
+ /* solve Y = (L' \ (L \ Y'))', or other system, with template */
+ /* -------------------------------------------------------------- */
- case CHOLMOD_COMPLEX:
- c_simplicial_solver (sys, L, Y) ;
- break ;
+ switch (L->xtype)
+ {
+ case CHOLMOD_REAL:
+ r_simplicial_solver (sys, L, Y, NULL, 0) ;
+ break ;
- case CHOLMOD_ZOMPLEX:
- z_simplicial_solver (sys, L, Y) ;
- break ;
- }
+ case CHOLMOD_COMPLEX:
+ c_simplicial_solver (sys, L, Y, NULL, 0) ;
+ break ;
- /* -------------------------------------------------------------- */
- /* X (P, k1:k2+ncols-1) = Y' */
- /* -------------------------------------------------------------- */
+ case CHOLMOD_ZOMPLEX:
+ z_simplicial_solver (sys, L, Y, NULL, 0) ;
+ break ;
+ }
- iptrans (Y, Perm, k1, ncols, X) ;
- }
+ /* -------------------------------------------------------------- */
+ /* X (P, k1:k2+ncols-1) = Y' */
+ /* -------------------------------------------------------------- */
+
+ iptrans (Y, Perm, k1, ncols, X) ;
+ }
}
- CHOLMOD(free_dense) (&Y, Common) ;
DEBUG (CHOLMOD(dump_dense) (X, "X result", Common)) ;
- return (X) ;
+ return (TRUE) ;
}
#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_spsolve.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_spsolve.c
index a9c34f9..1b0f71a 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_spsolve.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_spsolve.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Given an LL' or LDL' factorization of A, solve one of the following systems:
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_lsolve.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_lsolve.c
index 1ab79b9..c91dc2f 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_lsolve.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_lsolve.c
@@ -3,11 +3,10 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Cholesky Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * CHOLMOD/Cholesky Module. Copyright (C) 2005-2013, Timothy A. Davis
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Template routine to solve Lx=b with unit or non-unit diagonal, or
@@ -62,7 +61,7 @@
static void LSOLVE (PREFIX,1)
(
cholmod_factor *L,
- double X [ ] /* n-by-1 in row form */
+ double X [ ] /* n-by-1 in row form */
)
{
double *Lx = L->x ;
@@ -758,11 +757,11 @@ static void LSOLVE (PREFIX,4)
static void LSOLVE (PREFIX,k)
(
cholmod_factor *L,
- cholmod_dense *Y /* nr-by-n where nr is 1 to 4 */
+ cholmod_dense *Y, /* nr-by-n where nr is 1 to 4 */
+ Int *Yseti, Int ysetlen
)
{
-#ifndef REAL
double yx [2] ;
#ifdef ZOMPLEX
double yz [1] ;
@@ -774,8 +773,7 @@ static void LSOLVE (PREFIX,k)
Int *Li = L->i ;
Int *Lp = L->p ;
Int *Lnz = L->nz ;
- Int i, j, n = L->n ;
-#endif
+ Int n = L->n, jj, jjiters ;
ASSERT (L->xtype == Y->xtype) ; /* L and Y must have the same xtype */
ASSERT (L->n == Y->ncol) ; /* dimensions must match */
@@ -785,57 +783,66 @@ static void LSOLVE (PREFIX,k)
#ifdef REAL
- /* ---------------------------------------------------------------------- */
- /* solve a real linear system, with 1 to 4 RHS's and dynamic supernodes */
- /* ---------------------------------------------------------------------- */
+ if (Yseti == NULL)
+ {
- ASSERT (Y->nrow <= 4) ;
+ /* ------------------------------------------------------------------ */
+ /* real case, no Yseti, with 1 to 4 RHS's and dynamic supernodes */
+ /* ------------------------------------------------------------------ */
+
+ ASSERT (Y->nrow <= 4) ;
+
+ switch (Y->nrow)
+ {
+ case 1: LSOLVE (PREFIX,1) (L, Y->x) ; break ;
+ case 2: LSOLVE (PREFIX,2) (L, Y->x) ; break ;
+ case 3: LSOLVE (PREFIX,3) (L, Y->x) ; break ;
+ case 4: LSOLVE (PREFIX,4) (L, Y->x) ; break ;
+ }
- switch (Y->nrow)
- {
- case 1: LSOLVE (PREFIX,1) (L, Y->x) ; break ;
- case 2: LSOLVE (PREFIX,2) (L, Y->x) ; break ;
- case 3: LSOLVE (PREFIX,3) (L, Y->x) ; break ;
- case 4: LSOLVE (PREFIX,4) (L, Y->x) ; break ;
}
+ else
+#endif
+ {
-#else
+ /* ------------------------------------------------------------------ */
+ /* solve a complex linear system or solve with Yseti */
+ /* ------------------------------------------------------------------ */
- /* ---------------------------------------------------------------------- */
- /* solve a complex linear system, with just one right-hand-side */
- /* ---------------------------------------------------------------------- */
+ ASSERT (Y->nrow == 1) ;
- ASSERT (Y->nrow == 1) ;
+ jjiters = Yseti ? ysetlen : n ;
- for (j = 0 ; j < n ; j++)
- {
- /* get the start, end, and length of column j */
- Int p = Lp [j] ;
- Int lnz = Lnz [j] ;
- Int pend = p + lnz ;
+ for (jj = 0 ; jj < jjiters ; jj++)
+ {
+ Int j = Yseti ? Yseti [jj] : jj ;
+
+ /* get the start, end, and length of column j */
+ Int p = Lp [j] ;
+ Int lnz = Lnz [j] ;
+ Int pend = p + lnz ;
- /* y = X [j] ; */
- ASSIGN (yx,yz,0, Xx,Xz,j) ;
+ /* y = X [j] ; */
+ ASSIGN (yx,yz,0, Xx,Xz,j) ;
#ifdef LL
- /* y /= Lx [p] ; */
- /* X [j] = y ; */
- DIV_REAL (yx,yz,0, yx,yz,0, Lx,p) ;
- ASSIGN (Xx,Xz,j, yx,yz,0) ;
+ /* y /= Lx [p] ; */
+ /* X [j] = y ; */
+ DIV_REAL (yx,yz,0, yx,yz,0, Lx,p) ;
+ ASSIGN (Xx,Xz,j, yx,yz,0) ;
#elif defined (LD)
- /* X [j] = y / Lx [p] ; */
- DIV_REAL (Xx,Xz,j, yx,yz,0, Lx,p) ;
+ /* X [j] = y / Lx [p] ; */
+ DIV_REAL (Xx,Xz,j, yx,yz,0, Lx,p) ;
#endif
- for (p++ ; p < pend ; p++)
- {
- /* X [Li [p]] -= Lx [p] * y ; */
- i = Li [p] ;
- MULTSUB (Xx,Xz,i, Lx,Lz,p, yx,yz,0) ;
- }
+ for (p++ ; p < pend ; p++)
+ {
+ /* X [Li [p]] -= Lx [p] * y ; */
+ Int i = Li [p] ;
+ MULTSUB (Xx,Xz,i, Lx,Lz,p, yx,yz,0) ;
+ }
+ }
}
-
-#endif
}
/* prepare for the next inclusion of this file in cholmod_solve.c */
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_ltsolve.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_ltsolve.c
index e58d1cd..c04bbbb 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_ltsolve.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_ltsolve.c
@@ -3,11 +3,10 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Cholesky Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * CHOLMOD/Cholesky Module. Copyright (C) 2005-2013, Timothy A. Davis
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Template routine to solve L'x=b with unit or non-unit diagonal, or
@@ -64,7 +63,7 @@
static void LSOLVE (PREFIX,1)
(
cholmod_factor *L,
- double X [ ] /* n-by-1 in row form */
+ double X [ ] /* n-by-1 in row form */
)
{
double *Lx = L->x ;
@@ -746,11 +745,11 @@ static void LSOLVE (PREFIX,4)
static void LSOLVE (PREFIX,k)
(
cholmod_factor *L,
- cholmod_dense *Y /* nr-by-n where nr is 1 to 4 */
+ cholmod_dense *Y, /* nr-by-n where nr is 1 to 4 */
+ Int *Yseti, Int ysetlen
)
{
-#ifndef REAL
#ifdef DIAG
double d [1] ;
#endif
@@ -765,8 +764,7 @@ static void LSOLVE (PREFIX,k)
Int *Li = L->i ;
Int *Lp = L->p ;
Int *Lnz = L->nz ;
- Int i, j, n = L->n ;
-#endif
+ Int n = L->n, jj, jjiters ;
ASSERT (L->xtype == Y->xtype) ; /* L and Y must have the same xtype */
ASSERT (L->n == Y->ncol) ; /* dimensions must match */
@@ -776,64 +774,74 @@ static void LSOLVE (PREFIX,k)
#ifdef REAL
- /* ---------------------------------------------------------------------- */
- /* solve a real linear system, with 1 to 4 RHS's and dynamic supernodes */
- /* ---------------------------------------------------------------------- */
-
- ASSERT (Y->nrow <= 4) ;
- switch (Y->nrow)
+ if (Yseti == NULL)
{
- case 1: LSOLVE (PREFIX,1) (L, Y->x) ; break ;
- case 2: LSOLVE (PREFIX,2) (L, Y->x) ; break ;
- case 3: LSOLVE (PREFIX,3) (L, Y->x) ; break ;
- case 4: LSOLVE (PREFIX,4) (L, Y->x) ; break ;
+
+ /* ------------------------------------------------------------------ */
+ /* real case, no Yseti, with 1 to 4 RHS's and dynamic supernodes */
+ /* ------------------------------------------------------------------ */
+
+ ASSERT (Y->nrow <= 4) ;
+ switch (Y->nrow)
+ {
+ case 1: LSOLVE (PREFIX,1) (L, Y->x) ; break ;
+ case 2: LSOLVE (PREFIX,2) (L, Y->x) ; break ;
+ case 3: LSOLVE (PREFIX,3) (L, Y->x) ; break ;
+ case 4: LSOLVE (PREFIX,4) (L, Y->x) ; break ;
+ }
+
}
+ else
+#endif
+ {
-#else
+ /* ------------------------------------------------------------------ */
+ /* solve a complex linear system or solve with Yseti */
+ /* ------------------------------------------------------------------ */
- /* ---------------------------------------------------------------------- */
- /* solve a complex linear system, with just one right-hand-side */
- /* ---------------------------------------------------------------------- */
+ ASSERT (Y->nrow == 1) ;
- ASSERT (Y->nrow == 1) ;
+ jjiters = Yseti ? ysetlen : n ;
- for (j = n-1 ; j >= 0 ; j--)
- {
- /* get the start, end, and length of column j */
- Int p = Lp [j] ;
- Int lnz = Lnz [j] ;
- Int pend = p + lnz ;
+ for (jj = jjiters-1 ; jj >= 0 ; jj--)
+ {
+
+ Int j = Yseti ? Yseti [jj] : jj ;
+
+ /* get the start, end, and length of column j */
+ Int p = Lp [j] ;
+ Int lnz = Lnz [j] ;
+ Int pend = p + lnz ;
- /* y = X [j] ; */
- ASSIGN (yx,yz,0, Xx,Xz,j) ;
+ /* y = X [j] ; */
+ ASSIGN (yx,yz,0, Xx,Xz,j) ;
#ifdef DIAG
- /* d = Lx [p] ; */
- ASSIGN_REAL (d,0, Lx,p) ;
+ /* d = Lx [p] ; */
+ ASSIGN_REAL (d,0, Lx,p) ;
#endif
#ifdef LD
- /* y /= d ; */
- DIV_REAL (yx,yz,0, yx,yz,0, d,0) ;
+ /* y /= d ; */
+ DIV_REAL (yx,yz,0, yx,yz,0, d,0) ;
#endif
- for (p++ ; p < pend ; p++)
- {
- /* y -= conj (Lx [p]) * X [Li [p]] ; */
- i = Li [p] ;
- MULTSUBCONJ (yx,yz,0, Lx,Lz,p, Xx,Xz,i) ;
- }
+ for (p++ ; p < pend ; p++)
+ {
+ /* y -= conj (Lx [p]) * X [Li [p]] ; */
+ Int i = Li [p] ;
+ MULTSUBCONJ (yx,yz,0, Lx,Lz,p, Xx,Xz,i) ;
+ }
#ifdef LL
- /* X [j] = y / d ; */
- DIV_REAL (Xx,Xz,j, yx,yz,0, d,0) ;
+ /* X [j] = y / d ; */
+ DIV_REAL (Xx,Xz,j, yx,yz,0, d,0) ;
#else
- /* X [j] = y ; */
- ASSIGN (Xx,Xz,j, yx,yz,0) ;
+ /* X [j] = y ; */
+ ASSIGN (Xx,Xz,j, yx,yz,0) ;
#endif
+ }
}
-
-#endif
}
/* prepare for the next inclusion of this file in cholmod_solve.c */
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_rowfac.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_rowfac.c
index 38120ce..63b8442 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_rowfac.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_rowfac.c
@@ -7,7 +7,6 @@
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Template routine for cholmod_rowfac. Supports any numeric xtype
@@ -32,7 +31,9 @@ static int TEMPLATE (cholmod_rowfac)
size_t kend, /* last row to factorize is kend-1 */
#ifdef MASK
/* These inputs are used for cholmod_rowfac_mask only */
- Int *mask, /* size A->nrow. if mask[i] then W(i) is set to zero */
+ Int *mask, /* size A->nrow. if mask[i] >= maskmark
+ then W(i) is set to zero */
+ Int maskmark,
Int *RLinkUp, /* size A->nrow. link list of rows to compute */
#endif
/* ---- in/out --- */
@@ -249,7 +250,7 @@ static int TEMPLATE (cholmod_rowfac)
for (s = top ; s < n ; s++)
{
i = Stack [s] ;
- if (mask [i] >= 0)
+ if (mask [i] >= maskmark)
{
CLEAR (Wx,Wz,i) ; /* set W(i) to zero */
}
diff --git a/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_solve.c b/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_solve.c
index a70594a..87aa0a9 100644
--- a/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_solve.c
+++ b/src/C/SuiteSparse/CHOLMOD/Cholesky/t_cholmod_solve.c
@@ -3,11 +3,10 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Cholesky Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * CHOLMOD/Cholesky Module. Copyright (C) 2005-2013, Timothy A. Davis
* The CHOLMOD/Cholesky Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Template routine for cholmod_solve. Supports any numeric xtype (real,
@@ -48,18 +47,23 @@
/* ========================================================================== */
/* Solve Dx=b for an LDL' factorization, where Y holds b' on input and x' on
- * output. */
+ * output.
+ *
+ * The number of right-hand-sides (nrhs) is not restricted, even if Yseti
+ * is present.
+ */
static void TEMPLATE (ldl_dsolve)
(
cholmod_factor *L,
- cholmod_dense *Y /* nr-by-n with leading dimension nr */
+ cholmod_dense *Y, /* nr-by-n with leading dimension nr */
+ Int *Yseti, Int ysetlen
)
{
double d [1] ;
double *Lx, *Yx, *Yz ;
Int *Lp ;
- Int n, nrhs, k, p, k1, k2 ;
+ Int n, nrhs, k, p, k1, k2, kk, kkiters ;
ASSERT (L->xtype == Y->xtype) ; /* L and Y must have the same xtype */
ASSERT (L->n == Y->ncol) ; /* dimensions must match */
@@ -73,8 +77,10 @@ static void TEMPLATE (ldl_dsolve)
Lx = L->x ;
Yx = Y->x ;
Yz = Y->z ;
- for (k = 0 ; k < n ; k++)
+ kkiters = Yseti ? ysetlen : n ;
+ for (kk = 0 ; kk < kkiters ; kk++)
{
+ k = Yseti ? Yseti [kk] : kk ;
k1 = k*nrhs ;
k2 = (k+1)*nrhs ;
ASSIGN_REAL (d,0, Lx,Lp[k]) ;
@@ -92,13 +98,20 @@ static void TEMPLATE (ldl_dsolve)
/* Solve a linear system, where Y' contains the (array-transposed) right-hand
* side on input, and the solution on output. No permutations are applied;
- * these must have already been applied to Y on input. */
+ * these must have already been applied to Y on input.
+ *
+ * Yseti [0..ysetlen-1] is an optional list of indices from
+ * cholmod_lsolve_pattern. The solve is performed only on the columns of L
+ * corresponding to entries in Yseti. Ignored if NULL. If present, most
+ * functions require that Y' consist of a single dense column.
+ */
static void TEMPLATE (simplicial_solver)
(
int sys, /* system to solve */
cholmod_factor *L, /* factor to use, a simplicial LL' or LDL' */
- cholmod_dense *Y /* right-hand-side on input, solution on output */
+ cholmod_dense *Y, /* right-hand-side on input, solution on output */
+ Int *Yseti, Int ysetlen
)
{
if (L->is_ll)
@@ -107,18 +120,18 @@ static void TEMPLATE (simplicial_solver)
if (sys == CHOLMOD_A || sys == CHOLMOD_LDLt)
{
/* Solve Ax=b or LL'x=b */
- TEMPLATE (ll_lsolve_k) (L, Y) ;
- TEMPLATE (ll_ltsolve_k) (L, Y) ;
+ TEMPLATE (ll_lsolve_k) (L, Y, Yseti, ysetlen) ;
+ TEMPLATE (ll_ltsolve_k) (L, Y, Yseti, ysetlen) ;
}
else if (sys == CHOLMOD_L || sys == CHOLMOD_LD)
{
/* Solve Lx=b */
- TEMPLATE (ll_lsolve_k) (L, Y) ;
+ TEMPLATE (ll_lsolve_k) (L, Y, Yseti, ysetlen) ;
}
else if (sys == CHOLMOD_Lt || sys == CHOLMOD_DLt)
{
/* Solve L'x=b */
- TEMPLATE (ll_ltsolve_k) (L, Y) ;
+ TEMPLATE (ll_ltsolve_k) (L, Y, Yseti, ysetlen) ;
}
}
else
@@ -127,33 +140,33 @@ static void TEMPLATE (simplicial_solver)
if (sys == CHOLMOD_A || sys == CHOLMOD_LDLt)
{
/* Solve Ax=b or LDL'x=b */
- TEMPLATE (ldl_lsolve_k) (L, Y) ;
- TEMPLATE (ldl_dltsolve_k) (L, Y) ;
+ TEMPLATE (ldl_lsolve_k) (L, Y, Yseti, ysetlen) ;
+ TEMPLATE (ldl_dltsolve_k) (L, Y, Yseti, ysetlen) ;
}
else if (sys == CHOLMOD_LD)
{
/* Solve LDx=b */
- TEMPLATE (ldl_ldsolve_k) (L, Y) ;
+ TEMPLATE (ldl_ldsolve_k) (L, Y, Yseti, ysetlen) ;
}
else if (sys == CHOLMOD_L)
{
/* Solve Lx=b */
- TEMPLATE (ldl_lsolve_k) (L, Y) ;
+ TEMPLATE (ldl_lsolve_k) (L, Y, Yseti, ysetlen) ;
}
else if (sys == CHOLMOD_Lt)
{
/* Solve L'x=b */
- TEMPLATE (ldl_ltsolve_k) (L, Y) ;
+ TEMPLATE (ldl_ltsolve_k) (L, Y, Yseti, ysetlen) ;
}
else if (sys == CHOLMOD_DLt)
{
/* Solve DL'x=b */
- TEMPLATE (ldl_dltsolve_k) (L, Y) ;
+ TEMPLATE (ldl_dltsolve_k) (L, Y, Yseti, ysetlen) ;
}
else if (sys == CHOLMOD_D)
{
/* Solve Dx=b */
- TEMPLATE (ldl_dsolve) (L, Y) ;
+ TEMPLATE (ldl_dsolve) (L, Y, Yseti, ysetlen) ;
}
}
}
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/License.txt b/src/C/SuiteSparse/CHOLMOD/Core/License.txt
index 51b795e..1c3ab99 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/License.txt
+++ b/src/C/SuiteSparse/CHOLMOD/Core/License.txt
@@ -1,7 +1,7 @@
CHOLMOD/Core Module. Copyright (C) 2005-2006, Univ. of Florida.
Author: Timothy A. Davis
CHOLMOD is also available under other licenses; contact authors for details.
-http://www.cise.ufl.edu/research/sparse
+http://www.suitesparse.com
Note that this license is for the CHOLMOD/Core module only.
All CHOLMOD modules are licensed separately.
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_aat.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_aat.c
index 7514edf..c62580a 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_aat.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_aat.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* C = A*A' or C = A(:,f)*A(:,f)'
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_add.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_add.c
index 04eca8b..f7fc675 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_add.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_add.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* C = alpha*A + beta*B, or spones(A+B). Result is packed, with sorted or
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_band.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_band.c
index 2e5f0ac..fd03698 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_band.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_band.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* C = tril (triu (A,k1), k2)
@@ -52,8 +51,8 @@ static cholmod_sparse *band /* returns C, or NULL if failure */
/* ---- input or in/out if inplace is TRUE --- */
cholmod_sparse *A,
/* ---- input ---- */
- UF_long k1, /* ignore entries below the k1-st diagonal */
- UF_long k2, /* ignore entries above the k2-nd diagonal */
+ SuiteSparse_long k1, /* ignore entries below the k1-st diagonal */
+ SuiteSparse_long k2, /* ignore entries above the k2-nd diagonal */
int mode, /* >0: numerical, 0: pattern, <0: pattern (no diagonal) */
int inplace, /* if TRUE, then convert A in place */
/* --------------- */
@@ -343,8 +342,8 @@ cholmod_sparse *CHOLMOD(band)
(
/* ---- input ---- */
cholmod_sparse *A, /* matrix to extract band matrix from */
- UF_long k1, /* ignore entries below the k1-st diagonal */
- UF_long k2, /* ignore entries above the k2-nd diagonal */
+ SuiteSparse_long k1, /* ignore entries below the k1-st diagonal */
+ SuiteSparse_long k2, /* ignore entries above the k2-nd diagonal */
int mode, /* >0: numerical, 0: pattern, <0: pattern (no diag) */
/* --------------- */
cholmod_common *Common
@@ -361,8 +360,8 @@ cholmod_sparse *CHOLMOD(band)
int CHOLMOD(band_inplace)
(
/* ---- input ---- */
- UF_long k1, /* ignore entries below the k1-st diagonal */
- UF_long k2, /* ignore entries above the k2-nd diagonal */
+ SuiteSparse_long k1, /* ignore entries below the k1-st diagonal */
+ SuiteSparse_long k2, /* ignore entries above the k2-nd diagonal */
int mode, /* >0: numerical, 0: pattern, <0: pattern (no diag) */
/* ---- in/out --- */
cholmod_sparse *A, /* matrix from which entries not in band are removed */
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_change_factor.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_change_factor.c
index cc90b0e..05032b7 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_change_factor.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_change_factor.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Change the numeric/symbolic, LL/LDL, simplicial/super, packed/unpacked,
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_common.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_common.c
index c72e228..eabcb93 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_common.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_common.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Core utility routines for the cholmod_common object:
@@ -88,41 +87,19 @@ int CHOLMOD(start)
/* memory management routines */
/* ---------------------------------------------------------------------- */
- /* The user can replace cholmod's memory management routines by redefining
- * these function pointers. */
-
-#ifndef NMALLOC
- /* stand-alone ANSI C program */
- Common->malloc_memory = malloc ;
- Common->free_memory = free ;
- Common->realloc_memory = realloc ;
- Common->calloc_memory = calloc ;
-#else
- /* no memory manager defined at compile-time; MUST define one at run-time */
- Common->malloc_memory = NULL ;
- Common->free_memory = NULL ;
- Common->realloc_memory = NULL ;
- Common->calloc_memory = NULL ;
-#endif
+ /* moved to SuiteSparse_config */
/* ---------------------------------------------------------------------- */
/* complex arithmetic routines */
/* ---------------------------------------------------------------------- */
- Common->complex_divide = CHOLMOD(divcomplex) ;
- Common->hypotenuse = CHOLMOD(hypot) ;
+ /* moved to SuiteSparse_config */
/* ---------------------------------------------------------------------- */
/* print routine */
/* ---------------------------------------------------------------------- */
-#ifndef NPRINT
- /* stand-alone ANSI C program */
- Common->print_function = printf ;
-#else
- /* printing disabled */
- Common->print_function = NULL ;
-#endif
+ /* moved to SuiteSparse_config */
/* ---------------------------------------------------------------------- */
/* workspace */
@@ -175,14 +152,78 @@ int CHOLMOD(start)
/* default SuiteSparseQR knobs and statististics */
/* ---------------------------------------------------------------------- */
- for (k = 0 ; k < 2 ; k++) Common->SPQR_xstat [k] = 0 ;
for (k = 0 ; k < 10 ; k++) Common->SPQR_istat [k] = 0 ;
+
+ Common->SPQR_flopcount_bound = 0 ; /* upper bound on flop count */
+ Common->SPQR_tol_used = 0 ; /* tolerance used */
+ Common->SPQR_norm_E_fro = 0 ; /* Frobenius norm of dropped entries */
+
Common->SPQR_grain = 1 ; /* no Intel TBB multitasking, by default */
Common->SPQR_small = 1e6 ; /* target min task size for TBB */
Common->SPQR_shrink = 1 ; /* controls SPQR shrink realloc */
Common->SPQR_nthreads = 0 ; /* 0: let TBB decide how many threads to use */
+ Common->SPQR_flopcount = 0 ; /* flop count for SPQR */
+ Common->SPQR_analyze_time = 0 ; /* analysis time for SPQR */
+ Common->SPQR_factorize_time = 0 ; /* factorize time for SPQR */
+ Common->SPQR_solve_time = 0 ; /* backsolve time for SPQR */
+
+ /* ---------------------------------------------------------------------- */
+ /* GPU initializations */
+ /* ---------------------------------------------------------------------- */
+
+ /* these are destroyed by cholmod_gpu_deallocate and cholmod_gpu_end */
+ Common->cublasHandle = NULL ;
+ Common->cublasEventPotrf [0] = NULL ;
+ Common->cublasEventPotrf [1] = NULL ;
+ Common->cublasEventPotrf [2] = NULL ;
+ for (k = 0 ; k < CHOLMOD_HOST_SUPERNODE_BUFFERS ; k++)
+ {
+ Common->gpuStream [k] = NULL ;
+ Common->updateCBuffersFree [k] = NULL ;
+ }
+ Common->updateCKernelsComplete = NULL;
+
+ /* these are destroyed by cholmod_gpu_deallocate */
+ Common->dev_mempool = NULL;
+ Common->dev_mempool_size = 0;
+ Common->host_pinned_mempool = NULL;
+ Common->host_pinned_mempool_size = 0;
+
+ Common->syrkStart = 0 ;
+
+ Common->cholmod_cpu_gemm_time = 0 ;
+ Common->cholmod_cpu_syrk_time = 0 ;
+ Common->cholmod_cpu_trsm_time = 0 ;
+ Common->cholmod_cpu_potrf_time = 0 ;
+ Common->cholmod_gpu_gemm_time = 0 ;
+ Common->cholmod_gpu_syrk_time = 0 ;
+ Common->cholmod_gpu_trsm_time = 0 ;
+ Common->cholmod_gpu_potrf_time = 0 ;
+ Common->cholmod_assemble_time = 0 ;
+ Common->cholmod_assemble_time2 = 0 ;
+
+ Common->cholmod_cpu_gemm_calls = 0 ;
+ Common->cholmod_cpu_syrk_calls = 0 ;
+ Common->cholmod_cpu_trsm_calls = 0 ;
+ Common->cholmod_cpu_potrf_calls = 0 ;
+
+ Common->cholmod_gpu_gemm_calls = 0 ;
+ Common->cholmod_gpu_syrk_calls = 0 ;
+ Common->cholmod_gpu_trsm_calls = 0 ;
+ Common->cholmod_gpu_potrf_calls = 0 ;
+
+ Common->maxGpuMemBytes = 0;
+ Common->maxGpuMemFraction = 0.0;
+
+ /* SPQR statistics and settings */
+ Common->gpuMemorySize = 1 ; /* default: no GPU memory available */
+ Common->gpuKernelTime = 0.0 ;
+ Common->gpuFlops = 0 ;
+ Common->gpuNumKernelLaunches = 0 ;
+
DEBUG_INIT ("cholmod start", Common) ;
+
return (TRUE) ;
}
@@ -319,6 +360,17 @@ int CHOLMOD(defaults)
/* COLAMD for A*A', AMD for A */
Common->method [8].ordering = CHOLMOD_COLAMD ;
+ /* ---------------------------------------------------------------------- */
+ /* GPU configuration and statistics */
+ /* ---------------------------------------------------------------------- */
+
+#ifdef DLONG
+ Common->useGPU = EMPTY ;
+#else
+ /* GPU acceleration is not supported for int version of CHOLMOD */
+ Common->useGPU = 0 ;
+#endif
+
return (TRUE) ;
}
@@ -532,6 +584,10 @@ int CHOLMOD(free_work)
Common->nrow = 0 ;
Common->iworksize = 0 ;
Common->xworksize = 0 ;
+
+#ifdef GPU_BLAS
+ CHOLMOD(gpu_deallocate) (Common) ;
+#endif
return (TRUE) ;
}
@@ -547,7 +603,7 @@ int CHOLMOD(free_work)
* workspace: Flag (nrow). Does not modify Flag if nrow is zero.
*/
-UF_long CHOLMOD(clear_flag)
+SuiteSparse_long CHOLMOD(clear_flag)
(
cholmod_common *Common
)
@@ -670,3 +726,22 @@ double CHOLMOD(dbound) /* returns modified diagonal entry of D */
}
return (dj) ;
}
+
+
+/* ========================================================================== */
+/* === scorecomp ============================================================ */
+/* ========================================================================== */
+
+/* For sorting descendant supernodes with qsort */
+int CHOLMOD(score_comp) (struct cholmod_descendant_score_t *i,
+ struct cholmod_descendant_score_t *j)
+{
+ if ((*i).score < (*j).score)
+ {
+ return (1) ;
+ }
+ else
+ {
+ return (-1) ;
+ }
+}
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_complex.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_complex.c
index 6217856..b25a693 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_complex.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_complex.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* If you convert a matrix that contains uninitialized data, valgrind will
@@ -25,52 +24,9 @@
/* === cholmod_hypot ======================================================== */
/* ========================================================================== */
-/* There is an equivalent routine called hypot in <math.h>, which conforms
- * to ANSI C99. However, CHOLMOD does not assume that ANSI C99 is available.
- * You can use the ANSI C99 hypot routine with:
- *
- * #include <math.h>
- * Common->hypotenuse = hypot ;
- *
- * Default value of the Common->hypotenuse pointer is cholmod_hypot.
- *
- * s = hypot (x,y) computes s = sqrt (x*x + y*y) but does so more accurately.
- * The NaN cases for the double relops x >= y and x+y == x are safely ignored.
- *
- * Source: Algorithm 312, "Absolute value and square root of a complex number,"
- * P. Friedland, Comm. ACM, vol 10, no 10, October 1967, page 665.
- */
-
double CHOLMOD(hypot) (double x, double y)
{
- double s, r ;
- x = fabs (x) ;
- y = fabs (y) ;
- if (x >= y)
- {
- if (x + y == x)
- {
- s = x ;
- }
- else
- {
- r = y / x ;
- s = x * sqrt (1.0 + r*r) ;
- }
- }
- else
- {
- if (y + x == y)
- {
- s = y ;
- }
- else
- {
- r = x / y ;
- s = y * sqrt (1.0 + r*r) ;
- }
- }
- return (s) ;
+ return (SuiteSparse_config.hypot_func (x, y)) ;
}
@@ -90,7 +46,8 @@ double CHOLMOD(hypot) (double x, double y)
*
* c can be the same variable as a or b.
*
- * Default value of the Common->complex_divide pointer is cholmod_divcomplex.
+ * Default value of the SuiteSparse_config.divcomplex_func pointer is
+ * SuiteSparse_divcomplex, located in SuiteSparse_config.c.
*/
int CHOLMOD(divcomplex)
@@ -100,24 +57,7 @@ int CHOLMOD(divcomplex)
double *cr, double *ci /* real and imaginary parts of c */
)
{
- double tr, ti, r, den ;
- if (fabs (br) >= fabs (bi))
- {
- r = bi / br ;
- den = br + r * bi ;
- tr = (ar + ai * r) / den ;
- ti = (ai - ar * r) / den ;
- }
- else
- {
- r = br / bi ;
- den = r * br + bi ;
- tr = (ar * r + ai) / den ;
- ti = (ai * r - ar) / den ;
- }
- *cr = tr ;
- *ci = ti ;
- return (IS_ZERO (den)) ;
+ return (SuiteSparse_config.divcomplex_func (ar, ai, br, bi, cr, ci)) ;
}
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_copy.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_copy.c
index d4532ad..9ceb394 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_copy.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_copy.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* C = A, which allocates C and copies A into C, with possible change of
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_dense.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_dense.c
index 57cb6de..c54ad67 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_dense.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_dense.c
@@ -3,12 +3,11 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Core Module. Copyright (C) 2005-2006,
+ * CHOLMOD/Core Module. Copyright (C) 2005-2013,
* Univ. of Florida. Author: Timothy A. Davis
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Core utility routines for the cholmod_dense object:
@@ -394,6 +393,53 @@ int CHOLMOD(free_dense)
return (TRUE) ;
}
+/* ========================================================================== */
+/* === cholmod_ensure_dense ================================================= */
+/* ========================================================================== */
+
+/* Ensure that the input matrix has a certain size and type. If not, free
+ * the existing matrix and reallocate one of the right size and type.
+ * Returns a pointer to the cholmod_dense matrix, possibly reallocated.
+ * Also modifies the input matrix handle, XHandle, if necessary.
+ */
+
+cholmod_dense *CHOLMOD(ensure_dense)
+(
+ /* ---- input/output ---- */
+ cholmod_dense **XHandle, /* matrix handle to check */
+ /* ---- input ---- */
+ size_t nrow, /* # of rows of matrix */
+ size_t ncol, /* # of columns of matrix */
+ size_t d, /* leading dimension */
+ int xtype, /* CHOLMOD_REAL, _COMPLEX, or _ZOMPLEX */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ cholmod_dense *X ;
+
+ RETURN_IF_NULL_COMMON (NULL) ;
+ if (XHandle == NULL)
+ {
+ ERROR (CHOLMOD_INVALID, "matrix invalid") ;
+ return (NULL) ;
+ }
+
+ X = *XHandle ;
+ if (X == NULL || X->nrow != nrow || X->ncol != ncol
+ || X->d != d || X->xtype != xtype)
+ {
+ /* Matrix X is not allocated, or has the wrong size. Free it and
+ * reallocate it in the right size and shape. If an error occurs
+ * (out of memory or inputs nrow, etc invalid), then the error is
+ * set in cholmod_allocate_dense and X is returned as NULL. */
+ CHOLMOD(free_dense) (XHandle, Common) ;
+ X = CHOLMOD(allocate_dense) (nrow, ncol, d, xtype, Common) ;
+ *XHandle = X ;
+ }
+ return (X) ;
+}
+
/* ========================================================================== */
/* === cholmod_sparse_to_dense ============================================== */
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_error.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_error.c
index 193598c..e14887a 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_error.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_error.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* CHOLMOD error-handling routine. */
@@ -52,17 +51,19 @@ int CHOLMOD(error)
#ifndef NPRINT
/* print a warning or error message */
- if (Common->print_function != NULL)
+ if (SuiteSparse_config.printf_func != NULL)
{
if (status > 0 && Common->print > 1)
{
- (Common->print_function) ("CHOLMOD warning: %s\n", message) ;
+ SuiteSparse_config.printf_func ("CHOLMOD warning: %s\n",
+ message) ;
fflush (stdout) ;
fflush (stderr) ;
}
else if (Common->print > 0)
{
- (Common->print_function) ("CHOLMOD error: %s\n", message) ;
+ SuiteSparse_config.printf_func ("CHOLMOD error: %s\n",
+ message) ;
fflush (stdout) ;
fflush (stderr) ;
}
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_factor.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_factor.c
index 0185ce4..6dc020b 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_factor.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_factor.c
@@ -3,12 +3,11 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Core Module. Copyright (C) 2005-2006,
+ * CHOLMOD/Core Module. Copyright (C) 2005-2013,
* Univ. of Florida. Author: Timothy A. Davis
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Core utility routines for the cholmod_factor object:
@@ -110,6 +109,7 @@ cholmod_factor *CHOLMOD(allocate_factor)
/* allocate the purely symbolic part of L */
L->ordering = CHOLMOD_NATURAL ;
L->Perm = CHOLMOD(malloc) (n, sizeof (Int), Common) ;
+ L->IPerm = NULL ; /* only created by cholmod_solve2 when needed */
L->ColCount = CHOLMOD(malloc) (n, sizeof (Int), Common) ;
/* simplicial part of L is empty */
@@ -132,6 +132,7 @@ cholmod_factor *CHOLMOD(allocate_factor)
L->pi = NULL ;
L->px = NULL ;
L->s = NULL ;
+ L->useGPU = 0;
/* L has not been factorized */
L->minor = n ;
@@ -200,6 +201,7 @@ int CHOLMOD(free_factor)
/* symbolic part of L */
CHOLMOD(free) (n, sizeof (Int), L->Perm, Common) ;
+ CHOLMOD(free) (n, sizeof (Int), L->IPerm, Common) ;
CHOLMOD(free) (n, sizeof (Int), L->ColCount, Common) ;
/* simplicial form of L */
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_memory.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_memory.c
index 92f9f8e..17eb489 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_memory.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_memory.c
@@ -3,12 +3,11 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Core Module. Copyright (C) 2005-2006,
+ * CHOLMOD/Core Module. Copyright (C) 2005-2013,
* Univ. of Florida. Author: Timothy A. Davis
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Core memory management routines:
@@ -123,7 +122,9 @@ void *CHOLMOD(malloc) /* returns pointer to the newly malloc'd block */
{
void *p ;
size_t s ;
+ /*
int ok = TRUE ;
+ */
RETURN_IF_NULL_COMMON (NULL) ;
if (size == 0)
@@ -140,8 +141,8 @@ void *CHOLMOD(malloc) /* returns pointer to the newly malloc'd block */
else
{
/* call malloc, or its equivalent */
- s = CHOLMOD(mult_size_t) (MAX (1,n), size, &ok) ;
- p = ok ? ((Common->malloc_memory) (s)) : NULL ;
+ p = SuiteSparse_malloc (n, size) ;
+
if (p == NULL)
{
/* failure: out of memory */
@@ -154,8 +155,9 @@ void *CHOLMOD(malloc) /* returns pointer to the newly malloc'd block */
Common->memory_inuse += (n * size) ;
Common->memory_usage =
MAX (Common->memory_usage, Common->memory_inuse) ;
- PRINTM (("cholmod_malloc %p %d cnt: %d inuse %d\n",
- p, n*size, Common->malloc_count, Common->memory_inuse)) ;
+ PRINTM (("cholmod_malloc %p %g cnt: %g inuse %g\n",
+ p, (double) n*size, (double) Common->malloc_count,
+ (double) Common->memory_inuse)) ;
}
}
return (p) ;
@@ -196,11 +198,13 @@ void *CHOLMOD(free) /* always returns NULL */
{
/* only free the object if the pointer is not NULL */
/* call free, or its equivalent */
- (Common->free_memory) (p) ;
+ SuiteSparse_free (p) ;
+
Common->malloc_count-- ;
Common->memory_inuse -= (n * size) ;
- PRINTM (("cholmod_free %p %d cnt: %d inuse %d\n",
- p, n*size, Common->malloc_count, Common->memory_inuse)) ;
+ PRINTM (("cholmod_free %p %g cnt: %g inuse %g\n",
+ p, (double) n*size, (double) Common->malloc_count,
+ (double) Common->memory_inuse)) ;
/* This assertion will fail if the user calls cholmod_malloc and
* cholmod_free with mismatched memory sizes. It shouldn't fail
* otherwise. */
@@ -249,7 +253,8 @@ void *CHOLMOD(calloc) /* returns pointer to the newly calloc'd block */
else
{
/* call calloc, or its equivalent */
- p = (Common->calloc_memory) (MAX (1,n), size) ;
+ p = SuiteSparse_calloc (n, size) ;
+
if (p == NULL)
{
/* failure: out of memory */
@@ -262,8 +267,9 @@ void *CHOLMOD(calloc) /* returns pointer to the newly calloc'd block */
Common->memory_inuse += (n * size) ;
Common->memory_usage =
MAX (Common->memory_usage, Common->memory_inuse) ;
- PRINTM (("cholmod_malloc %p %d cnt: %d inuse %d\n",
- p, n*size, Common->malloc_count, Common->memory_inuse)) ;
+ PRINTM (("cholmod_malloc %p %g cnt: %g inuse %g\n",
+ p, (double) n*size, (double) Common->malloc_count,
+ (double) Common->memory_inuse)) ;
}
}
return (p) ;
@@ -336,50 +342,27 @@ void *CHOLMOD(realloc) /* returns pointer to reallocated block */
/* The object exists, and is changing to some other nonzero size. */
/* call realloc, or its equivalent */
PRINT1 (("realloc : %d to %d, %d\n", nold, nnew, size)) ;
- pnew = NULL ;
-
- s = CHOLMOD(mult_size_t) (MAX (1,nnew), size, &ok) ;
- pnew = ok ? ((Common->realloc_memory) (p, s)) : NULL ;
-
- if (pnew == NULL)
- {
- /* Do not change p, since it still points to allocated memory */
- if (nnew <= nold)
- {
- /* The attempt to reduce the size of the block from n to
- * nnew has failed. The current block is not modified, so
- * pretend to succeed, but do not change p. Do change
- * CHOLMOD's notion of the size of the block, however. */
- *n = nnew ;
- PRINTM (("nnew <= nold failed, pretend to succeed\n")) ;
- PRINTM (("cholmod_free %p %d cnt: %d inuse %d\n"
- "cholmod_malloc %p %d cnt: %d inuse %d\n",
- p, nold*size, Common->malloc_count-1,
- Common->memory_inuse - nold*size,
- p, nnew*size, Common->malloc_count,
- Common->memory_inuse + (nnew-nold)*size)) ;
- Common->memory_inuse += ((nnew-nold) * size) ;
- }
- else
- {
- /* Increasing the size of the block has failed.
- * Do not change n. */
- ERROR (CHOLMOD_OUT_OF_MEMORY, "out of memory") ;
- }
- }
- else
- {
+ pnew = SuiteSparse_realloc (nnew, nold, size, p, &ok) ;
+ if (ok)
+ {
/* success: return revised p and change the size of the block */
- PRINTM (("cholmod_free %p %d cnt: %d inuse %d\n"
- "cholmod_malloc %p %d cnt: %d inuse %d\n",
- p, nold*size, Common->malloc_count-1,
- Common->memory_inuse - nold*size,
- pnew, nnew*size, Common->malloc_count,
- Common->memory_inuse + (nnew-nold)*size)) ;
+ PRINTM (("cholmod_free %p %g cnt: %g inuse %g\n"
+ "cholmod_malloc %p %g cnt: %g inuse %g\n",
+ p, (double) nold*size, (double) Common->malloc_count-1,
+ (double) (Common->memory_inuse - nold*size),
+ pnew, (double) nnew*size, (double) Common->malloc_count,
+ (double) (Common->memory_inuse + (nnew-nold)*size))) ;
p = pnew ;
*n = nnew ;
Common->memory_inuse += ((nnew-nold) * size) ;
}
+ else
+ {
+ /* Increasing the size of the block has failed.
+ * Do not change n. */
+ ERROR (CHOLMOD_OUT_OF_MEMORY, "out of memory") ;
+ }
+
Common->memory_usage = MAX (Common->memory_usage, Common->memory_inuse);
}
@@ -401,13 +384,13 @@ int CHOLMOD(realloc_multiple)
(
/* ---- input ---- */
size_t nnew, /* requested # of items in reallocated blocks */
- int nint, /* number of int/UF_long blocks */
+ int nint, /* number of int/SuiteSparse_long blocks */
int xtype, /* CHOLMOD_PATTERN, _REAL, _COMPLEX, or _ZOMPLEX */
/* ---- in/out --- */
- void **I, /* int or UF_long block */
- void **J, /* int or UF_long block */
- void **X, /* complex or double block */
- void **Z, /* zomplex case only: double block */
+ void **Iblock, /* int or SuiteSparse_long block */
+ void **Jblock, /* int or SuiteSparse_long block */
+ void **Xblock, /* complex or double block */
+ void **Zblock, /* zomplex case only: double block */
size_t *nold_p, /* current size of the I,J,X,Z blocks on input,
* nnew on output if successful */
/* --------------- */
@@ -440,26 +423,30 @@ int CHOLMOD(realloc_multiple)
if (nint > 0)
{
- *I = CHOLMOD(realloc) (nnew, sizeof (Int), *I, &i, Common) ;
+ *Iblock = CHOLMOD(realloc) (nnew, sizeof (Int), *Iblock, &i, Common) ;
}
if (nint > 1)
{
- *J = CHOLMOD(realloc) (nnew, sizeof (Int), *J, &j, Common) ;
+ *Jblock = CHOLMOD(realloc) (nnew, sizeof (Int), *Jblock, &j, Common) ;
}
switch (xtype)
{
case CHOLMOD_REAL:
- *X = CHOLMOD(realloc) (nnew, sizeof (double), *X, &x, Common) ;
+ *Xblock = CHOLMOD(realloc) (nnew, sizeof (double), *Xblock, &x,
+ Common) ;
break ;
case CHOLMOD_COMPLEX:
- *X = CHOLMOD(realloc) (nnew, 2*sizeof (double), *X, &x, Common) ;
+ *Xblock = CHOLMOD(realloc) (nnew, 2*sizeof (double), *Xblock, &x,
+ Common) ;
break ;
case CHOLMOD_ZOMPLEX:
- *X = CHOLMOD(realloc) (nnew, sizeof (double), *X, &x, Common) ;
- *Z = CHOLMOD(realloc) (nnew, sizeof (double), *Z, &z, Common) ;
+ *Xblock = CHOLMOD(realloc) (nnew, sizeof (double), *Xblock, &x,
+ Common) ;
+ *Zblock = CHOLMOD(realloc) (nnew, sizeof (double), *Zblock, &z,
+ Common) ;
break ;
}
@@ -472,26 +459,30 @@ int CHOLMOD(realloc_multiple)
if (nint > 0)
{
- *I = CHOLMOD(free) (i, sizeof (Int), *I, Common) ;
+ *Iblock = CHOLMOD(free) (i, sizeof (Int), *Iblock, Common) ;
}
if (nint > 1)
{
- *J = CHOLMOD(free) (j, sizeof (Int), *J, Common) ;
+ *Jblock = CHOLMOD(free) (j, sizeof (Int), *Jblock, Common) ;
}
switch (xtype)
{
case CHOLMOD_REAL:
- *X = CHOLMOD(free) (x, sizeof (double), *X, Common) ;
+ *Xblock = CHOLMOD(free) (x, sizeof (double), *Xblock,
+ Common) ;
break ;
case CHOLMOD_COMPLEX:
- *X = CHOLMOD(free) (x, 2*sizeof (double), *X, Common) ;
+ *Xblock = CHOLMOD(free) (x, 2*sizeof (double), *Xblock,
+ Common) ;
break ;
case CHOLMOD_ZOMPLEX:
- *X = CHOLMOD(free) (x, sizeof (double), *X, Common) ;
- *Z = CHOLMOD(free) (x, sizeof (double), *Z, Common) ;
+ *Xblock = CHOLMOD(free) (x, sizeof (double), *Xblock,
+ Common) ;
+ *Zblock = CHOLMOD(free) (x, sizeof (double), *Zblock,
+ Common) ;
break ;
}
@@ -500,30 +491,32 @@ int CHOLMOD(realloc_multiple)
{
if (nint > 0)
{
- *I = CHOLMOD(realloc) (nold, sizeof (Int), *I, &i, Common) ;
+ *Iblock = CHOLMOD(realloc) (nold, sizeof (Int), *Iblock, &i,
+ Common) ;
}
if (nint > 1)
{
- *J = CHOLMOD(realloc) (nold, sizeof (Int), *J, &j, Common) ;
+ *Jblock = CHOLMOD(realloc) (nold, sizeof (Int), *Jblock, &j,
+ Common) ;
}
switch (xtype)
{
case CHOLMOD_REAL:
- *X = CHOLMOD(realloc) (nold, sizeof (double), *X, &x,
- Common) ;
+ *Xblock = CHOLMOD(realloc) (nold, sizeof (double),
+ *Xblock, &x, Common) ;
break ;
case CHOLMOD_COMPLEX:
- *X = CHOLMOD(realloc) (nold, 2*sizeof (double), *X, &x,
- Common) ;
+ *Xblock = CHOLMOD(realloc) (nold, 2*sizeof (double),
+ *Xblock, &x, Common) ;
break ;
case CHOLMOD_ZOMPLEX:
- *X = CHOLMOD(realloc) (nold, sizeof (double), *X, &x,
- Common) ;
- *Z = CHOLMOD(realloc) (nold, sizeof (double), *Z, &z,
- Common) ;
+ *Xblock = CHOLMOD(realloc) (nold, sizeof (double),
+ *Xblock, &x, Common) ;
+ *Zblock = CHOLMOD(realloc) (nold, sizeof (double),
+ *Zblock, &z, Common) ;
break ;
}
@@ -537,8 +530,8 @@ int CHOLMOD(realloc_multiple)
/* New space was allocated. Clear the first entry so that valgrind
* doesn't complain about its access in change_complexity
* (Core/cholmod_complex.c). */
- xx = *X ;
- zz = *Z ;
+ xx = *Xblock ;
+ zz = *Zblock ;
switch (xtype)
{
case CHOLMOD_REAL:
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_sparse.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_sparse.c
index 059f855..557dbc1 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_sparse.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_sparse.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Core utility routines for the cholmod_sparse object:
@@ -414,7 +413,7 @@ cholmod_sparse *CHOLMOD(spzeros)
* integer overflow cannot occur, since the matrix is already allocated.
*/
-UF_long CHOLMOD(nnz)
+SuiteSparse_long CHOLMOD(nnz)
(
/* ---- input ---- */
cholmod_sparse *A,
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_transpose.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_transpose.c
index 7e94aa8..51a7035 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_transpose.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_transpose.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Core utility routines for the cholmod_sparse object to
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_triplet.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_triplet.c
index 5ce7ad8..a5f39b2 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_triplet.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_triplet.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Core utility routines for the cholmod_triplet object:
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/cholmod_version.c b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_version.c
new file mode 100644
index 0000000..0cc034e
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/Core/cholmod_version.c
@@ -0,0 +1,37 @@
+/* ========================================================================== */
+/* === Core/cholmod_version ================================================= */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/Core Module. Copyright (C) 2005-2013,
+ * Univ. of Florida. Author: Timothy A. Davis
+ * The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
+ * Lesser General Public License. See lesser.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * -------------------------------------------------------------------------- */
+
+/* Return the current version of CHOLMOD. Unlike all other functions in
+ CHOLMOD, this function does not require the CHOLMOD Common. */
+
+#include "cholmod_internal.h"
+#include "cholmod_core.h"
+
+int CHOLMOD(version) /* returns CHOLMOD_VERSION */
+(
+ /* output, contents not defined on input. Not used if NULL.
+ version [0] = CHOLMOD_MAIN_VERSION ;
+ version [1] = CHOLMOD_SUB_VERSION ;
+ version [2] = CHOLMOD_SUBSUB_VERSION ;
+ */
+ int version [3]
+)
+{
+ if (version != NULL)
+ {
+ version [0] = CHOLMOD_MAIN_VERSION ;
+ version [1] = CHOLMOD_SUB_VERSION ;
+ version [2] = CHOLMOD_SUBSUB_VERSION ;
+ }
+ return (CHOLMOD_VERSION) ;
+}
+
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_change_factor.c b/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_change_factor.c
index 548f883..dd49b44 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_change_factor.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_change_factor.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Template routine for cholmod_change_factor. All xtypes supported. */
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_dense.c b/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_dense.c
index 6be9e6d..6f3f270 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_dense.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_dense.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Template routine for cholmod_dense. All xtypes supported, except that there
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_transpose.c b/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_transpose.c
index f36a20b..a5dd849 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_transpose.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_transpose.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Template routine for cholmod_transpose. All xtypes are supported. For
diff --git a/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_triplet.c b/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_triplet.c
index d917175..d2b1c82 100644
--- a/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_triplet.c
+++ b/src/C/SuiteSparse/CHOLMOD/Core/t_cholmod_triplet.c
@@ -8,7 +8,6 @@
* The CHOLMOD/Core Module is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Template routine for cholmod_triplet. All xtypes supported */
diff --git a/src/C/SuiteSparse/CHOLMOD/Doc/ChangeLog b/src/C/SuiteSparse/CHOLMOD/Doc/ChangeLog
index 68232ae..bbdb6a8 100644
--- a/src/C/SuiteSparse/CHOLMOD/Doc/ChangeLog
+++ b/src/C/SuiteSparse/CHOLMOD/Doc/ChangeLog
@@ -1,3 +1,112 @@
+July 14, 2015: version 3.0.6
+
+ * NGPL did not disable MatrixOps, Modify, and Supernodal modules,
+ contradicting its definition in the User Guide. Fixed in this release.
+ * added MATLAB interface for row add/delete (lurowmod mexFunction)
+
+Jan 19, 2015: version 3.0.5
+
+ * minor bug fix to cholmod_symmetry.c for the 'quick return'
+ (option == 0).
+
+Jan 7, 2015: version 3.0.4
+
+ * serious bug fix to supernodal factorization. The bug was introduced in
+ CHOLMOD v3.0.0 when the GPU acceleration was given a major update.
+ The bug can cause a segfault, whether or not the GPU is used.
+
+Oct 23, 2014: version 3.0.3
+
+ * minor fix for CHOLMOD/Supernodal/cholmod_super_symbolic.c (was using a
+ non-ANSI C method to declare and initialize a variable).
+ * added additional paper in CHOLMOD/Doc
+
+Oct 10, 2014: version 3.0.2
+
+ * changes to accomodate GPU-accelerated SPQR
+ * added CHOLMOD/Include/cholmod_function.h for backward compatibility
+ for function pointers (moved from Common to SuiteSparse_config,
+ as of v2.2.0)
+
+July 18, 2014: version 3.0.1
+
+ * minor correction to 3.0.0 Beta build process, to compile SPQR when
+ CHOLMOD is compiled on the GPU
+ * added cholmod_rowfac_mask2 function for LPDASA
+ * to test the GPU, use 'make big' in CHOLMOD/Demo. You will need to first
+ download the GHS_psdef/audikw_1.mtx from the UF collection:
+ http://www.cise.ufl.edu/research/sparse/matrices/GHS_psdef/audikw_1.html
+
+March 26, 2014: version 3.0.0 (beta)
+
+ * major update to GPU acceleration. Released at NVIDIA GTC 2014.
+
+July 31, 2013: version 2.2.0
+
+ * modified the CHOLMOD Common so that it is the same size regardless
+ of whether or not the GPU is used.
+ * changed malloc, printf, hypot, and divcomplex pointers to use
+ SuiteSparse_config. Removed CHOLMOD Common-> function pointers.
+
+Apr 25, 2013: version 2.1.2
+
+ * minor update for CHOLMOD/Cholesky/*solve*.c:
+ version 2.1.0 broke the Microsoft Visual C/C++ compiler
+
+Apr 16, 2013: version 2.1.1
+
+ * bug fix to Lib/Makefile and Demo/Makefile, to handle -DNCAMD correctly.
+ * changes to Supernodal/t_cholmod_gpu.c: to fix a GPU memory leak,
+ to fix the statistics on TRSM timing, and to reduce CPU-GPU memory
+ traffic.
+ * added cholmod_version function.
+
+Mar 27, 2013: version 2.1.0
+
+ * added the -DNCAMD option. Formerly, the -DNPARTITION option disabled
+ both METIS and the interface to CAMD, CCOLAMD, and CSYMAMD.
+ Now, -DNPARTITION controls just whether or not the interface to
+ METIS is compiled. The new -DNCAMD option controls whether or not
+ the interfaces to CAMD, CCOLAMD, and CSYMAMD are compiled.
+ Both features remain in the Partition Module, as in prior versions.
+ * added cholmod_lsolve_pattern and modified cholmod_row_lsubtree,
+ to compute nonzero pattern of L\b where b is sparse
+ * added cholmod_solve2 and cholmod_ensure_dense, so that repeated
+ forward/backsolves can be done without the need to malloc/free,
+ memory on each solve. Also provides the option for solving for
+ a subset of the solution vector x (via the Bset and Xset
+ parameters to cholmod_solve2). The last option required an IPerm
+ member to be added to the Cholesky factorization object. It is only
+ allocated and used if cholmod_solve2 solves with Bset.
+
+Jun 20, 2012: verison 2.0.1
+
+ * minor update for Windows (removed filesep, compiler port fix)
+ * minor changes to format of User Guide
+ * bug fix for GPU code (singular case)
+
+Jun 1, 2012: version 2.0.0
+
+ * changed from UFconfig to SuiteSparse_config
+ * added interface to CUDA BLAS
+
+Dec 7, 2011: version 1.7.4
+
+ * fixed the Makefile to better align with CFLAGS and other standards
+ * Makefile now detects whether or not METIS is present, and
+ sets -DNPARTITION if it is not
+
+Jan 25, 2011: version 1.7.3
+
+ * minor fix to "make install"
+ * minor change to Core/cholmod_memory.c, rename "I" which conflicts with
+ a predefined token in some compilers
+
+Nov 30, 2009: version 1.7.2
+
+ * added "make install" and "make uninstall"
+ * fixed interface to 64-bit BLAS for MATLAB 7.8
+
Sept 30, 2008, version 1.7.1
* bug fix to cholmod_symmetry; it reported incorrectly if the matrix
diff --git a/src/C/SuiteSparse/CHOLMOD/Doc/Makefile b/src/C/SuiteSparse/CHOLMOD/Doc/Makefile
index 6945903..d215949 100644
--- a/src/C/SuiteSparse/CHOLMOD/Doc/Makefile
+++ b/src/C/SuiteSparse/CHOLMOD/Doc/Makefile
@@ -1,8 +1,8 @@
default: all
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
-all: UserGuide.pdf
+all: UserGuide.pdf purge
I = \
../Include/cholmod.h \
@@ -36,6 +36,7 @@ M = \
../MATLAB/ldlsolve.m \
../MATLAB/ldlsplit.m \
../MATLAB/ldlupdate.m \
+ ../MATLAB/ldlrowmod.m \
../MATLAB/metis.m \
../MATLAB/nesdis.m \
../MATLAB/resymbol.m \
@@ -61,6 +62,7 @@ UserGuide.pdf: UserGuide.tex UserGuide.bib $(I) $(C) $(M) Makefile getproto rule
./getmproto ../MATLAB/ldlsolve.m > _ldlsolve_m.tex
./getmproto ../MATLAB/ldlsplit.m > _ldlsplit_m.tex
./getmproto ../MATLAB/ldlupdate.m > _ldlupdate_m.tex
+ ./getmproto ../MATLAB/ldlrowmod.m > _ldlrowmod_m.tex
./getmproto ../MATLAB/metis.m > _metis_m.tex
./getmproto ../MATLAB/mread.m > _mread_m.tex
./getmproto ../MATLAB/spsym.m > _spsym_m.tex
@@ -114,6 +116,7 @@ UserGuide.pdf: UserGuide.tex UserGuide.bib $(I) $(C) $(M) Makefile getproto rule
./getproto '/int cholmod_factor_xtype/, /\*\) ;/' ../Include/cholmod_core.h > _factor_xtype.tex
./getproto '/typedef struct cholmod_dense/, /^}/' ../Include/cholmod_core.h > _dense.tex
./getproto '/cholmod_dense \*cholmod_allocate_dense/, /\*\) ;/' ../Include/cholmod_core.h > _allocate_dense.tex
+ ./getproto '/cholmod_dense \*cholmod_ensure_dense/, /\*\) ;/' ../Include/cholmod_core.h > _ensure_dense.tex
./getproto '/cholmod_dense \*cholmod_zeros/, /\*\) ;/' ../Include/cholmod_core.h > _zeros.tex
./getproto '/cholmod_dense \*cholmod_ones/, /\*\) ;/' ../Include/cholmod_core.h > _ones.tex
./getproto '/cholmod_dense \*cholmod_eye/, /\*\) ;/' ../Include/cholmod_core.h > _eye.tex
@@ -136,6 +139,7 @@ UserGuide.pdf: UserGuide.tex UserGuide.bib $(I) $(C) $(M) Makefile getproto rule
./getproto '/void \*cholmod_free/, /\*\) ;/' ../Include/cholmod_core.h > _free.tex
./getproto '/void \*cholmod_realloc/, /\*\) ;/' ../Include/cholmod_core.h > _realloc.tex
./getproto '/int cholmod_realloc_multiple/, /\*\) ;/' ../Include/cholmod_core.h > _realloc_multiple.tex
+ ./getproto '/int cholmod_version/, /l_version/' ../Include/cholmod_core.h > _version.tex
./getproto '/itype defines the/, /define CHOLMOD_SUPERNODAL/' ../Include/cholmod_core.h > _defn.tex
./getproto '/int cholmod_check_common/, /\*\) ;/' ../Include/cholmod_check.h > _check_common.tex
./getproto '/int cholmod_print_common/, /\*\) ;/' ../Include/cholmod_check.h > _print_common.tex
@@ -164,6 +168,7 @@ UserGuide.pdf: UserGuide.tex UserGuide.bib $(I) $(C) $(M) Makefile getproto rule
./getproto '/int cholmod_factorize /, /\*\) ;/' ../Include/cholmod_cholesky.h > _factorize.tex
./getproto '/int cholmod_factorize_p/, /\*\) ;/' ../Include/cholmod_cholesky.h > _factorize_p.tex
./getproto '/cholmod_dense \*cholmod_solve/, /\*\) ;/' ../Include/cholmod_cholesky.h > _solve.tex
+ ./getproto '/int cholmod_solve2/, /\*\) ;/' ../Include/cholmod_cholesky.h > _solve2.tex
./getproto '/cholmod_sparse \*cholmod_spsolve/, /\*\) ;/' ../Include/cholmod_cholesky.h > _spsolve.tex
./getproto '/int cholmod_etree/, /\*\) ;/' ../Include/cholmod_cholesky.h > _etree.tex
./getproto '/int cholmod_rowcolcounts/, /\*\) ;/' ../Include/cholmod_cholesky.h > _rowcolcounts.tex
@@ -174,6 +179,7 @@ UserGuide.pdf: UserGuide.tex UserGuide.bib $(I) $(C) $(M) Makefile getproto rule
./getproto '/int cholmod_rowfac_mask/, /\*\) ;/' ../Include/cholmod_cholesky.h > _rowfac_mask.tex
./getproto '/int cholmod_row_subtree/, /\*\) ;/' ../Include/cholmod_cholesky.h > _row_subtree.tex
./getproto '/int cholmod_row_lsubtree/, /\*\) ;/' ../Include/cholmod_cholesky.h > _row_lsubtree.tex
+ ./getproto '/int cholmod_lsolve_pattern/, /\*\) ;/' ../Include/cholmod_cholesky.h > _lsolve_pattern.tex
./getproto '/int cholmod_resymbol /, /\*\) ;/' ../Include/cholmod_cholesky.h > _resymbol.tex
./getproto '/int cholmod_resymbol_noperm/, /\*\) ;/' ../Include/cholmod_cholesky.h > _resymbol_noperm.tex
./getproto '/double cholmod_rcond/, /\*\) ;/' ../Include/cholmod_cholesky.h > _rcond.tex
@@ -219,7 +225,9 @@ UserGuide.pdf: UserGuide.tex UserGuide.bib $(I) $(C) $(M) Makefile getproto rule
distclean: purge
purge: clean
- - $(RM) _temp.awk _*.tex *.dvi *.aux *.log *.lof *.lot *.toc *.bak *.bbl *.blg
+ - $(RM) _temp.awk _*.tex *.dvi *.aux *.log *.lof *.lot *.toc *.bak
+ - $(RM) *.bbl *.blg
+ - $(RM) -r *.dSYM
clean:
- - $(RM) $(CLEAN)
+ - $(RM) -r $(CLEAN)
diff --git a/src/C/SuiteSparse/CHOLMOD/Doc/UserGuide.tex b/src/C/SuiteSparse/CHOLMOD/Doc/UserGuide.tex
index 20e93aa..44c62ff 100644
--- a/src/C/SuiteSparse/CHOLMOD/Doc/UserGuide.tex
+++ b/src/C/SuiteSparse/CHOLMOD/Doc/UserGuide.tex
@@ -9,7 +9,7 @@
\newcommand{\new}[1]{\overline{#1}}
\topmargin 0in
-\textheight 9in
+\textheight 8.5in
\oddsidemargin 0pt
\evensidemargin 0pt
\textwidth 6.5in
@@ -17,11 +17,11 @@
\begin{document}
\author{Timothy A. Davis \\
-Dept. of Computer and Information Science and Engineering \\
-Univ. of Florida, Gainesville, FL}
+DrTimothyAldenDavis at gmail.com, http://www.suitesparse.com }
\title{User Guide for CHOLMOD: a sparse Cholesky factorization and
modification package}
-\date{Version 1.7, Sept 20, 2008}
+
+\date{VERSION 3.0.6, July 14, 2015}
\maketitle
%-------------------------------------------------------------------------------
@@ -37,13 +37,17 @@ modification package}
Its supernodal Cholesky factorization
relies on LAPACK and the Level-3 BLAS, and obtains a substantial fraction
of the peak performance of the BLAS. Both real and complex matrices
- are supported. CHOLMOD is written in ANSI/ISO C, with both
+ are supported.
+ It also includes a non-supernodal $\m{LDL}^T$ factorization method
+ that can factorize symmetric indefinite matrices if all of their
+ leading submatrices are well-conditioned ($\m{D}$ is diagonal).
+ CHOLMOD is written in ANSI/ISO C, with both
C and MATLAB interfaces. This code works on Microsoft Windows and many versions
of Unix and Linux.
\end{abstract}
%-------------------------------------------------------------------------------
-CHOLMOD Copyright\copyright 2005-2008 by Timothy A. Davis. Portions are also
+CHOLMOD Copyright\copyright 2005-2015 by Timothy A. Davis. Portions are also
copyrighted by William W. Hager (the {\tt Modify} Module),
and the University of Florida (the {\tt Partition} and {\tt Core} Modules).
All Rights Reserved. Some of CHOLMOD's Modules are distributed under the GNU
@@ -51,7 +55,7 @@ General Public License, and others under the GNU Lesser General Public License.
Refer to each Module for details.
CHOLMOD is also available under other licenses that permit its use in
proprietary applications; contact the authors for details.
-See http://www.cise.ufl.edu/research/sparse for the code and all documentation,
+See http://www.suitesparse.com for the code and all documentation,
including this User Guide.
\newpage
@@ -83,8 +87,12 @@ constrained minimum degree (CSYMAMD, CCOLAMD, CAMD), and
graph-partitioning-based nested dissection (METIS \cite{KarypisKumar98}).
Most of its operations are available within MATLAB via mexFunction interfaces.
+ CHOLMOD also includes a non-supernodal $\m{LDL}^T$ factorization method
+ that can factorize symmetric indefinite matrices if all of their
+ leading submatrices are well-conditioned ($\m{D}$ is diagonal).
+
A pair of articles on CHOLMOD has been submitted to the ACM Transactions
-on Mathematical Softare:
+on Mathematical Software:
\cite{ChenDavisHagerRajamanickam06,DavisHager06}.
CHOLMOD 1.0 replaces {\tt chol} (the sparse case), {\tt symbfact}, and {\tt etree}
@@ -239,13 +247,14 @@ along with CHOLMOD, but three of which are not. Those included with CHOLMOD are
algorithm,
by Tim Davis and Siva Rajamanickam, based directly on COLAMD.
This package is not required if CHOLMOD is compiled with the
- {\tt -DNPARTITION} flag.
+ {\tt -DNCAMD} flag.
\item CAMD: a constrained approximate minimum degree ordering
algorithm,
by Tim Davis and Yanqing Chen, based directly on AMD.
This package is not required if CHOLMOD is compiled with the
- {\tt -DNPARTITION} flag.
-\item {\tt UFconfig}: a single place where all sparse matrix packages authored
+ {\tt -DNCAMD} flag.
+\item {\tt SuiteSparse\_config}:
+ a single place where all sparse matrix packages authored
or co-authored by Davis are configured. Also includes a version of the
{\tt xerbla} routine for the BLAS.
\end{itemize}
@@ -269,34 +278,44 @@ Three other packages are required for optimal performance:
\item LAPACK: the Basic Linear Algebra Subprograms.
Not needed if {\tt -DNSUPERNODAL} is used.
See http://www.netlib.org.
+\item CUDA BLAS: CHOLMOD can exploit an NVIDIA GPU by using the CUDA BLAS
+ for large supernodes. This feature is new to CHOLMOD v2.0.0.
\end{itemize}
You must first obtain and install METIS, LAPACK, and the BLAS.
Next edit the system-dependent configurations in the
-{\tt UFconfig/UFconfig.mk} file. Sample configurations are provided
+{\tt SuiteSparse\_config/SuiteSparse\_config.mk} file.
+Sample configurations are provided
for Linux, Macintosh, Sun Solaris, SGI IRIX, IBM AIX, and the DEC/Compaq Alpha.
The most important configuration is the location of the BLAS, LAPACK, and METIS
packages, since in its default configuration CHOLMOD cannot be compiled without them.
\noindent
-Here are the various parameters that you can control in your {\tt UFconfig/UFconfig.mk} file:
+Here are the various parameters that you can control in your
+{\tt SuiteSparse\_config/SuiteSparse\_config.mk} file:
\begin{itemize}
\item {\tt CC = } your C compiler, such as {\tt cc}.
-\item {\tt CFLAGS = } optimization flags, such as {\tt -O}.
+\item {\tt CF = } optimization flags, such as {\tt -O}.
\item {\tt RANLIB = } your system's {\tt ranlib} program, if needed.
-\item {\tt AR =} the command to create a library (such as {\tt ar}).
+\item {\tt ARCHIVE =} the command to create a library (such as {\tt ar}).
\item {\tt RM =} the command to delete a file.
\item {\tt MV =} the command to rename a file.
\item {\tt F77 =} the command to compile a Fortran program (optional).
\item {\tt F77FLAGS =} the Fortran compiler flags (optional).
\item {\tt F77LIB =} the Fortran libraries (optional).
\item {\tt LIB = } basic libraries, such as {\tt -lm}.
-\item {\tt MEX =} the command to compile a MATLAB mexFunction.
\item {\tt BLAS =} your BLAS library.
\item {\tt LAPACK =} your LAPACK library.
\item {\tt XERBLA =} a library containing the BLAS {\tt xerbla} routine, if required.
\item {\tt METIS\_PATH =} the path to your copy of the METIS 4.0.1 source code.
\item {\tt METIS =} your METIS library.
+\item {\tt GPU\_CONFIG = } configuration settings specific to the CUDA BLAS.
+ To enable the CUDA BLAS, use {\tt GPU\_CONFIG = -DGPU\_BLAS
+ -I\$(GPU\_BLAS\_PACK)/include}, and set
+ {\tt GPU\_BLAS\_PATH =} to your CUDA library installation path.
+ Then include {\tt \$(GPU\_CONFIG)} as one of the settings for
+ {\tt CHOLMOD\_CONFIG}. See the {\tt SuiteSparse\_config.mk}
+ file for details.
\item {\tt CHOLMOD\_CONFIG = } configuration settings specific to CHOLMOD.
\end{itemize}
@@ -305,9 +324,14 @@ CHOLMOD's specific settings are given by the {\tt CHOLMOD\_CONFIG} string:
\begin{itemize}
\item {\tt -DNCHECK}: do not include the Check module. License: GNU LGPL.
\item {\tt -DNCHOLESKY}: do not include the Cholesky module. License: GNU LGPL.
-\item {\tt -DNPARTITION}: do not include the Partition module. License: GNU LGPL.
+\item {\tt -DNPARTITION}: do not include the interface to METIS in
+the Partition module. License: GNU LGPL.
+\item {\tt -DCAMD}: do not include the interfaces to CAMD, CCOLAMD,
+and CSYMAMD in the Partition module. License: GNU LGPL.
\item {\tt -DNGPL}: do not include any GNU GPL Modules in the CHOLMOD library.
+Note that the Demo requires the MatrixOps module.
\item {\tt -DNMATRIXOPS}: do not include the MatrixOps module. License: GNU GPL.
+Note that the Demo requires the MatrixOps module.
\item {\tt -DNMODIFY}: do not include the Modify module. License: GNU GPL.
\item {\tt -DNSUPERNODAL}: do not include the Supernodal module. License: GNU GPL.
\item {\tt -DNPRINT}: do not print anything.
@@ -335,16 +359,17 @@ your programs with the
{\tt CHOLMOD/Lib/libcholmod.a},
{\tt AMD/Lib/libamd.a},
{\tt COLAMD/libcolamd.a},
-{\tt CAMD/libcamd.a}, \newline
-{\tt CCOLAMD/libccolamd.a},
-{\tt metis-4.0/libmetis.a},
LAPACK,
and
BLAS libraries,
as well as the {\tt xerbla} library if you need it
-({\tt UFconfig/xerlib/libcerbla.a} for the C version or
+({\tt SuiteSparse\_config/xerlib/libcerbla.a} for the C version or
\newline
- {\tt UFconfig/xerlib/libxerbla.a} for the Fortran version).
+ {\tt SuiteSparse\_config/xerlib/libxerbla.a} for the Fortran version).
+Unless you use {\tt -DNPARTITION}, you must also link with
+{\tt metis-4.0/libmetis.a}.
+Unless {\tt -DNCAMD} is present at compile time,
+you must link with {\tt CAMD/libcamd.a}, and {\tt CCOLAMD/libccolamd.a}.
Your compiler needs to know the location of the CHOLMOD {\tt Include} directory,
so that it can find the {\tt cholmod.h} include file, by
adding the {\tt -ICHOLMOD/Include} to your C compiler options
@@ -374,6 +399,7 @@ directory. The following functions are provided:
{\tt ldlsolve} & {\tt x = L'}$\backslash${\tt (D}$\backslash${\tt (L}$\backslash${\tt b))} \\
{\tt ldlsplit} & split the output of {\tt ldlchol} into {\tt L} and {\tt D} \\
{\tt ldlupdate} & update/downdate an {\tt L*D*L'} factorization \\
+{\tt ldlrowmod} & add/delete a row from an {\tt L*D*L'} factorization \\
{\tt metis} & interface to {\tt METIS\_NodeND} ordering \\
{\tt mread} & read a sparse or dense Matrix Market file \\
{\tt mwrite} & write a sparse or dense Matrix Market file \\
@@ -400,6 +426,7 @@ Each function is described in the next sections.
\subsection{{\tt cholmod\_make}: compile CHOLMOD in MATLAB} \input{_cholmod_make_m.tex}
\newpage
\subsection{{\tt etree2}: same as {\tt etree}} \input{_etree2_m.tex}
+\newpage
\subsection{{\tt graph\_demo}: graph partitioning demo} \input{_graph_demo_m.tex}
\newpage
\subsection{{\tt lchol}: $\m{LL}\tr$ factorization} \input{_lchol_m.tex}
@@ -410,8 +437,10 @@ Each function is described in the next sections.
\newpage
\subsection{{\tt ldlupdate}: update/downdate an $\m{LDL}\tr$ factorization} \input{_ldlupdate_m.tex}
\newpage
+\subsection{{\tt ldlrowmod}: add/delete a row from an $\m{LDL}\tr$ factorization} \input{_ldlrowmod_m.tex}
+\newpage
\subsection{{\tt mread}: read a sparse or dense matrix from a Matrix Market file}\input{_mread_m.tex}
-\subsection{{\tt mwrite}: write a sparse or densematrix to a Matrix Market file} \input{_mwrite_m.tex}
+\subsection{{\tt mwrite}: write a sparse or dense matrix to a Matrix Market file} \input{_mwrite_m.tex}
\newpage
\subsection{{\tt metis}: order with METIS} \input{_metis_m.tex}
\newpage
@@ -470,35 +499,140 @@ The {\tt cholmod\_make} handles this redefinition without making any
changes to your METIS source code.
%-------------------------------------------------------------------------------
-\subsection{Unix {\tt make} for compiling CHOLMOD}
+\newpage \section{Using CHOLMOD with GPU acceleration}
%-------------------------------------------------------------------------------
-You can also compile the CHOLMOD mexFunctions using the Unix/Linux {\tt make}
-command. When using the {\tt gcc} compiler, I strongly recommend editing the
-{\tt metis-4.0/Makefile.in} file and changing {\tt COPTIONS} to
-\begin{verbatim}
- COPTIONS = -fexceptions
-\end{verbatim}
-Also ensure {\tt -fexceptions} is in the {\tt CFLAGS} option in the
-{\tt UFconfig/UFconfig.mk} file that comes with CHOLMOD.
-If you do not make these modifications, the CHOLMOD mexFunctions
-will terminate MATLAB if they encounter an error.
-
-If you have MATLAB 7.2 or earlier and use {\tt make mex} in the
-{\tt CHOLMOD} directory (equivalently, {\tt make} in {\tt CHOLMOD/MATLAB}),
-you must first edit
-{\tt UFconfig/UFconfig.h} to remove the {\tt -largeArrayDims}
-option from the MEX command
-(or just use {\tt cholmod\_make.m} inside MATLAB).
-
-Next, compile your METIS 4.0.1 library by typing {\tt make} in the
-{\tt metis-4.0} directory. Then type {\tt make} in the {\tt CHOLMOD/MATLAB}
-directory. This will compile the C-callable libraries for
-AMD, COLAMD, CAMD, CCOLAMD, METIS, and CHOLMOD, and then compile the
-mexFunction interfaces to those libraries.
-If METIS tries {\tt malloc} and encounters an out-of-memory condition,
-it calls {\tt abort}, which will terminate MATLAB. This problem does not
-occur using the method described in the previous section.
+Starting with CHOLMOD v2.0.0, it is possible to accelerate the numerical
+factorization phase of CHOLMOD using NVIDIA GPUs. Due to the large
+computational capability of the GPUs, enabling this capability can result in
+significant performance improvements. Similar to CPU processing, the GPU is
+better able to accelerate the dense math associated with larger supernodes.
+Hence the GPU will provide more significant performance improvements for larger
+matrices that have more, larger supernodes.
+
+In CHOLMOD v2.3.0 this GPU capability has been improved to provide a
+significant increase in performance and the interface has been expanded to make
+the use of GPUs more flexible. CHOLMOD can take advantage of a single NVIDIA
+GPU that supports CUDA and has at least 64MB of memory. (But substantially
+more memory, typically about 3 GB, is recommended for best performance.)
+
+Only the {\tt long} integer version of CHOLMOD can leverage GPU acceleration.
+
+%-------------------------------------------------------------------------------
+\subsection{Compiling CHOLMOD with GPU support}
+%-------------------------------------------------------------------------------
+
+In order to support GPU processing, CHOLMOD must be compiled with the
+preprocessor macro {\tt GPU\_BLAS} defined. All GPU code is conditional upon
+this macro. As well, the environment variable {\tt CUDA\_ROOT} must be defined
+and point to the installation of the CUDA toolkit to be used for compilation of
+CHOLMOD. Typically this would be {\tt /usr/local/cuda}. See {\tt
+SuiteSparse\_config\_GPU.mk} for an example of how this is done.
+
+%-------------------------------------------------------------------------------
+\subsection{Enabling GPU acceleration in CHOLMOD}
+%-------------------------------------------------------------------------------
+
+Even if compiled with GPU support, in CHOLMOD v.2.3.0, GPU processing is not
+enabled by default and must be specifically requested. There are two ways to
+do this, either in the code calling CHOLMOD or using environment variables.
+
+The code author can specify the use of GPU processing with the {\tt
+Common->useGPU} variable. If this is set to {\tt 1}, CHOLMOD will attempt to
+use the GPU. If this is set to {\tt 0} the use of the GPU will be prohibited.
+If this is set to {\tt -1}, which is the default case, then the environment
+variables (following paragraph) will be queried to determine if the GPU is to
+be used. Note that the default value of {\tt -1} is set when {\tt
+cholmod\_start(Common)} is called, so the code author must set {\tt
+Common->useGPU} after calling {\tt cholmod\_start}.
+
+Alternatively, or if it is not possible to modify the code calling CHOLMOD, GPU
+processing can invoked using the {\tt CHOLMOD\_USE\_GPU} environment variable.
+This makes it possible for any CHOLMOD user to invoke GPU processing even if
+the author of the calling program did not consider this. The interpretation of
+the environment variable {\tt CHOLMOD\_USE\_GPU} is that if the string
+evaluates to an integer other than zero, GPU processing will be enabled. Note
+that the setting of {\tt Common->useGPU} takes precedence and the environment
+variable {\tt CHOLMOD\_USE\_GPU} will only be queried if {\tt Common->useGPU =
+-1}.
+
+Note that in either case, if GPU processing is requested, but there is no GPU
+present, CHOLMOD will continue using the CPU only. Consequently it is always
+safe to request GPU processing.
+
+%-------------------------------------------------------------------------------
+\newpage \subsection{Adjustable parameters}
+%-------------------------------------------------------------------------------
+
+There are a number of parameters that have been added to CHOLMOD to control GPU
+processing. All of these have appropriate defaults such that GPU processing
+can be used without any modification. However, for any particular combination
+of CPU/GPU, better performance might be obtained by adjusting these parameters.
+
+\bigskip
+
+From {\tt t\_cholmod\_gpu.c}
+
+\begin{quote}
+ {\tt CHOLMOD\_ND\_ROW\_LIMIT} : Minimum number of rows required in a
+ descendant supernode to be eligible for GPU processing during supernode
+ assembly
+
+
+ {\tt CHOLMOD\_ND\_COL\_LIMIT} : Minimum number of columns in a descendant
+ supernode to be eligible for GPU processing during supernode assembly
+
+
+ {\tt CHOLMOD\_POTRF\_LIMIT} : Minimum number of columns in a supernode to be
+ eligible for {\tt POTRF} and {\tt TRSM} processing on the GPU
+
+
+ {\tt CHOLMOD\_GPU\_SKIP} : Number of small descendant supernodes to assembled
+ on the CPU before querying if the GPU is needs more descendant supernodes
+ queued
+
+\end{quote}
+
+From {\tt cholmod\_core.h}
+
+\begin{quote}
+ {\tt CHOLMOD\_HOST\_SUPERNODE\_BUFFERS} : Number of buffers in which to queue
+ descendant supernodes for GPU processing
+
+\end{quote}
+
+Programatically
+
+\begin{quote}
+
+ {\tt Common->maxGpuMemBytes} : Specifies the maximum amount of memory, in
+ bytes, that CHOLMOD can allocate on the GPU. If this parameter is not set,
+ CHOLMOD will allocate as much GPU memory as possible. Hence, the purpose of
+ this parameter is to restrict CHOLMOD's GPU memory use so that CHOLMOD can be
+ used simultaneously with other codes that also use GPU acceleration and
+ require some amount of GPU memory. If the specified amount of GPU memory is
+ not allocatable, CHOLMOD will allocate the available memory and continue.
+
+ {\tt Common->maxGpuMemFraction} : Entirely similar to {\tt
+ Common->maxGpuMemBytes} but with the memory specified as a fraction of total
+ GPU memory. Note that if both {\tt maxGpuMemBytes} and {\tt
+ maxGpuMemFraction} are specified, whichever results in the minimum amount of
+ memory will be used.
+
+\end{quote}
+
+Environment variables
+
+\begin{quote}
+ {\tt CHOLMOD\_GPU\_MEM\_BYTES} : Environment variable with a meaning
+ equivalent to {\tt Common->maxGpuMemBytes}. This will only be queried if
+ {\tt Common->useGPU = -1}.
+
+ {\tt CHOLMOD\_GPU\_MEM\_FRACTION} : Environment variable with a meaning
+ equivalent to {\tt Common->maxGpuMemFraction}. This will only be queried if
+ {\tt Common->useGPU = -1}.
+
+\end{quote}
%-------------------------------------------------------------------------------
\newpage \section{Integer and floating-point types, and notation used}
@@ -509,11 +643,11 @@ routines with the prefix {\tt cholmod\_} use {\tt int} integers,
{\tt cholmod\_l\_} routines use {\tt long}. All floating-point
values are {\tt double}.
-The {\tt long} integer is redefinable, via {\tt UFconfig.h}.
-That file defines a C preprocessor token {\tt UF\_long} which is
+The {\tt long} integer is redefinable, via {\tt SuiteSparse\_config.h}.
+That file defines a C preprocessor token {\tt SuiteSparse\_long} which is
{\tt long} on all systems except for Windows-64, in which case it is
defined as {\tt \_\_int64}. The intent is that with suitable compile-time
-switches, {\tt int} is a 32-bit integer and {\tt UF\_long} is a 64-bit
+switches, {\tt int} is a 32-bit integer and {\tt SuiteSparse\_long} is a 64-bit
integer. The term {\tt long} is used to describe the latter
integer throughout this document (except in the prototypes).
@@ -869,6 +1003,11 @@ and is required by all six other CHOLMOD library Modules:
\end{itemize}
%-------------------------------------------------------------------------------
+\subsubsection{{\tt cholmod\_version:} Version control}
+%-------------------------------------------------------------------------------
+The {\tt cholmod\_version} function returns the current version of CHOLMOD.
+
+%-------------------------------------------------------------------------------
\newpage \subsection{{\tt Check} Module: print/check the CHOLMOD objects}
%-------------------------------------------------------------------------------
The {\tt Check} Module contains routines that check and print the five
@@ -945,6 +1084,7 @@ required by the {\tt Partition} Module.
\item {\tt cholmod\_analyze\_p}: analyze, with user-provided permutation or $\m{f}$ set.
\item {\tt cholmod\_factorize\_p}: factorize, with user-provided permutation or $\m{f}$.
\item {\tt cholmod\_analyze\_ordering}: analyze a permutation
+ \item {\tt cholmod\_solve2}: solve a linear system, reusing workspace.
\item {\tt cholmod\_etree}: find the elimination tree.
\item {\tt cholmod\_rowcolcounts}: compute the row/column counts of $\m{L}$.
\item {\tt cholmod\_amd}: order using AMD.
@@ -952,6 +1092,7 @@ required by the {\tt Partition} Module.
\item {\tt cholmod\_rowfac}: incremental simplicial factorization.
\item {\tt cholmod\_row\_subtree}: find the nonzero pattern of a row of $\m{L}$.
\item {\tt cholmod\_row\_lsubtree}: find the nonzero pattern of a row of $\m{L}$.
+ \item {\tt cholmod\_row\_lsubtree}: find the nonzero pattern of $\m{L}^{-1}b$.
\item {\tt cholmod\_resymbol}: recompute the symbolic pattern of $\m{L}$.
\item {\tt cholmod\_resymbol\_noperm}: recompute the symbolic pattern of $\m{L}$, no permutation.
\item {\tt cholmod\_postorder}: postorder a tree.
@@ -1272,7 +1413,7 @@ that is not a part of CHOLMOD, but can be used via the function pointer.
Stores a sparse matrix in compressed-column form.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_allocate\_sparse}: allocate sparse matrix}
+\subsection{{\tt cholmod\_allocate\_sparse}: allocate sparse matrix}
%---------------------------------------
\input{_allocate_sparse.tex}
@@ -1294,7 +1435,7 @@ Frees a sparse matrix.
Reallocates a sparse matrix, so that it can contain {\tt nznew} entries.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_nnz}: number of entries in sparse matrix}
+\subsection{{\tt cholmod\_nnz}: number of entries in sparse matrix}
%---------------------------------------
\input{_nnz.tex}
@@ -1444,7 +1585,7 @@ of {\tt F->p} contain the column pointers of the resulting matrix, where
not modified. {\tt F} can still be properly freed with {\tt cholmod\_free\_sparse}.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_band}: extract band of a sparse matrix}
+\subsection{{\tt cholmod\_band}: extract band of a sparse matrix}
%---------------------------------------
\input{_band.tex}
@@ -1482,7 +1623,7 @@ Same as {\tt cholmod\_band}, except that it always operates in place.
Only packed matrices can be converted in place.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_aat}: compute $\m{AA}\tr$}
+\subsection{{\tt cholmod\_aat}: compute $\m{AA}\tr$}
%---------------------------------------
\input{_aat.tex}
@@ -1505,7 +1646,7 @@ by changing {\tt C->stype} to 1 or -1, respectively, after calling this routine.
Returns an exact copy of the input sparse matrix {\tt A}.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_copy}: copy (and change) sparse matrix}
+\subsection{{\tt cholmod\_copy}: copy (and change) sparse matrix}
%---------------------------------------
\input{_copy.tex}
@@ -1795,6 +1936,16 @@ Allocates a dense matrix.
Frees a dense matrix.
%---------------------------------------
+\subsection{{\tt cholmod\_ensure\_dense}: ensure dense matrix has a given size
+and type}
+%---------------------------------------
+
+\input{_ensure_dense.tex}
+Ensures a dense matrix has a given size and type.
+
+%---------------------------------------
+
+%---------------------------------------
\newpage \subsection{{\tt cholmod\_zeros}: dense zero matrix}
%---------------------------------------
@@ -1930,7 +2081,7 @@ Changing from complex or zomplex to real discards the imaginary part.
\input{_malloc.tex}
Allocates a block of memory of size {\tt n*size},
-using the {\tt Common->malloc\_memory}
+using the {\tt SuiteSparse\_config.malloc\_func}
function pointer (default is to use the ANSI C {\tt malloc} routine).
A value of {\tt n=0} is treated as {\tt n=1}.
If not successful, {\tt NULL} is returned and {\tt Common->status} is set to {\tt CHOLMOD\_OUT\_OF\_MEMORY}.
@@ -1941,7 +2092,7 @@ If not successful, {\tt NULL} is returned and {\tt Common->status} is set to {\t
\input{_calloc.tex}
Allocates a block of memory of size {\tt n*size},
-using the {\tt Common->calloc\_memory}
+using the {\tt SuiteSparse\_config.calloc\_func}
function pointer (default is to use the ANSI C {\tt calloc} routine).
A value of {\tt n=0} is treated as {\tt n=1}.
If not successful, {\tt NULL} is returned and {\tt Common->status} is set to {\tt CHOLMOD\_OUT\_OF\_MEMORY}.
@@ -1952,7 +2103,7 @@ If not successful, {\tt NULL} is returned and {\tt Common->status} is set to {\t
\input{_free.tex}
Frees a block of memory of size {\tt n*size},
-using the {\tt Common->free\_memory}
+using the {\tt SuiteSparse\_config.free\_func}
function pointer (default is to use the ANSI C {\tt free} routine).
The size of the block ({\tt n} and {\tt size}) is only required so that CHOLMOD
can keep track of its current and peak memory usage. This is a useful statistic,
@@ -1970,7 +2121,7 @@ have a memory leak.
\input{_realloc.tex}
Reallocates a block of memory whose current size {\tt n*size},
and whose new size will be {\tt nnew*size} if successful,
-using the {\tt Common->calloc\_memory}
+using the {\tt SuiteSparse\_config.calloc\_func}
function pointer (default is to use the ANSI C {\tt realloc} routine).
If the reallocation is not successful, {\tt p} is returned unchanged
and {\tt Common->status} is set to {\tt CHOLMOD\_OUT\_OF\_MEMORY}.
@@ -1988,6 +2139,38 @@ Reallocates multiple blocks of memory, all with the same number of items
or all are returned to their original size.
%-------------------------------------------------------------------------------
+\newpage \section{{\tt Core} Module: version control}
+%-------------------------------------------------------------------------------
+
+\subsection{{\tt cholmod\_version}: return current CHOLMOD version}
+
+\input{_version.tex}
+Returns the CHOLMOD version number, so that it can be tested at run time, even
+if the caller does not have access to the CHOLMOD include files. For example,
+for a CHOLMOD version 3.2.1, the {\tt version} array will contain 3, 2, and 1,
+in that order. This function appears in CHOLMOD 2.1.1 and later. You can
+check if the function exists with the {\tt CHOLMOD\_HAS\_VERSION\_FUNCTION}
+macro, so that the following code fragment works in any version of CHOLMOD:
+
+\begin{verbatim}
+ #ifdef CHOLMOD_HAS_VERSION_FUNCTION
+ v = cholmod_version (NULL) ;
+ #else
+ v = CHOLMOD_VERSION ;
+ #endif
+\end{verbatim}
+
+Note that {\tt cholmod\_version} and {\tt cholmod\_l\_version} have identical
+prototypes. Both use {\tt int}'s. Unlike all other CHOLMOD functions, this
+function does not take the {\tt Common} object as an input parameter, and it
+does not use any definitions from any include files. Thus, the caller can
+access this function even if the caller does not include any CHOLMOD include
+files.
+
+The above code fragment does require the {\tt \#include "cholmod.h"},
+of course, but {\tt cholmod\_version} can be called without it, if necessary.
+
+%-------------------------------------------------------------------------------
\newpage \section{{\tt Check} Module routines}
%-------------------------------------------------------------------------------
@@ -2418,7 +2601,7 @@ a supernodal $\m{LL}\tr$ factorization, however.
Refer to {\tt cholmod\_transpose\_unsym} for a description of {\tt f}.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_factorize}: numeric factorization}
+\subsection{{\tt cholmod\_factorize}: numeric factorization}
%---------------------------------------
\input{_factorize.tex}
@@ -2464,7 +2647,7 @@ a supernodal zomplex factor, since it is incompatible with how complex numbers a
stored in LAPACK and the BLAS.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_analyze\_p}: symbolic factorization, given permutation}
+\subsection{{\tt cholmod\_analyze\_p}: symbolic factorization, given permutation}
%---------------------------------------
\input{_analyze_p.tex}
@@ -2485,7 +2668,7 @@ the matrix before it is factorized, where {\tt beta} is real.
Only the real part, {\tt beta[0]}, is used.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_solve}: solve a linear system}
+\subsection{{\tt cholmod\_solve}: solve a linear system}
%---------------------------------------
\input{_solve.tex}
@@ -2527,10 +2710,110 @@ the {\tt MatrixOps} Module. See {\tt Demo/cholmod\_demo.c} for an example.
%---------------------------------------
\input{_spsolve.tex}
-Identical to {\tt cholmod\_spsolve}, except that {\tt B} and {\tt X} are sparse.
+Identical to {\tt cholmod\_solve}, except that {\tt B} and {\tt X} are sparse.
+This function converts {\tt B} to full format, solves the system, and then
+converts {\tt X} back to sparse. If you want to solve with a sparse {\tt B}
+and get just a partial solution back in {\tt X} (corresponding to the pattern
+of {\tt B}), use {\tt cholmod\_solve2} below.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_etree}: find elimination tree}
+\subsection{{\tt cholmod\_solve2}: solve a linear system, reusing workspace}
+%---------------------------------------
+
+\input{_solve2.tex}
+Solve a linear system, optionally reusing workspace from a prior call
+to {\tt cholmod\_solve2}.
+
+The inputs to this function are the same as {\tt cholmod\_solve},
+with the addition of three parameters:
+{\tt X},
+{\tt Y},
+and
+{\tt E}. The dense matrix {\tt X} is the solution on output.
+On input, {\tt \&X} can point to a NULL matrix, or be the wrong size.
+If that is the case, it is freed and allocated to be the proper size.
+If {\tt X} has the right size and type on input, then the allocation
+is skipped. In contrast, the {\tt cholmod\_solve} function always
+allocates its output {\tt X}. This {\tt cholmod\_solve2} function
+allows you to reuse the memory space of a prior {\tt X}, thereby
+saving time.
+
+The two workspace matrices {\tt Y} and {\tt E} can also be reused
+between calls.
+You must free
+{\tt X}
+{\tt Y},
+and
+{\tt E} yourself, when your computations are done. Below is an
+example of usage.
+Note that
+{\tt X}
+{\tt Y},
+and
+{\tt E} must be defined on input (either NULL, or valid dense matrices).
+
+\begin{verbatim}
+ cholmod_dense *X = NULL, *Y = NULL, *E = NULL ;
+ ...
+ cholmod_l_solve2 (sys, L, B1, NULL, &X, NULL, &Y, &E, Common) ;
+ cholmod_l_solve2 (sys, L, B2, NULL, &X, NULL, &Y, &E, Common) ;
+ cholmod_l_solve2 (sys, L, B3, NULL, &X, NULL, &Y, &E, Common) ;
+ cholmod_l_free_dense (&X, Common) ;
+ cholmod_l_free_dense (&Y, Common) ;
+ cholmod_l_free_dense (&E, Common) ;
+\end{verbatim}
+
+The equivalent when using {\tt cholmod\_solve} is:
+
+\begin{verbatim}
+ cholmod_dense *X = NULL, *Y = NULL, *E = NULL ;
+ ...
+ X = cholmod_l_solve (sys, L, B1, Common) ;
+ cholmod_l_free_dense (&X, Common) ;
+ X = cholmod_l_solve (sys, L, B2, Common) ;
+ cholmod_l_free_dense (&X, Common) ;
+ X = cholmod_l_solve (sys, L, B3, Common) ;
+ cholmod_l_free_dense (&X, Common) ;
+\end{verbatim}
+
+Both methods work fine, but in the second method with {\tt cholmod\_solve},
+the internal workspaces ({\tt Y} and {\tt E}) and the solution ({\tt X})
+are allocated and freed on each call.
+
+The {\tt cholmod\_solve2 function} can also solve for a subset of the solution
+vector {\tt X}, if the optional {\tt Bset} parameter is non-NULL. The
+right-hand-side {\tt B} must be a single column vector, and its complexity
+(real, complex, zomplex) must match that of {\tt L}. The vector {\tt B} is
+dense, but it is assumed to be zero except for row indices specified in {\tt
+Bset}. The vector {\tt Bset} must be a sparse column vector, of dimension the
+same as {\tt B}. Only the pattern of {\tt Bset} is used. The solution {\tt X}
+(a dense column vector) is modified on output, but is defined only in the rows
+defined by the sparse vector {\tt Xset}. The entries in {\tt Bset} are a
+subset of {\tt Xset} (except if {\tt sys} is {\tt CHOLMOD\_P} or {\tt
+CHOLMOD\_Pt}).
+
+No memory allocations are done if the outputs and internal
+workspaces ({\tt X}, {\tt Xset}, {\tt Y}, and {\tt E}) have been allocated
+by a prior call (or if allocated by the user). To let {\tt cholmod\_solve2}
+allocate these outputs and workspaces for you, simply initialize them to
+NULL (as in the example above). Since it is possible for this function
+to reallocate these 4 arrays, you should always re-acquire the pointers to
+their internal data ({\tt X->x} for example) after calling
+{\tt cholmod\_solve2}), since they may change. They normally will not
+change except in the first call to this function.
+
+On the first call to {\tt cholmod\_solve2} when {\tt Bset} is NULL,
+the factorization is converted from supernodal to simplicial, if needed.
+The inverse permutation is also computed and stored in the factorization
+object, {\tt L}. This can take a modest amount of time. Subsequent
+calls to {\tt cholmod\_solve2} with a small {\tt Bset}
+are very fast (both asymptotically and in practice).
+
+You can find an example of how to use {\tt cholmod\_solve2} in the
+two demo programs, {\tt cholmod\_demo} and {\tt cholmod\_l\_demo}.
+
+%---------------------------------------
+\subsection{{\tt cholmod\_etree}: find elimination tree}
%---------------------------------------
\input{_etree.tex}
@@ -2568,7 +2851,7 @@ The algorithm is described in \cite{GilbertLiNgPeyton01,GilbertNgPeyton94}.
% sparse QR and LU factorization", BIT, vol 41, 2001, pp. 693-710.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_analyze\_ordering}: analyze a permutation}
+\subsection{{\tt cholmod\_analyze\_ordering}: analyze a permutation}
%---------------------------------------
\input{_analyze_ordering.tex}
@@ -2586,7 +2869,7 @@ The column counts of {\tt L}, flop count, and other statistics from
{\tt cholmod\_rowcolcounts} are not computed if {\tt ColCount} is {\tt NULL}.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_amd}: interface to AMD}
+\subsection{{\tt cholmod\_amd}: interface to AMD}
%---------------------------------------
\input{_amd.tex}
@@ -2619,7 +2902,7 @@ combined with its postordering (COLAMD itself does not perform this postordering
{\tt A} must be unsymmetric ({\tt A->stype = 0}).
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_rowfac}: row-oriented Cholesky factorization}
+\subsection{{\tt cholmod\_rowfac}: row-oriented Cholesky factorization}
%---------------------------------------
\input{_rowfac.tex}
@@ -2674,7 +2957,7 @@ For use in LPDASA only.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_row\_subtree}: pattern of row of a factor}
+\subsection{{\tt cholmod\_row\_subtree}: pattern of row of a factor}
%---------------------------------------
\input{_row_subtree.tex}
@@ -2698,7 +2981,7 @@ with {\tt R->nzmax >= nrow}. {\tt R} is assumed to be packed ({\tt Rnz [0]} is
the number of entries in {\tt R} is given by {\tt Rp [0]}.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_row\_lsubtree}: pattern of row of a factor}
+\subsection{{\tt cholmod\_row\_lsubtree}: pattern of row of a factor}
%---------------------------------------
\input{_row_lsubtree.tex}
@@ -2708,7 +2991,7 @@ the nonzero pattern of the {\tt k}th column of {\tt F} is given by
{\tt Fi} and {\tt fnz} instead.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_resymbol}: re-do symbolic factorization}
+\subsection{{\tt cholmod\_resymbol}: re-do symbolic factorization}
%---------------------------------------
\input{_resymbol.tex}
@@ -2737,7 +3020,7 @@ Identical to {\tt cholmod\_resymbol}, except that the fill-reducing
ordering {\tt L->Perm} is not used.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_postorder}: tree postorder}
+\subsection{{\tt cholmod\_postorder}: tree postorder}
%---------------------------------------
\input{_postorder.tex}
@@ -2850,7 +3133,6 @@ reducing permutation {\tt L->Perm} is not used. The vectors $\m{x}$ and $\m{b}$
ordering, not your original ordering. This routine does not handle multiple right-hand-sides.
%---------------------------------------
-\newpage
\subsection{{\tt cholmod\_updown\_mark}: update/downdate}
%---------------------------------------
@@ -2869,7 +3151,7 @@ by Hager and Davis.
For use in LPDASA only.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_rowadd}: add row to factor}
+\subsection{{\tt cholmod\_rowadd}: add row to factor}
%---------------------------------------
\input{_rowadd.tex}
@@ -2887,7 +3169,7 @@ The algorithm is described in \cite{DavisHager05}.
Identical to {\tt cholmod\_rowadd}, except the system $\m{Lx}=\m{b}$ is also updated/downdated, just like {\tt cholmod\_updown\_solve}.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_rowdel}: delete row from factor}
+\subsection{{\tt cholmod\_rowdel}: delete row from factor}
%---------------------------------------
\input{_rowdel.tex}
@@ -2908,7 +3190,7 @@ If this is the case, the kth entry of $\m{y}$ is required as input ({\tt yk}).
The algorithm is described in \cite{DavisHager05}.
%---------------------------------------
-\newpage \subsection{{\tt cholmod\_rowadd\_mark}: add row to factor}
+\subsection{{\tt cholmod\_rowadd\_mark}: add row to factor}
%---------------------------------------
\input{_rowadd_mark.tex}
@@ -3010,8 +3292,12 @@ Only real matrices are supported.
Sparse matrix times dense matrix:
{\tt Y = alpha*(A*X) + beta*Y} or {\tt Y = alpha*(A'*X) + beta*Y},
where {\tt A} is sparse and {\tt X} and {\tt Y} are dense.
-When using {\tt A}, {\tt X} has {\tt A->ncol} columns and {\tt Y} has {\tt A->nrow} rows.
-When using {\tt A'}, {\tt X} has {\tt A->nrow} columns and {\tt Y} has {\tt A->ncol} rows.
+When using {\tt A},
+{\tt X} has {\tt A->ncol} rows and
+{\tt Y} has {\tt A->nrow} rows.
+When using {\tt A'},
+{\tt X} has {\tt A->nrow} rows and
+{\tt Y} has {\tt A->ncol} rows.
If {\tt transpose = 0}, then {\tt A} is used;
otherwise, {\tt A'} is used (the complex conjugate transpose).
The {\tt transpose} parameter is ignored if the matrix is symmetric or Hermitian.
@@ -3128,8 +3414,8 @@ pattern symmetry, where 0 is a completely unsymmetric matrix, and 1 is a
perfectly symmetric matrix. This option is used when computing the following
statistics for the matrices in the UF Sparse Matrix Collection.
- numerical symmetry: number of matched offdiagonal nonzeros over
- the total number of offdiagonal entries. A real entry $a_{ij}$, $i \ne j$,
+ numerical symmetry: number of matched off-diagonal nonzeros over
+ the total number of off-diagonal entries. A real entry $a_{ij}$, $i \ne j$,
is matched if $a_{ji} = a_{ij}$, but this is only counted if both
$a_{ji}$ and $a_{ij}$ are nonzero. This does not depend on {\tt Z}.
(If A is complex, then the above test is modified; $a_{ij}$ is matched
diff --git a/src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu.c b/src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu.c
new file mode 100644
index 0000000..31007f8
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu.c
@@ -0,0 +1,479 @@
+/* ========================================================================== */
+/* === GPU/cholmod_gpu -===================================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/GPU Module. Copyright (C) 2014, Timothy A. Davis.
+ * The CHOLMOD/GPU Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* Primary routines:
+ * -----------------
+ * cholmod_gpu_memorysize determine free memory on current GPU
+ * cholmod_gpu_probe ensure a GPU is available
+ * cholmod_gpu_allocate allocate GPU resources
+ * cholmod_gpu_deallocate free GPU resources
+ */
+
+#include "cholmod_internal.h"
+#include "cholmod_core.h"
+#include "cholmod_gpu.h"
+#include "stdio.h"
+#ifdef GPU_BLAS
+#include <cuda_runtime.h>
+#endif
+
+#define MINSIZE (64 * 1024 * 1024)
+
+/* ========================================================================== */
+/* === cholmod_gpu_memorysize =============================================== */
+/* ========================================================================== */
+
+/* Determine the amount of free memory on the current GPU. To use another
+ * GPU, use cudaSetDevice (k) prior to calling this routine, where k is an
+ * integer in the range 0 to the number of devices-1. If the free size is
+ * less than 64 MB, then a size of 1 is returned. Normal usage:
+ *
+ * Common->useGPU = 1 ;
+ * err = cholmod_gpu_memorysize (&totmem, &availmem, Common);
+ * Returns 1 if GPU requested but not available, 0 otherwise
+ */
+
+#ifdef GPU_BLAS
+
+static int poll_gpu (size_t s) /* TRUE if OK, FALSE otherwise */
+{
+ /* Returns TRUE if the GPU has a block of memory of size s,
+ FALSE otherwise. The block of memory is immediately freed. */
+ void *p = NULL ;
+ /* double t = SuiteSparse_time ( ) ; */
+ if (s == 0)
+ {
+ return (FALSE) ;
+ }
+ if (cudaMalloc (&p, s) != cudaSuccess)
+ {
+ /* t = SuiteSparse_time ( ) - t ; */
+ /* printf ("s %lu failed, time %g\n", s, t) ; */
+ return (FALSE) ;
+ }
+ cudaFree (p) ;
+ /* t = SuiteSparse_time ( ) - t ; */
+ /* printf ("s %lu OK time %g\n", s, t) ; */
+ return (TRUE) ;
+}
+
+#endif
+
+int CHOLMOD(gpu_memorysize) /* returns 1 on error, 0 otherwise */
+(
+ size_t *total_mem,
+ size_t *available_mem,
+ cholmod_common *Common
+)
+{
+ size_t good, bad, s, total_free, total_memory ;
+ int k ;
+ double t ;
+
+ *total_mem = 0;
+ *available_mem = 0;
+#ifndef DLONG
+ return 0;
+#endif
+
+ if (Common->useGPU != 1)
+ {
+ return (0) ; /* not using the GPU at all */
+ }
+
+#ifdef GPU_BLAS
+
+ /* find the total amount of free memory */
+ t = SuiteSparse_time ( ) ;
+ cudaMemGetInfo (&total_free, &total_memory) ;
+ t = SuiteSparse_time ( ) - t ;
+ /* printf ("free %lu tot %lu time %g\n", total_free, total_memory, t) ; */
+
+ *total_mem = total_memory;
+
+ if (total_free < MINSIZE)
+ {
+ return (1) ; /* not even 64MB; return failure code */
+ }
+
+ /* try a bit less than the total free memory */
+ s = MAX (MINSIZE, total_free*0.98) ;
+ if (poll_gpu (s))
+ {
+ /* printf ("quick %lu\n", s) ; */
+ *available_mem = s;
+ return (0) ; /* no error */
+ }
+
+ /* ensure s = 64 MB is OK */
+ if (!poll_gpu (MINSIZE))
+ {
+ return (1) ; /* not even 64MB; return failure code */
+ }
+
+ /* 8 iterations of binary search */
+ good = MINSIZE ; /* already known to be OK */
+ bad = total_free ; /* already known to be bad */
+ for (k = 0 ; k < 8 ; k++)
+ {
+ s = (good + bad) / 2 ;
+ if (poll_gpu (s))
+ {
+ good = s ; /* s is OK, increase good */
+ }
+ else
+ {
+ bad = s ; /* s failed, decrease bad */
+ }
+ }
+
+ /* printf ("final %lu\n", good) ; */
+ *available_mem = good;
+
+#endif
+
+ return (0) ; /* no error */
+}
+
+
+/* ========================================================================== */
+/* === cholmod_gpu_probe ==================================================== */
+/* ========================================================================== */
+/*
+ * Used to ensure that a suitable GPU is available. As this version of
+ * CHOLMOD can only utilize a single GPU, only the default (i.e. selected as
+ * 'best' by the NVIDIA driver) is verified as suitable. If this selection
+ * is incorrect, the user can select the proper GPU with the
+ * CUDA_VISIBLE_DEVICES environment variable.
+ *
+ * To be considered suitable, the GPU must have a compute capability > 1 and
+ * more than 1 GB of device memory.
+ */
+
+int CHOLMOD(gpu_probe) ( cholmod_common *Common )
+{
+
+#ifdef GPU_BLAS
+ int ngpus, idevice;
+ double tstart, tend;
+ struct cudaDeviceProp gpuProp;
+
+ if (Common->useGPU != 1)
+ {
+ return (0) ;
+ }
+
+ cudaGetDeviceCount(&ngpus);
+
+ if ( ngpus ) {
+ cudaGetDevice ( &idevice );
+ cudaGetDeviceProperties ( &gpuProp, idevice );
+ if ( gpuProp.major > 1 && 1.0e-9*gpuProp.totalGlobalMem > 1.0 ) {
+ return 1; /* useGPU = 1 */
+ }
+ }
+ CHOLMOD_GPU_PRINTF (("GPU WARNING: useGPUs was selected, "
+ "but no applicable GPUs were found. useGPU reset to FALSE.\n")) ;
+#endif
+
+ /* no GPU is available */
+ return 0; /* useGPU = 0 */
+}
+
+/* ========================================================================== */
+/* === cholmod_gpu_deallocate =============================================== */
+/* ========================================================================== */
+
+/*
+ * Deallocate all GPU related buffers.
+ */
+
+int CHOLMOD(gpu_deallocate)
+(
+ cholmod_common *Common
+)
+{
+
+#ifdef GPU_BLAS
+ cudaError_t cudaErr;
+
+ if ( Common->dev_mempool )
+ {
+ /* fprintf (stderr, "free dev_mempool\n") ; */
+ cudaErr = cudaFree (Common->dev_mempool);
+ /* fprintf (stderr, "free dev_mempool done\n") ; */
+ if ( cudaErr )
+ {
+ ERROR ( CHOLMOD_GPU_PROBLEM,
+ "GPU error when freeing device memory.");
+ }
+ }
+ Common->dev_mempool = NULL;
+ Common->dev_mempool_size = 0;
+
+ if ( Common->host_pinned_mempool )
+ {
+ /* fprintf (stderr, "free host_pinned_mempool\n") ; */
+ cudaErr = cudaFreeHost ( Common->host_pinned_mempool );
+ /* fprintf (stderr, "free host_pinned_mempool done\n") ; */
+ if ( cudaErr )
+ {
+ ERROR ( CHOLMOD_GPU_PROBLEM,
+ "GPU error when freeing host pinned memory.");
+ }
+ }
+ Common->host_pinned_mempool = NULL;
+ Common->host_pinned_mempool_size = 0;
+
+ CHOLMOD (gpu_end) (Common) ;
+#endif
+
+ return (0);
+}
+
+/* ========================================================================== */
+/* === cholmod_gpu_end ====================================================== */
+/* ========================================================================== */
+
+void CHOLMOD(gpu_end)
+(
+ cholmod_common *Common
+)
+{
+#ifdef GPU_BLAS
+ int k ;
+
+ /* ------------------------------------------------------------------ */
+ /* destroy Cublas Handle */
+ /* ------------------------------------------------------------------ */
+
+ if (Common->cublasHandle)
+ {
+ /* fprintf (stderr, "destroy cublas %p\n", Common->cublasHandle) ; */
+ cublasDestroy (Common->cublasHandle) ;
+ /* fprintf (stderr, "destroy cublas done\n") ; */
+ Common->cublasHandle = NULL ;
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* destroy each CUDA stream */
+ /* ------------------------------------------------------------------ */
+
+ for (k = 0 ; k < CHOLMOD_HOST_SUPERNODE_BUFFERS ; k++)
+ {
+ if (Common->gpuStream [k])
+ {
+ /* fprintf (stderr, "destroy gpuStream [%d] %p\n", k,
+ Common->gpuStream [k]) ; */
+ cudaStreamDestroy (Common->gpuStream [k]) ;
+ /* fprintf (stderr, "destroy gpuStream [%d] done\n", k) ; */
+ Common->gpuStream [k] = NULL ;
+ }
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* destroy each CUDA event */
+ /* ------------------------------------------------------------------ */
+
+ for (k = 0 ; k < 3 ; k++)
+ {
+ if (Common->cublasEventPotrf [k])
+ {
+ /* fprintf (stderr, "destroy cublasEnventPotrf [%d] %p\n", k,
+ Common->cublasEventPotrf [k]) ; */
+ cudaEventDestroy (Common->cublasEventPotrf [k]) ;
+ /* fprintf (stderr, "destroy cublasEnventPotrf [%d] done\n", k) ; */
+ Common->cublasEventPotrf [k] = NULL ;
+ }
+ }
+
+ for (k = 0 ; k < CHOLMOD_HOST_SUPERNODE_BUFFERS ; k++)
+ {
+ if (Common->updateCBuffersFree [k])
+ {
+ /* fprintf (stderr, "destroy updateCBuffersFree [%d] %p\n", k,
+ Common->updateCBuffersFree [k]) ; */
+ cudaEventDestroy (Common->updateCBuffersFree [k]) ;
+ /* fprintf (stderr, "destroy updateCBuffersFree [%d] done\n", k) ;*/
+ Common->updateCBuffersFree [k] = NULL ;
+ }
+ }
+
+ if (Common->updateCKernelsComplete)
+ {
+ /* fprintf (stderr, "destroy updateCKernelsComplete %p\n",
+ Common->updateCKernelsComplete) ; */
+ cudaEventDestroy (Common->updateCKernelsComplete) ;
+ /* fprintf (stderr, "destroy updateCKernelsComplete done\n") ; */
+ Common->updateCKernelsComplete = NULL;
+ }
+#endif
+}
+
+
+/* ========================================================================== */
+/* === cholmod_gpu_allocate ================================================= */
+/* ========================================================================== */
+/*
+ * Allocate both host and device memory needed for GPU computation.
+ *
+ * Memory allocation is expensive and should be done once and reused for
+ * multiple factorizations.
+ *
+ * When gpu_allocate is called, the requested amount of device (and by
+ * association host) memory is computed. If that amount or more memory has
+ * already been allocated, then nothing is done. (i.e. memory allocation is
+ * not reduced.) If the requested amount is more than is currently allcoated
+ * then both device and pinned host memory is freed and the new amount
+ * allocated.
+ *
+ * This routine will allocate the minimum of either:
+ *
+ * maxGpuMemBytes - size of requested device allocation in bytes
+ *
+ * maxGpuMemFraction - size of requested device allocation as a fraction of
+ * total GPU memory
+ *
+ * If both maxGpuMemBytes and maxGpuMemFraction are zero, this will allocate
+ * the maximum amount of GPU memory possible.
+ *
+ * Note that since the GPU driver requires some memory, it is not advisable
+ * to request maxGpuMemFraction of 1.0 (which will request all GPU memory and
+ * will fail). If maximum memory is requested then call this routine wtih
+ * both maxGpuMemBytes and maxGpuMemFraction of 0.0.
+ *
+ */
+
+int CHOLMOD(gpu_allocate) ( cholmod_common *Common )
+{
+
+#ifdef GPU_BLAS
+
+ int k;
+ size_t fdm, tdm;
+ size_t requestedDeviceMemory, requestedHostMemory;
+ double tstart, tend;
+ cudaError_t cudaErr;
+ cublasStatus_t cublasErr;
+ size_t maxGpuMemBytes;
+ double maxGpuMemFraction;
+
+ /* fprintf (stderr, "gpu_allocate useGPU %d\n", Common->useGPU) ; */
+ if (Common->useGPU != 1) return (0) ;
+
+ maxGpuMemBytes = Common->maxGpuMemBytes;
+ maxGpuMemFraction = Common->maxGpuMemFraction;
+
+ /* ensure valid input */
+ if ( maxGpuMemBytes < 0 ) maxGpuMemBytes = 0;
+ if ( maxGpuMemFraction < 0 ) maxGpuMemFraction = 0;
+ if ( maxGpuMemFraction > 1 ) maxGpuMemFraction = 1;
+
+ int err = CHOLMOD(gpu_memorysize) (&tdm,&fdm,Common) ;
+ if (err)
+ {
+ printf ("GPU failure in cholmod_gpu: gpu_memorysize %g %g MB\n",
+ ((double) tdm) / (1024*1024),
+ ((double) fdm) / (1024*1024)) ;
+ ERROR (CHOLMOD_GPU_PROBLEM, "gpu memorysize failure\n") ;
+ }
+
+ /* compute the amount of device memory requested */
+ if ( maxGpuMemBytes == 0 && maxGpuMemFraction == 0 ) {
+ /* no specific request - take all available GPU memory
+ * (other programs could already have allocated some GPU memory,
+ * possibly even previous calls to gpu_allocate). Always leave
+ * 50 MB free for driver use. */
+ requestedDeviceMemory = fdm+Common->dev_mempool_size-
+ 1024ll*1024ll*50ll;
+ }
+ else if ( maxGpuMemBytes > 0 && maxGpuMemFraction > 0 ) {
+ /* both byte and fraction limits - take the lowest of the two */
+ requestedDeviceMemory = maxGpuMemBytes;
+ if ( requestedDeviceMemory > tdm*maxGpuMemFraction ) {
+ requestedDeviceMemory = tdm*maxGpuMemFraction;
+ }
+ }
+ else if ( maxGpuMemFraction > 0 ) {
+ /* just a fraction requested */
+ requestedDeviceMemory = maxGpuMemFraction * tdm;
+ }
+ else {
+ /* specific number of bytes requested */
+ requestedDeviceMemory = maxGpuMemBytes;
+ if ( maxGpuMemBytes > fdm ) {
+ CHOLMOD_GPU_PRINTF ((
+ "GPU WARNING: Requested amount of device memory not available\n"
+ )) ;
+ requestedDeviceMemory = fdm;
+ }
+ }
+
+ /* do nothing if sufficient memory has already been allocated */
+ if ( requestedDeviceMemory <= Common->dev_mempool_size ) {
+
+ CHOLMOD_GPU_PRINTF (("requested = %d, mempool = %d \n",
+ requestedDeviceMemory, Common->dev_mempool_size));
+ CHOLMOD_GPU_PRINTF (("GPU NOTE: gpu_allocate did nothing \n"));
+ return 0;
+ }
+
+ CHOLMOD(gpu_deallocate);
+
+ /* create cuBlas handle */
+ if ( ! Common->cublasHandle ) {
+ cublasErr = cublasCreate (&(Common->cublasHandle)) ;
+ if (cublasErr != CUBLAS_STATUS_SUCCESS) {
+ ERROR (CHOLMOD_GPU_PROBLEM, "CUBLAS initialization") ;
+ return 1;
+ }
+ }
+
+ /* allocated corresponding pinned host memory */
+ requestedHostMemory = requestedDeviceMemory*CHOLMOD_HOST_SUPERNODE_BUFFERS/
+ CHOLMOD_DEVICE_SUPERNODE_BUFFERS;
+
+ cudaErr = cudaMallocHost ( (void**)&(Common->host_pinned_mempool),
+ requestedHostMemory );
+ while ( cudaErr ) {
+ /* insufficient host memory, try again with less */
+ requestedHostMemory *= .5;
+ cudaErr = cudaMallocHost ( (void**)&(Common->host_pinned_mempool),
+ requestedHostMemory );
+ }
+ Common->host_pinned_mempool_size = requestedHostMemory;
+
+ requestedDeviceMemory = requestedHostMemory*
+ CHOLMOD_DEVICE_SUPERNODE_BUFFERS/CHOLMOD_HOST_SUPERNODE_BUFFERS;
+
+ /* Split up the memory allocations into required device buffers. */
+ Common->devBuffSize = requestedDeviceMemory/
+ (size_t)CHOLMOD_DEVICE_SUPERNODE_BUFFERS;
+ Common->devBuffSize -= Common->devBuffSize%0x20000;
+
+ cudaErr = cudaMalloc ( &(Common->dev_mempool), requestedDeviceMemory );
+ /*
+ CHOLMOD_HANDLE_CUDA_ERROR (cudaErr,"device memory allocation failure\n");
+ */
+ if (cudaErr)
+ {
+ printf ("GPU failure in cholmod_gpu: requested %g MB\n",
+ ((double) requestedDeviceMemory) / (1024*1024)) ;
+ ERROR (CHOLMOD_GPU_PROBLEM, "device memory allocation failure\n") ;
+ }
+
+ Common->dev_mempool_size = requestedDeviceMemory;
+
+#endif
+
+ return (0);
+}
diff --git a/src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu_kernels.c b/src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu_kernels.c
new file mode 100644
index 0000000..95d1378
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu_kernels.c
@@ -0,0 +1,6 @@
+/* ========================================================================== */
+/* === cholmod_gpu_kernels.c ================================================ */
+/* ========================================================================== */
+
+/* a dummy file to satisfy 'make' when the GPU is not available */
+
diff --git a/src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu_kernels.cu b/src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu_kernels.cu
new file mode 100644
index 0000000..1e212a2
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/GPU/cholmod_gpu_kernels.cu
@@ -0,0 +1,196 @@
+/* ========================================================================== */
+/* ========================= CHOLMOD CUDA/C kernels ========================= */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/GPU Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/GPU Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+#include <stdio.h>
+#include "SuiteSparse_config.h"
+/* 64-bit version only */
+#define Int SuiteSparse_long
+
+extern "C" {
+
+ __global__ void kernelCreateMap ( Int *d_Map, Int *d_Ls,
+ Int psi, Int nsrow )
+ /*
+ Ls[supernode row] = Matrix Row
+ */
+ {
+ int tid = blockIdx.x * blockDim.x + threadIdx.x;
+ if ( tid < nsrow ) {
+ d_Map[d_Ls[psi+tid]] = ((Int) (tid));
+ }
+ }
+
+ __global__ void kernelCreateRelativeMap ( Int *d_Map, Int *d_Ls,
+ Int *d_RelativeMap,
+ Int pdi1, Int ndrow )
+ {
+ int tid = blockIdx.x * blockDim.x + threadIdx.x;
+ if ( tid < ndrow ) {
+ d_RelativeMap[tid] = d_Map[d_Ls[pdi1+tid]];
+ }
+ }
+
+ __global__ void kernelAddUpdate ( double *d_A, double *devPtrC,
+ Int *d_RelativeMap,
+ Int ndrow1, Int ndrow2,
+ Int nsrow )
+ {
+ int idrow = blockIdx.x * blockDim.x + threadIdx.x;
+ int idcol = blockIdx.y * blockDim.y + threadIdx.y;
+ if ( idrow < ndrow2 && idcol < ndrow1 ) {
+ Int idx = d_RelativeMap[idrow] + d_RelativeMap[idcol] * nsrow;
+ d_A[idx] += devPtrC[idrow+ndrow2*idcol];
+ }
+ }
+
+ __global__ void kernelAddComplexUpdate ( double *d_A, double *devPtrC,
+ Int *d_RelativeMap,
+ Int ndrow1, Int ndrow2,
+ Int nsrow )
+ {
+ int idrow = blockIdx.x * blockDim.x + threadIdx.x;
+ int idcol = blockIdx.y * blockDim.y + threadIdx.y;
+ if ( idrow < ndrow2 && idcol < ndrow1 ) {
+ Int idx = d_RelativeMap[idrow] + d_RelativeMap[idcol] * nsrow;
+ d_A[idx*2] += devPtrC[(idrow+ndrow2*idcol)*2];
+ d_A[idx*2+1] += devPtrC[(idrow+ndrow2*idcol)*2+1];
+ }
+ }
+
+ __global__ void kernelSumA ( double *a1, double *a2, const double alpha,
+ int nsrow, int nscol ) {
+ int isrow = blockIdx.x * blockDim.x + threadIdx.x;
+ int iscol = blockIdx.y * blockDim.y + threadIdx.y;
+ if ( isrow < nsrow && iscol < nscol ) {
+ Int idx = iscol*nsrow + isrow;
+ a1[idx] += alpha * a2[idx];
+ }
+ }
+
+ __global__ void kernelSumComplexA ( double *a1, double *a2,
+ const double alpha, int nsrow,
+ int nscol ) {
+ int isrow = blockIdx.x * blockDim.x + threadIdx.x;
+ int iscol = blockIdx.y * blockDim.y + threadIdx.y;
+ if ( isrow < nsrow && iscol < nscol ) {
+ Int idx = iscol*nsrow + isrow;
+ a1[idx*2] += alpha * a2[idx*2];
+ a1[idx*2+1] += alpha * a2[idx*2+1];
+ }
+ }
+
+ /* ======================================================================== */
+ /* using Ls and Lpi data already on the device, construct Map */
+ /* ======================================================================== */
+ int createMapOnDevice ( Int *d_Map, Int *d_Ls,
+ Int psi, Int nsrow )
+ {
+ unsigned int kgrid = (nsrow+31)/32;
+ unsigned int kblock = 32;
+ kernelCreateMap <<<kgrid, kblock>>> ( d_Map, d_Ls, psi, nsrow );
+ return 0;
+ }
+
+
+ int createRelativeMapOnDevice ( Int *d_Map, Int *d_Ls,
+ Int *d_RelativeMap,Int pdi1,
+ Int ndrow, cudaStream_t* astream )
+ {
+ unsigned int kgrid = (ndrow+255)/256;
+ unsigned int kblock = 256;
+ kernelCreateRelativeMap <<<kgrid, kblock, 0, *astream>>>
+ ( d_Map, d_Ls, d_RelativeMap, pdi1, ndrow);
+ return 0;
+ }
+
+
+ /* ======================================================================== */
+ int addUpdateOnDevice ( double *d_A, double *devPtrC,
+ Int *d_RelativeMap, Int ndrow1,
+ Int ndrow2, Int nsrow,
+ cudaStream_t* astream )
+ /* ======================================================================== */
+ /* Assemble the Schur complment from a descendant supernode into the current
+ supernode */
+ /* ======================================================================== */
+{
+ dim3 grids;
+ dim3 blocks;
+
+ blocks.x = 16;
+ blocks.y = 16;
+ blocks.z = 1;
+
+ grids.x = (ndrow2+15)/16;
+ grids.y = (ndrow1+15)/16;
+
+ kernelAddUpdate <<<grids, blocks, 0, *astream>>>
+ ( d_A, devPtrC, d_RelativeMap, ndrow1, ndrow2, nsrow );
+
+ return 0;
+}
+
+ /* ======================================================================== */
+ int addComplexUpdateOnDevice ( double *d_A, double *devPtrC,
+ Int *d_RelativeMap, Int ndrow1,
+ Int ndrow2, Int nsrow,
+ cudaStream_t* astream )
+ /* ======================================================================== */
+ /* Assemble the Schur complment from a descendant supernode into the current
+ supernode */
+ /* ======================================================================== */
+{
+ dim3 grids;
+ dim3 blocks;
+
+ blocks.x = 16;
+ blocks.y = 16;
+ blocks.z = 1;
+
+ grids.x = (ndrow2+15)/16;
+ grids.y = (ndrow1+15)/16;
+
+ kernelAddComplexUpdate <<<grids, blocks, 0, *astream>>>
+ ( d_A, devPtrC, d_RelativeMap, ndrow1, ndrow2, nsrow );
+
+ return 0;
+}
+
+ int sumAOnDevice ( double *a1, double *a2, const double alpha,
+ int nsrow, int nscol )
+ {
+ dim3 grids;
+ dim3 blocks;
+ blocks.x = 16;
+ blocks.y = 16;
+ blocks.z = 1;
+ grids.x = (nsrow+15)/16;
+ grids.y = (nscol+15)/16;
+ kernelSumA <<<grids, blocks, 0, 0>>> ( a1, a2, alpha, nsrow, nscol );
+ return 0;
+ }
+
+ int sumComplexAOnDevice ( double *a1, double *a2, const double alpha,
+ int nsrow, int nscol )
+ {
+ dim3 grids;
+ dim3 blocks;
+ blocks.x = 16;
+ blocks.y = 16;
+ blocks.z = 1;
+ grids.x = (nsrow+15)/16;
+ grids.y = (nscol+15)/16;
+ kernelSumComplexA <<<grids, blocks, 0, 0>>> ( a1, a2, alpha, nsrow, nscol );
+ return 0;
+ }
+
+}
diff --git a/src/C/SuiteSparse/CHOLMOD/GPU/t_cholmod_gpu.c b/src/C/SuiteSparse/CHOLMOD/GPU/t_cholmod_gpu.c
new file mode 100644
index 0000000..ec45f51
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/GPU/t_cholmod_gpu.c
@@ -0,0 +1,1397 @@
+/* ========================================================================== */
+/* === GPU/t_cholmod_gpu ==================================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/GPU Module. Copyright (C) 2005-2012, Timothy A. Davis
+ * The CHOLMOD/GPU Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* GPU BLAS template routine for cholmod_super_numeric. */
+
+/* ========================================================================== */
+/* === include files and definitions ======================================== */
+/* ========================================================================== */
+
+#ifdef GPU_BLAS
+
+#include <string.h>
+#include "cholmod_template.h"
+
+#undef L_ENTRY
+#ifdef REAL
+#define L_ENTRY 1
+#else
+#define L_ENTRY 2
+#endif
+
+
+/* ========================================================================== */
+/* === gpu_clear_memory ===================================================== */
+/* ========================================================================== */
+/*
+ * Ensure the Lx is zeroed before forming factor. This is a significant cost
+ * in the GPU case - so using this parallel memset code for efficiency.
+ */
+
+void TEMPLATE2 (CHOLMOD (gpu_clear_memory))
+(
+ double* buff,
+ size_t size,
+ int num_threads
+)
+{
+ int chunk_multiplier = 5;
+ int num_chunks = chunk_multiplier * num_threads;
+ size_t chunksize = size / num_chunks;
+ size_t i;
+
+#pragma omp parallel for num_threads(num_threads) private(i) schedule(dynamic)
+ for(i = 0; i < num_chunks; i++) {
+ size_t chunkoffset = i * chunksize;
+ if(i == num_chunks - 1) {
+ memset(buff + chunkoffset, 0, (size - chunksize*(num_chunks - 1)) *
+ sizeof(double));
+ }
+ else {
+ memset(buff + chunkoffset, 0, chunksize * sizeof(double));
+ }
+ }
+}
+
+/* ========================================================================== */
+/* === gpu_init ============================================================= */
+/* ========================================================================== */
+/*
+ * Performs required initialization for GPU computing.
+ *
+ * Returns 0 if there is an error, so the intended use is
+ *
+ * useGPU = CHOLMOD(gpu_init)
+ *
+ * which would locally turn off gpu processing if the initialization failed.
+ */
+
+int TEMPLATE2 (CHOLMOD (gpu_init))
+(
+ void *Cwork,
+ cholmod_factor *L,
+ cholmod_common *Common,
+ Int nsuper,
+ Int n,
+ Int nls,
+ cholmod_gpu_pointers *gpu_p
+)
+{
+ Int i, k, maxSize ;
+ cublasStatus_t cublasError ;
+ cudaError_t cudaErr ;
+ size_t maxBytesSize, HostPinnedSize ;
+
+ feenableexcept (FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW );
+
+ maxSize = L->maxcsize;
+
+ /* #define PAGE_SIZE (4*1024) */
+ CHOLMOD_GPU_PRINTF (("gpu_init : %p\n",
+ (void *) ((size_t) Cwork & ~(4*1024-1)))) ;
+
+ /* make sure the assumed buffer sizes are large enough */
+ if ( (nls+2*n+4)*sizeof(Int) > Common->devBuffSize ) {
+ ERROR (CHOLMOD_GPU_PROBLEM,"\n\n"
+ "GPU Memory allocation error. Ls, Map and RelativeMap exceed\n"
+ "devBuffSize. It is not clear if this is due to insufficient\n"
+ "device or host memory or both. You can try:\n"
+ " 1) increasing the amount of GPU memory requested\n"
+ " 2) reducing CHOLMOD_NUM_HOST_BUFFERS\n"
+ " 3) using a GPU & host with more memory\n"
+ "This issue is a known limitation and should be fixed in a \n"
+ "future release of CHOLMOD.\n") ;
+ return (0) ;
+ }
+
+ /* divvy up the memory in dev_mempool */
+ gpu_p->d_Lx[0] = Common->dev_mempool;
+ gpu_p->d_Lx[1] = Common->dev_mempool + Common->devBuffSize;
+ gpu_p->d_C = Common->dev_mempool + 2*Common->devBuffSize;
+ gpu_p->d_A[0] = Common->dev_mempool + 3*Common->devBuffSize;
+ gpu_p->d_A[1] = Common->dev_mempool + 4*Common->devBuffSize;
+ gpu_p->d_Ls = Common->dev_mempool + 5*Common->devBuffSize;
+ gpu_p->d_Map = gpu_p->d_Ls + (nls+1)*sizeof(Int) ;
+ gpu_p->d_RelativeMap = gpu_p->d_Map + (n+1)*sizeof(Int) ;
+
+ /* Copy all of the Ls and Lpi data to the device. If any supernodes are
+ * to be computed on the device then this will be needed, so might as
+ * well do it now. */
+
+ cudaErr = cudaMemcpy ( gpu_p->d_Ls, L->s, nls*sizeof(Int),
+ cudaMemcpyHostToDevice );
+ CHOLMOD_HANDLE_CUDA_ERROR(cudaErr,"cudaMemcpy(d_Ls)");
+
+ if (!(Common->gpuStream[0])) {
+
+ /* ------------------------------------------------------------------ */
+ /* create each CUDA stream */
+ /* ------------------------------------------------------------------ */
+
+ for ( i=0; i<CHOLMOD_HOST_SUPERNODE_BUFFERS; i++ ) {
+ cudaErr = cudaStreamCreate ( &(Common->gpuStream[i]) );
+ if (cudaErr != cudaSuccess) {
+ ERROR (CHOLMOD_GPU_PROBLEM, "CUDA stream") ;
+ return (0) ;
+ }
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* create each CUDA event */
+ /* ------------------------------------------------------------------ */
+
+ for (i = 0 ; i < 3 ; i++) {
+ cudaErr = cudaEventCreateWithFlags
+ (&(Common->cublasEventPotrf [i]), cudaEventDisableTiming) ;
+ if (cudaErr != cudaSuccess) {
+ ERROR (CHOLMOD_GPU_PROBLEM, "CUDA event") ;
+ return (0) ;
+ }
+ }
+
+ for (i = 0 ; i < CHOLMOD_HOST_SUPERNODE_BUFFERS ; i++) {
+ cudaErr = cudaEventCreateWithFlags
+ (&(Common->updateCBuffersFree[i]), cudaEventDisableTiming) ;
+ if (cudaErr != cudaSuccess) {
+ ERROR (CHOLMOD_GPU_PROBLEM, "CUDA event") ;
+ return (0) ;
+ }
+ }
+
+ cudaErr = cudaEventCreateWithFlags ( &(Common->updateCKernelsComplete),
+ cudaEventDisableTiming );
+ if (cudaErr != cudaSuccess) {
+ ERROR (CHOLMOD_GPU_PROBLEM, "CUDA updateCKernelsComplete event") ;
+ return (0) ;
+ }
+
+ }
+
+ gpu_p->h_Lx[0] = (double*)(Common->host_pinned_mempool);
+ for ( k=1; k<CHOLMOD_HOST_SUPERNODE_BUFFERS; k++ ) {
+ gpu_p->h_Lx[k] = (double*)((char *)(Common->host_pinned_mempool) +
+ k*Common->devBuffSize);
+ }
+
+ return (1); /* initialization successfull, useGPU = 1 */
+
+}
+
+
+/* ========================================================================== */
+/* === gpu_reorder_descendants ============================================== */
+/* ========================================================================== */
+/* Reorder the descendant supernodes as:
+ * 1st - descendant supernodes eligible for processing on the GPU
+ * in increasing (by flops) order
+ * 2nd - supernodes whose processing is to remain on the CPU
+ * in any order
+ *
+ * All of the GPU-eligible supernodes will be scheduled first. All
+ * CPU-eligible descendants will overlap with the last (largest)
+ * CHOLMOD_HOST_SUPERNODE_BUFFERS GPU-eligible descendants.
+ */
+
+void TEMPLATE2 (CHOLMOD (gpu_reorder_descendants))
+(
+ cholmod_common *Common,
+ Int *Super,
+ Int *locals,
+ Int *Lpi,
+ Int *Lpos,
+ Int *Head,
+ Int *Next,
+ Int *Previous,
+ Int *ndescendants,
+ Int *tail,
+ Int *mapCreatedOnGpu,
+ cholmod_gpu_pointers *gpu_p
+)
+{
+
+ Int prevd, nextd, firstcpu, d, k, kd1, kd2, ndcol, pdi, pdend, pdi1;
+ Int dnext, ndrow2, p;
+ Int n_descendant = 0;
+ double score;
+
+ /* use h_Lx[0] to buffer the GPU-eligible descendants */
+ struct cholmod_descendant_score_t* scores =
+ (struct cholmod_descendant_score_t*) gpu_p->h_Lx[0];
+
+ double cpuref = 0.0;
+
+ int nreverse = 1;
+ int previousd;
+
+
+ d = Head[*locals];
+ prevd = -1;
+ firstcpu = -1;
+ *mapCreatedOnGpu = 0;
+
+ while ( d != EMPTY )
+ {
+
+ /* Get the parameters for the current descendant supernode */
+ kd1 = Super [d] ; /* d contains cols kd1 to kd2-1 of L */
+ kd2 = Super [d+1] ;
+ ndcol = kd2 - kd1 ; /* # of columns in all of d */
+ pdi = Lpi [d] ; /* pointer to first row of d in Ls */
+ pdend = Lpi [d+1] ; /* pointer just past last row of d in Ls */
+ p = Lpos [d] ; /* offset of 1st row of d affecting s */
+ pdi1 = pdi + p ; /* ptr to 1st row of d affecting s in Ls */
+ ndrow2 = pdend - pdi1;
+
+ nextd = Next[d];
+
+ /* compute a rough flops 'score' for this descendant supernode */
+ score = ndrow2 * ndcol;
+ if ( ndrow2*L_ENTRY >= CHOLMOD_ND_ROW_LIMIT &&
+ ndcol*L_ENTRY >= CHOLMOD_ND_COL_LIMIT ) {
+ score += Common->devBuffSize;
+ }
+
+ /* place in sort buffer */
+ scores[n_descendant].score = score;
+ scores[n_descendant].d = d;
+ n_descendant++;
+
+ d = nextd;
+
+ }
+
+ /* Sort the GPU-eligible supernodes */
+ qsort ( scores, n_descendant, sizeof(struct cholmod_descendant_score_t),
+ (__compar_fn_t) CHOLMOD(score_comp) );
+
+ /* Place sorted data back in descendant supernode linked list*/
+ if ( n_descendant > 0 ) {
+ Head[*locals] = scores[0].d;
+ if ( n_descendant > 1 ) {
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ if (n_descendant > 64)
+
+ for ( k=1; k<n_descendant; k++ ) {
+ Next[scores[k-1].d] = scores[k].d;
+ }
+ }
+ Next[scores[n_descendant-1].d] = firstcpu;
+ }
+
+ /* reverse the first CHOLMOD_HOST_SUPERNODE_BUFFERS to better hide PCIe
+ communications */
+
+ if ( Head[*locals] != EMPTY && Next[Head[*locals]] != EMPTY ) {
+ previousd = Head[*locals];
+ d = Next[Head[*locals]];
+ while ( d!=EMPTY && nreverse < CHOLMOD_HOST_SUPERNODE_BUFFERS ) {
+
+ kd1 = Super [d] ; /* d contains cols kd1 to kd2-1 of L */
+ kd2 = Super [d+1] ;
+ ndcol = kd2 - kd1 ; /* # of columns in all of d */
+ pdi = Lpi [d] ; /* pointer to first row of d in Ls */
+ pdend = Lpi [d+1] ; /* pointer just past last row of d in Ls */
+ p = Lpos [d] ; /* offset of 1st row of d affecting s */
+ pdi1 = pdi + p ; /* ptr to 1st row of d affecting s in Ls */
+ ndrow2 = pdend - pdi1;
+
+ nextd = Next[d];
+
+ nreverse++;
+
+ if ( ndrow2*L_ENTRY >= CHOLMOD_ND_ROW_LIMIT && ndcol*L_ENTRY >=
+ CHOLMOD_ND_COL_LIMIT ) {
+ /* place this supernode at the front of the list */
+ Next[previousd] = Next[d];
+ Next[d] = Head[*locals];
+ Head[*locals] = d;
+ }
+ else {
+ previousd = d;
+ }
+ d = nextd;
+ }
+ }
+
+ /* create a 'previous' list so we can traverse backwards */
+ *ndescendants = 0;
+ if ( Head[*locals] != EMPTY ) {
+ Previous[Head[*locals]] = EMPTY;
+ for (d = Head [*locals] ; d != EMPTY ; d = dnext) {
+ (*ndescendants)++;
+ dnext = Next[d];
+ if ( dnext != EMPTY ) {
+ Previous[dnext] = d;
+ }
+ else {
+ *tail = d;
+ }
+ }
+ }
+
+ return;
+
+}
+
+/* ========================================================================== */
+/* === gpu_initialize_supernode ============================================= */
+/* ========================================================================== */
+
+/* C = L (k1:n-1, kd1:kd2-1) * L (k1:k2-1, kd1:kd2-1)', except that k1:n-1
+ */
+
+void TEMPLATE2 (CHOLMOD (gpu_initialize_supernode))
+(
+ cholmod_common *Common,
+ Int nscol,
+ Int nsrow,
+ Int psi,
+ cholmod_gpu_pointers *gpu_p
+)
+{
+
+ cudaError_t cuErr;
+
+ /* initialize the device supernode assemby memory to zero */
+ cuErr = cudaMemset ( gpu_p->d_A[0], 0, nscol*nsrow*L_ENTRY*sizeof(double) );
+ CHOLMOD_HANDLE_CUDA_ERROR(cuErr,"cudaMemset(d_A)");
+
+ /* Create the Map on the device */
+ createMapOnDevice ( (Int *)(gpu_p->d_Map),
+ (Int *)(gpu_p->d_Ls), psi, nsrow );
+
+ return;
+
+}
+
+
+/* ========================================================================== */
+/* === gpu_updateC ========================================================== */
+/* ========================================================================== */
+
+/* C = L (k1:n-1, kd1:kd2-1) * L (k1:k2-1, kd1:kd2-1)', except that k1:n-1
+ * refers to all of the rows in L, but many of the rows are all zero.
+ * Supernode d holds columns kd1 to kd2-1 of L. Nonzero rows in the range
+ * k1:k2-1 are in the list Ls [pdi1 ... pdi2-1], of size ndrow1. Nonzero rows
+ * in the range k2:n-1 are in the list Ls [pdi2 ... pdend], of size ndrow2.
+ * Let L1 = L (Ls [pdi1 ... pdi2-1], kd1:kd2-1), and let L2 = L (Ls [pdi2 ...
+ * pdend], kd1:kd2-1). C is ndrow2-by-ndrow1. Let C1 be the first ndrow1
+ * rows of C and let C2 be the last ndrow2-ndrow1 rows of C. Only the lower
+ * triangular part of C1 needs to be computed since C1 is symmetric.
+ *
+ * UpdateC is completely asynchronous w.r.t. the GPU. Once the input buffer
+ * d_Lx[] has been filled, all of the device operations are issues, and the
+ * host can continue with filling the next input buffer / or start processing
+ * all of the descendant supernodes which are not eligible for processing on
+ * the device (since they are too small - will not fill the device).
+ */
+
+int TEMPLATE2 (CHOLMOD (gpu_updateC))
+(
+ Int ndrow1, /* C is ndrow2-by-ndrow2 */
+ Int ndrow2,
+ Int ndrow, /* leading dimension of Lx */
+ Int ndcol, /* L1 is ndrow1-by-ndcol */
+ Int nsrow,
+ Int pdx1, /* L1 starts at Lx + L_ENTRY*pdx1 */
+ /* L2 starts at Lx + L_ENTRY*(pdx1 + ndrow1) */
+ Int pdi1,
+ double *Lx,
+ double *C,
+ cholmod_common *Common,
+ cholmod_gpu_pointers *gpu_p
+)
+{
+ double *devPtrLx, *devPtrC ;
+ double alpha, beta ;
+ cublasStatus_t cublasStatus ;
+ cudaError_t cudaStat [2] ;
+ Int ndrow3 ;
+ int icol, irow;
+ int iHostBuff, iDevBuff ;
+
+#ifndef NTIMER
+ double tstart = 0;
+#endif
+
+ if ((ndrow2*L_ENTRY < CHOLMOD_ND_ROW_LIMIT) ||
+ (ndcol*L_ENTRY < CHOLMOD_ND_COL_LIMIT))
+ {
+ /* too small for the CUDA BLAS; use the CPU instead */
+ return (0) ;
+ }
+
+ ndrow3 = ndrow2 - ndrow1 ;
+
+#ifndef NTIMER
+ Common->syrkStart = SuiteSparse_time ( ) ;
+ Common->CHOLMOD_GPU_SYRK_CALLS++ ;
+#endif
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate workspace on the GPU */
+ /* ---------------------------------------------------------------------- */
+
+ iHostBuff = (Common->ibuffer)%CHOLMOD_HOST_SUPERNODE_BUFFERS;
+ iDevBuff = (Common->ibuffer)%CHOLMOD_DEVICE_STREAMS;
+
+ /* cycle the device Lx buffer, d_Lx, through CHOLMOD_DEVICE_STREAMS,
+ usually 2, so we can overlap the copy of this descendent supernode
+ with the compute of the previous descendant supernode */
+ devPtrLx = (double *)(gpu_p->d_Lx[iDevBuff]);
+ /* very little overlap between kernels for difference descendant supernodes
+ (since we enforce the supernodes must be large enough to fill the
+ device) so we only need one C buffer */
+ devPtrC = (double *)(gpu_p->d_C);
+
+ /* ---------------------------------------------------------------------- */
+ /* copy Lx to the GPU */
+ /* ---------------------------------------------------------------------- */
+
+ /* copy host data to pinned buffer first for better H2D bandwidth */
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) if (ndcol > 32)
+ for ( icol=0; icol<ndcol; icol++ ) {
+ for ( irow=0; irow<ndrow2*L_ENTRY; irow++ ) {
+ gpu_p->h_Lx[iHostBuff][icol*ndrow2*L_ENTRY+irow] =
+ Lx[pdx1*L_ENTRY+icol*ndrow*L_ENTRY + irow];
+ }
+ }
+
+ cudaStat[0] = cudaMemcpyAsync ( devPtrLx,
+ gpu_p->h_Lx[iHostBuff],
+ ndrow2*ndcol*L_ENTRY*sizeof(devPtrLx[0]),
+ cudaMemcpyHostToDevice,
+ Common->gpuStream[iDevBuff] );
+
+ if ( cudaStat[0] ) {
+ CHOLMOD_GPU_PRINTF ((" ERROR cudaMemcpyAsync = %d \n", cudaStat[0]));
+ return (0);
+ }
+
+ /* make the current stream wait for kernels in previous streams */
+ cudaStreamWaitEvent ( Common->gpuStream[iDevBuff],
+ Common->updateCKernelsComplete, 0 ) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* create the relative map for this descendant supernode */
+ /* ---------------------------------------------------------------------- */
+
+ createRelativeMapOnDevice ( (Int *)(gpu_p->d_Map),
+ (Int *)(gpu_p->d_Ls),
+ (Int *)(gpu_p->d_RelativeMap),
+ pdi1, ndrow2,
+ &(Common->gpuStream[iDevBuff]) );
+
+ /* ---------------------------------------------------------------------- */
+ /* do the CUDA SYRK */
+ /* ---------------------------------------------------------------------- */
+
+ cublasStatus = cublasSetStream (Common->cublasHandle,
+ Common->gpuStream[iDevBuff]) ;
+ if (cublasStatus != CUBLAS_STATUS_SUCCESS)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU CUBLAS stream") ;
+ }
+
+ alpha = 1.0 ;
+ beta = 0.0 ;
+
+#ifdef REAL
+ cublasStatus = cublasDsyrk (Common->cublasHandle,
+ CUBLAS_FILL_MODE_LOWER,
+ CUBLAS_OP_N,
+ (int) ndrow1,
+ (int) ndcol, /* N, K: L1 is ndrow1-by-ndcol */
+ &alpha, /* ALPHA: 1 */
+ devPtrLx,
+ ndrow2, /* A, LDA: L1, ndrow2 */
+ &beta, /* BETA: 0 */
+ devPtrC,
+ ndrow2) ; /* C, LDC: C1 */
+#else
+ cublasStatus = cublasZherk (Common->cublasHandle,
+ CUBLAS_FILL_MODE_LOWER,
+ CUBLAS_OP_N,
+ (int) ndrow1,
+ (int) ndcol, /* N, K: L1 is ndrow1-by-ndcol*/
+ &alpha, /* ALPHA: 1 */
+ (const cuDoubleComplex *) devPtrLx,
+ ndrow2, /* A, LDA: L1, ndrow2 */
+ &beta, /* BETA: 0 */
+ (cuDoubleComplex *) devPtrC,
+ ndrow2) ; /* C, LDC: C1 */
+#endif
+
+ if (cublasStatus != CUBLAS_STATUS_SUCCESS)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU CUBLAS routine failure") ;
+ }
+
+#ifndef NTIMER
+ Common->CHOLMOD_GPU_SYRK_TIME += SuiteSparse_time() - Common->syrkStart;
+#endif
+
+ /* ---------------------------------------------------------------------- */
+ /* compute remaining (ndrow2-ndrow1)-by-ndrow1 block of C, C2 = L2*L1' */
+ /* ---------------------------------------------------------------------- */
+
+#ifndef NTIMER
+ Common->CHOLMOD_GPU_GEMM_CALLS++ ;
+ tstart = SuiteSparse_time();
+#endif
+
+ if (ndrow3 > 0)
+ {
+#ifndef REAL
+ cuDoubleComplex calpha = {1.0,0.0} ;
+ cuDoubleComplex cbeta = {0.0,0.0} ;
+#endif
+
+ /* ------------------------------------------------------------------ */
+ /* do the CUDA BLAS dgemm */
+ /* ------------------------------------------------------------------ */
+
+#ifdef REAL
+ alpha = 1.0 ;
+ beta = 0.0 ;
+ cublasStatus = cublasDgemm (Common->cublasHandle,
+ CUBLAS_OP_N, CUBLAS_OP_T,
+ ndrow3, ndrow1, ndcol, /* M, N, K */
+ &alpha, /* ALPHA: 1 */
+ devPtrLx + L_ENTRY*(ndrow1), /* A, LDA: L2*/
+ ndrow2, /* ndrow */
+ devPtrLx, /* B, LDB: L1 */
+ ndrow2, /* ndrow */
+ &beta, /* BETA: 0 */
+ devPtrC + L_ENTRY*ndrow1, /* C, LDC: C2 */
+ ndrow2) ;
+#else
+ cublasStatus = cublasZgemm (Common->cublasHandle,
+ CUBLAS_OP_N, CUBLAS_OP_C,
+ ndrow3, ndrow1, ndcol, /* M, N, K */
+ &calpha, /* ALPHA: 1 */
+ (const cuDoubleComplex*) devPtrLx + ndrow1,
+ ndrow2, /* ndrow */
+ (const cuDoubleComplex *) devPtrLx,
+ ndrow2, /* ndrow */
+ &cbeta, /* BETA: 0 */
+ (cuDoubleComplex *)devPtrC + ndrow1,
+ ndrow2) ;
+#endif
+
+ if (cublasStatus != CUBLAS_STATUS_SUCCESS)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU CUBLAS routine failure") ;
+ }
+
+ }
+
+#ifndef NTIMER
+ Common->CHOLMOD_GPU_GEMM_TIME += SuiteSparse_time() - tstart;
+#endif
+
+ /* ------------------------------------------------------------------ */
+ /* Assemble the update C on the device using the d_RelativeMap */
+ /* ------------------------------------------------------------------ */
+
+#ifdef REAL
+ addUpdateOnDevice ( gpu_p->d_A[0], devPtrC,
+ gpu_p->d_RelativeMap, ndrow1, ndrow2, nsrow,
+ &(Common->gpuStream[iDevBuff]) );
+#else
+ addComplexUpdateOnDevice ( gpu_p->d_A[0], devPtrC,
+ gpu_p->d_RelativeMap, ndrow1, ndrow2, nsrow,
+ &(Common->gpuStream[iDevBuff]) );
+#endif
+
+ /* Record an event indicating that kernels for
+ this descendant are complete */
+ cudaEventRecord ( Common->updateCKernelsComplete,
+ Common->gpuStream[iDevBuff]);
+ cudaEventRecord ( Common->updateCBuffersFree[iHostBuff],
+ Common->gpuStream[iDevBuff]);
+
+ return (1) ;
+}
+
+/* ========================================================================== */
+/* === gpu_final_assembly =================================================== */
+/* ========================================================================== */
+
+/* If the supernode was assembled on both the CPU and the GPU, this will
+ * complete the supernode assembly on both the GPU and CPU.
+ */
+
+void TEMPLATE2 (CHOLMOD (gpu_final_assembly))
+(
+ cholmod_common *Common,
+ double *Lx,
+ Int psx,
+ Int nscol,
+ Int nsrow,
+ int supernodeUsedGPU,
+ int *iHostBuff,
+ int *iDevBuff,
+ cholmod_gpu_pointers *gpu_p
+)
+{
+ Int iidx, i, j;
+ Int iHostBuff2 ;
+ Int iDevBuff2 ;
+
+ if ( supernodeUsedGPU ) {
+
+ /* ------------------------------------------------------------------ */
+ /* Apply all of the Shur-complement updates, computed on the gpu, to */
+ /* the supernode. */
+ /* ------------------------------------------------------------------ */
+
+ *iHostBuff = (Common->ibuffer)%CHOLMOD_HOST_SUPERNODE_BUFFERS;
+ *iDevBuff = (Common->ibuffer)%CHOLMOD_DEVICE_STREAMS;
+
+ if ( nscol * L_ENTRY >= CHOLMOD_POTRF_LIMIT ) {
+
+ /* If this supernode is going to be factored using the GPU (potrf)
+ * then it will need the portion of the update assembled ont the
+ * CPU. So copy that to a pinned buffer an H2D copy to device. */
+
+ /* wait until a buffer is free */
+ cudaEventSynchronize ( Common->updateCBuffersFree[*iHostBuff] );
+
+ /* copy update assembled on CPU to a pinned buffer */
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ private(iidx) if (nscol>32)
+
+ for ( j=0; j<nscol; j++ ) {
+ for ( i=j; i<nsrow*L_ENTRY; i++ ) {
+ iidx = j*nsrow*L_ENTRY+i;
+ gpu_p->h_Lx[*iHostBuff][iidx] = Lx[psx*L_ENTRY+iidx];
+ }
+ }
+
+ /* H2D transfer of update assembled on CPU */
+ cudaMemcpyAsync ( gpu_p->d_A[1], gpu_p->h_Lx[*iHostBuff],
+ nscol*nsrow*L_ENTRY*sizeof(double),
+ cudaMemcpyHostToDevice,
+ Common->gpuStream[*iDevBuff] );
+ }
+
+ Common->ibuffer++;
+
+ iHostBuff2 = (Common->ibuffer)%CHOLMOD_HOST_SUPERNODE_BUFFERS;
+ iDevBuff2 = (Common->ibuffer)%CHOLMOD_DEVICE_STREAMS;
+
+ /* wait for all kernels to complete */
+ cudaEventSynchronize( Common->updateCKernelsComplete );
+
+ /* copy assembled Schur-complement updates computed on GPU */
+ cudaMemcpyAsync ( gpu_p->h_Lx[iHostBuff2], gpu_p->d_A[0],
+ nscol*nsrow*L_ENTRY*sizeof(double),
+ cudaMemcpyDeviceToHost,
+ Common->gpuStream[iDevBuff2] );
+
+ if ( nscol * L_ENTRY >= CHOLMOD_POTRF_LIMIT ) {
+
+ /* with the current implementation, potrf still uses data from the
+ * CPU - so put the fully assembled supernode in a pinned buffer for
+ * fastest access */
+
+ /* need both H2D and D2H copies to be complete */
+ cudaDeviceSynchronize();
+
+ /* sum updates from cpu and device on device */
+#ifdef REAL
+ sumAOnDevice ( gpu_p->d_A[1], gpu_p->d_A[0], -1.0, nsrow, nscol );
+#else
+ sumComplexAOnDevice ( gpu_p->d_A[1], gpu_p->d_A[0],
+ -1.0, nsrow, nscol );
+#endif
+
+ /* place final assembled supernode in pinned buffer */
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ private(iidx) if (nscol>32)
+
+ for ( j=0; j<nscol; j++ ) {
+ for ( i=j*L_ENTRY; i<nscol*L_ENTRY; i++ ) {
+ iidx = j*nsrow*L_ENTRY+i;
+ gpu_p->h_Lx[*iHostBuff][iidx] -=
+ gpu_p->h_Lx[iHostBuff2][iidx];
+ }
+ }
+
+ }
+ else
+ {
+
+ /* assemble with CPU updates */
+ cudaDeviceSynchronize();
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ private(iidx) if (nscol>32)
+
+ for ( j=0; j<nscol; j++ ) {
+ for ( i=j*L_ENTRY; i<nsrow*L_ENTRY; i++ ) {
+ iidx = j*nsrow*L_ENTRY+i;
+ Lx[psx*L_ENTRY+iidx] -= gpu_p->h_Lx[iHostBuff2][iidx];
+ }
+ }
+ }
+ }
+ return;
+}
+
+
+/* ========================================================================== */
+/* === gpu_lower_potrf ====================================================== */
+/* ========================================================================== */
+
+/* Cholesky factorzation (dpotrf) of a matrix S, operating on the lower
+ * triangular part only. S is nscol2-by-nscol2 with leading dimension nsrow.
+ *
+ * S is the top part of the supernode (the lower triangular matrx).
+ * This function also copies the bottom rectangular part of the supernode (B)
+ * onto the GPU, in preparation for gpu_triangular_solve.
+ */
+
+/*
+ * On entry, d_A[1] contains the fully assembled supernode
+ */
+
+int TEMPLATE2 (CHOLMOD (gpu_lower_potrf))
+(
+ Int nscol2, /* S is nscol2-by-nscol2 */
+ Int nsrow, /* leading dimension of S */
+ Int psx, /* S is located at Lx + L_ENTRY*psx */
+ double *Lx, /* contains S; overwritten with Cholesky factor */
+ Int *info, /* BLAS info return value */
+ cholmod_common *Common,
+ cholmod_gpu_pointers *gpu_p
+)
+{
+ double *devPtrA, *devPtrB, *A ;
+ double alpha, beta ;
+ cudaError_t cudaStat ;
+ cublasStatus_t cublasStatus ;
+ Int j, nsrow2, nb, n, gpu_lda, lda, gpu_ldb ;
+ int ilda, ijb, iinfo ;
+#ifndef NTIMER
+ double tstart ;
+#endif
+
+ if (nscol2 * L_ENTRY < CHOLMOD_POTRF_LIMIT)
+ {
+ /* too small for the CUDA BLAS; use the CPU instead */
+ return (0) ;
+ }
+
+#ifndef NTIMER
+ tstart = SuiteSparse_time ( ) ;
+ Common->CHOLMOD_GPU_POTRF_CALLS++ ;
+#endif
+
+ nsrow2 = nsrow - nscol2 ;
+
+ /* ---------------------------------------------------------------------- */
+ /* heuristic to get the block size depending of the problem size */
+ /* ---------------------------------------------------------------------- */
+
+ nb = 128 ;
+ if (nscol2 > 4096) nb = 256 ;
+ if (nscol2 > 8192) nb = 384 ;
+ n = nscol2 ;
+ gpu_lda = ((nscol2+31)/32)*32 ;
+ lda = nsrow ;
+
+ A = gpu_p->h_Lx[(Common->ibuffer+CHOLMOD_HOST_SUPERNODE_BUFFERS-1)%
+ CHOLMOD_HOST_SUPERNODE_BUFFERS];
+
+ /* ---------------------------------------------------------------------- */
+ /* determine the GPU leading dimension of B */
+ /* ---------------------------------------------------------------------- */
+
+ gpu_ldb = 0 ;
+ if (nsrow2 > 0)
+ {
+ gpu_ldb = ((nsrow2+31)/32)*32 ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* remember where device memory is, to be used by triangular solve later */
+ /* ---------------------------------------------------------------------- */
+
+ devPtrA = gpu_p->d_Lx[0];
+ devPtrB = gpu_p->d_Lx[1];
+
+ /* ---------------------------------------------------------------------- */
+ /* copy A from device to device */
+ /* ---------------------------------------------------------------------- */
+
+ cudaStat = cudaMemcpy2DAsync ( devPtrA,
+ gpu_lda * L_ENTRY * sizeof (devPtrA[0]),
+ gpu_p->d_A[1],
+ nsrow * L_ENTRY * sizeof (Lx[0]),
+ nscol2 * L_ENTRY * sizeof (devPtrA[0]),
+ nscol2,
+ cudaMemcpyDeviceToDevice,
+ Common->gpuStream[0] );
+
+ if ( cudaStat ) {
+ ERROR ( CHOLMOD_GPU_PROBLEM, "GPU memcopy device to device");
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* copy B in advance, for gpu_triangular_solve */
+ /* ---------------------------------------------------------------------- */
+
+ if (nsrow2 > 0)
+ {
+ cudaStat = cudaMemcpy2DAsync (devPtrB,
+ gpu_ldb * L_ENTRY * sizeof (devPtrB [0]),
+ gpu_p->d_A[1] + L_ENTRY*nscol2,
+ nsrow * L_ENTRY * sizeof (Lx [0]),
+ nsrow2 * L_ENTRY * sizeof (devPtrB [0]),
+ nscol2,
+ cudaMemcpyDeviceToDevice,
+ Common->gpuStream[0]) ;
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU memcopy to device") ;
+ }
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* define the dpotrf stream */
+ /* ------------------------------------------------------------------ */
+
+ cublasStatus = cublasSetStream (Common->cublasHandle,
+ Common->gpuStream [0]) ;
+ if (cublasStatus != CUBLAS_STATUS_SUCCESS) {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU CUBLAS stream") ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* block Cholesky factorization of S */
+ /* ---------------------------------------------------------------------- */
+
+ for (j = 0 ; j < n ; j += nb)
+ {
+ Int jb = nb < (n-j) ? nb : (n-j) ;
+
+ /* ------------------------------------------------------------------ */
+ /* do the CUDA BLAS dsyrk */
+ /* ------------------------------------------------------------------ */
+
+ alpha = -1.0 ;
+ beta = 1.0 ;
+#ifdef REAL
+ cublasStatus = cublasDsyrk (Common->cublasHandle,
+ CUBLAS_FILL_MODE_LOWER, CUBLAS_OP_N, jb, j,
+ &alpha, devPtrA + j, gpu_lda,
+ &beta, devPtrA + j + j*gpu_lda, gpu_lda) ;
+
+#else
+ cublasStatus = cublasZherk (Common->cublasHandle,
+ CUBLAS_FILL_MODE_LOWER, CUBLAS_OP_N, jb, j,
+ &alpha, (cuDoubleComplex*)devPtrA + j,
+ gpu_lda,
+ &beta,
+ (cuDoubleComplex*)devPtrA + j + j*gpu_lda,
+ gpu_lda) ;
+#endif
+
+ if (cublasStatus != CUBLAS_STATUS_SUCCESS)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU CUBLAS routine failure") ;
+ }
+
+ /* ------------------------------------------------------------------ */
+
+ cudaStat = cudaEventRecord (Common->cublasEventPotrf [0],
+ Common->gpuStream [0]) ;
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "CUDA event failure") ;
+ }
+
+ cudaStat = cudaStreamWaitEvent (Common->gpuStream [1],
+ Common->cublasEventPotrf [0], 0) ;
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "CUDA event failure") ;
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* copy back the jb columns on two different streams */
+ /* ------------------------------------------------------------------ */
+
+ cudaStat = cudaMemcpy2DAsync (A + L_ENTRY*(j + j*lda),
+ lda * L_ENTRY * sizeof (double),
+ devPtrA + L_ENTRY*(j + j*gpu_lda),
+ gpu_lda * L_ENTRY * sizeof (double),
+ L_ENTRY * sizeof (double)*jb,
+ jb,
+ cudaMemcpyDeviceToHost,
+ Common->gpuStream [1]) ;
+
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU memcopy from device") ;
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* do the CUDA BLAS dgemm */
+ /* ------------------------------------------------------------------ */
+
+ if ((j+jb) < n)
+ {
+
+#ifdef REAL
+ alpha = -1.0 ;
+ beta = 1.0 ;
+ cublasStatus = cublasDgemm (Common->cublasHandle,
+ CUBLAS_OP_N, CUBLAS_OP_T,
+ (n-j-jb), jb, j,
+ &alpha,
+ devPtrA + (j+jb), gpu_lda,
+ devPtrA + (j) , gpu_lda,
+ &beta,
+ devPtrA + (j+jb + j*gpu_lda), gpu_lda) ;
+
+#else
+ cuDoubleComplex calpha = {-1.0,0.0} ;
+ cuDoubleComplex cbeta = { 1.0,0.0} ;
+ cublasStatus = cublasZgemm (Common->cublasHandle,
+ CUBLAS_OP_N, CUBLAS_OP_C,
+ (n-j-jb), jb, j,
+ &calpha,
+ (cuDoubleComplex*)devPtrA + (j+jb),
+ gpu_lda,
+ (cuDoubleComplex*)devPtrA + (j),
+ gpu_lda,
+ &cbeta,
+ (cuDoubleComplex*)devPtrA +
+ (j+jb + j*gpu_lda),
+ gpu_lda ) ;
+#endif
+
+ if (cublasStatus != CUBLAS_STATUS_SUCCESS)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU CUBLAS routine failure") ;
+ }
+ }
+
+ cudaStat = cudaStreamSynchronize (Common->gpuStream [1]) ;
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU memcopy to device") ;
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* compute the Cholesky factorization of the jbxjb block on the CPU */
+ /* ------------------------------------------------------------------ */
+
+ ilda = (int) lda ;
+ ijb = jb ;
+#ifdef REAL
+ LAPACK_DPOTRF ("L", &ijb, A + L_ENTRY * (j + j*lda), &ilda, &iinfo) ;
+#else
+ LAPACK_ZPOTRF ("L", &ijb, A + L_ENTRY * (j + j*lda), &ilda, &iinfo) ;
+#endif
+ *info = iinfo ;
+
+ if (*info != 0)
+ {
+ *info = *info + j ;
+ break ;
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* copy the result back to the GPU */
+ /* ------------------------------------------------------------------ */
+
+ cudaStat = cudaMemcpy2DAsync (devPtrA + L_ENTRY*(j + j*gpu_lda),
+ gpu_lda * L_ENTRY * sizeof (double),
+ A + L_ENTRY * (j + j*lda),
+ lda * L_ENTRY * sizeof (double),
+ L_ENTRY * sizeof (double) * jb,
+ jb,
+ cudaMemcpyHostToDevice,
+ Common->gpuStream [0]) ;
+
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU memcopy to device") ;
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* do the CUDA BLAS dtrsm */
+ /* ------------------------------------------------------------------ */
+
+ if ((j+jb) < n)
+ {
+
+#ifdef REAL
+ alpha = 1.0 ;
+ cublasStatus = cublasDtrsm (Common->cublasHandle,
+ CUBLAS_SIDE_RIGHT,
+ CUBLAS_FILL_MODE_LOWER,
+ CUBLAS_OP_T, CUBLAS_DIAG_NON_UNIT,
+ (n-j-jb), jb,
+ &alpha,
+ devPtrA + (j + j*gpu_lda), gpu_lda,
+ devPtrA + (j+jb + j*gpu_lda), gpu_lda) ;
+#else
+ cuDoubleComplex calpha = {1.0,0.0};
+ cublasStatus = cublasZtrsm (Common->cublasHandle,
+ CUBLAS_SIDE_RIGHT,
+ CUBLAS_FILL_MODE_LOWER,
+ CUBLAS_OP_C, CUBLAS_DIAG_NON_UNIT,
+ (n-j-jb), jb,
+ &calpha,
+ (cuDoubleComplex *)devPtrA +
+ (j + j*gpu_lda),
+ gpu_lda,
+ (cuDoubleComplex *)devPtrA +
+ (j+jb + j*gpu_lda),
+ gpu_lda) ;
+#endif
+
+ if (cublasStatus != CUBLAS_STATUS_SUCCESS)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU CUBLAS routine failure") ;
+ }
+
+ /* -------------------------------------------------------------- */
+ /* Copy factored column back to host. */
+ /* -------------------------------------------------------------- */
+
+ cudaStat = cudaEventRecord (Common->cublasEventPotrf[2],
+ Common->gpuStream[0]) ;
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "CUDA event failure") ;
+ }
+
+ cudaStat = cudaStreamWaitEvent (Common->gpuStream[1],
+ Common->cublasEventPotrf[2], 0) ;
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "CUDA event failure") ;
+ }
+
+ cudaStat = cudaMemcpy2DAsync (A + L_ENTRY*(j + jb + j * lda),
+ lda * L_ENTRY * sizeof (double),
+ devPtrA + L_ENTRY*
+ (j + jb + j * gpu_lda),
+ gpu_lda * L_ENTRY * sizeof (double),
+ L_ENTRY * sizeof (double)*
+ (n - j - jb), jb,
+ cudaMemcpyDeviceToHost,
+ Common->gpuStream[1]) ;
+
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU memcopy to device") ;
+ }
+ }
+ }
+
+#ifndef NTIMER
+ Common->CHOLMOD_GPU_POTRF_TIME += SuiteSparse_time ( ) - tstart ;
+#endif
+
+ return (1) ;
+}
+
+
+/* ========================================================================== */
+/* === gpu_triangular_solve ================================================= */
+/* ========================================================================== */
+
+/* The current supernode is columns k1 to k2-1 of L. Let L1 be the diagonal
+ * block (factorized by dpotrf/zpotrf above; rows/cols k1:k2-1), and L2 be rows
+ * k2:n-1 and columns k1:k2-1 of L. The triangular system to solve is L2*L1' =
+ * S2, where S2 is overwritten with L2. More precisely, L2 = S2 / L1' in
+ * MATLAB notation.
+ */
+
+/* Version with pre-allocation in POTRF */
+
+int TEMPLATE2 (CHOLMOD (gpu_triangular_solve))
+(
+ Int nsrow2, /* L1 and S2 are nsrow2-by-nscol2 */
+ Int nscol2, /* L1 is nscol2-by-nscol2 */
+ Int nsrow, /* leading dimension of L1, L2, and S2 */
+ Int psx, /* L1 is at Lx+L_ENTRY*psx;
+ * L2 at Lx+L_ENTRY*(psx+nscol2)*/
+ double *Lx, /* holds L1, L2, and S2 */
+ cholmod_common *Common,
+ cholmod_gpu_pointers *gpu_p
+)
+{
+ double *devPtrA, *devPtrB ;
+ cudaError_t cudaStat ;
+ cublasStatus_t cublasStatus ;
+ Int gpu_lda, gpu_ldb, gpu_rowstep ;
+
+ Int gpu_row_start = 0 ;
+ Int gpu_row_max_chunk, gpu_row_chunk;
+ int ibuf = 0;
+ int iblock = 0;
+ int iHostBuff = (Common->ibuffer+CHOLMOD_HOST_SUPERNODE_BUFFERS-1) %
+ CHOLMOD_HOST_SUPERNODE_BUFFERS;
+ int i, j;
+ Int iidx;
+ int iwrap;
+
+#ifndef NTIMER
+ double tstart ;
+#endif
+
+#ifdef REAL
+ double alpha = 1.0 ;
+ gpu_row_max_chunk = 768;
+#else
+ cuDoubleComplex calpha = {1.0,0.0} ;
+ gpu_row_max_chunk = 256;
+#endif
+
+ if ( nsrow2 <= 0 )
+ {
+ return (0) ;
+ }
+
+#ifndef NTIMER
+ tstart = SuiteSparse_time ( ) ;
+ Common->CHOLMOD_GPU_TRSM_CALLS++ ;
+#endif
+
+ gpu_lda = ((nscol2+31)/32)*32 ;
+ gpu_ldb = ((nsrow2+31)/32)*32 ;
+
+ devPtrA = gpu_p->d_Lx[0];
+ devPtrB = gpu_p->d_Lx[1];
+
+ /* make sure the copy of B has completed */
+ cudaStreamSynchronize( Common->gpuStream[0] );
+
+ /* ---------------------------------------------------------------------- */
+ /* do the CUDA BLAS dtrsm */
+ /* ---------------------------------------------------------------------- */
+
+ while ( gpu_row_start < nsrow2 )
+ {
+
+ gpu_row_chunk = nsrow2 - gpu_row_start;
+ if ( gpu_row_chunk > gpu_row_max_chunk ) {
+ gpu_row_chunk = gpu_row_max_chunk;
+ }
+
+ cublasStatus = cublasSetStream ( Common->cublasHandle,
+ Common->gpuStream[ibuf] );
+
+ if ( cublasStatus != CUBLAS_STATUS_SUCCESS )
+ {
+ ERROR ( CHOLMOD_GPU_PROBLEM, "GPU CUBLAS stream");
+ }
+
+#ifdef REAL
+ cublasStatus = cublasDtrsm (Common->cublasHandle,
+ CUBLAS_SIDE_RIGHT,
+ CUBLAS_FILL_MODE_LOWER,
+ CUBLAS_OP_T,
+ CUBLAS_DIAG_NON_UNIT,
+ gpu_row_chunk,
+ nscol2,
+ &alpha,
+ devPtrA,
+ gpu_lda,
+ devPtrB + gpu_row_start,
+ gpu_ldb) ;
+#else
+ cublasStatus = cublasZtrsm (Common->cublasHandle,
+ CUBLAS_SIDE_RIGHT,
+ CUBLAS_FILL_MODE_LOWER,
+ CUBLAS_OP_C,
+ CUBLAS_DIAG_NON_UNIT,
+ gpu_row_chunk,
+ nscol2,
+ &calpha,
+ (const cuDoubleComplex *) devPtrA,
+ gpu_lda,
+ (cuDoubleComplex *)devPtrB + gpu_row_start ,
+ gpu_ldb) ;
+#endif
+ if (cublasStatus != CUBLAS_STATUS_SUCCESS)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU CUBLAS routine failure") ;
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* copy result back to the CPU */
+ /* ------------------------------------------------------------------ */
+
+ cudaStat = cudaMemcpy2DAsync (
+ gpu_p->h_Lx[iHostBuff] +
+ L_ENTRY*(nscol2+gpu_row_start),
+ nsrow * L_ENTRY * sizeof (Lx [0]),
+ devPtrB + L_ENTRY*gpu_row_start,
+ gpu_ldb * L_ENTRY * sizeof (devPtrB [0]),
+ gpu_row_chunk * L_ENTRY *
+ sizeof (devPtrB [0]),
+ nscol2,
+ cudaMemcpyDeviceToHost,
+ Common->gpuStream[ibuf]);
+
+ if (cudaStat)
+ {
+ ERROR (CHOLMOD_GPU_PROBLEM, "GPU memcopy from device") ;
+ }
+
+ cudaEventRecord ( Common->updateCBuffersFree[ibuf],
+ Common->gpuStream[ibuf] );
+
+ gpu_row_start += gpu_row_chunk;
+ ibuf++;
+ ibuf = ibuf % CHOLMOD_HOST_SUPERNODE_BUFFERS;
+
+ iblock ++;
+
+ if ( iblock >= CHOLMOD_HOST_SUPERNODE_BUFFERS )
+ {
+ Int gpu_row_start2 ;
+ Int gpu_row_end ;
+
+ /* then CHOLMOD_HOST_SUPERNODE_BUFFERS worth of work has been
+ * scheduled, so check for completed events and copy result into
+ * Lx before continuing. */
+ cudaEventSynchronize ( Common->updateCBuffersFree
+ [iblock%CHOLMOD_HOST_SUPERNODE_BUFFERS] );
+
+ /* copy into Lx */
+ gpu_row_start2 = nscol2 +
+ (iblock-CHOLMOD_HOST_SUPERNODE_BUFFERS)
+ *gpu_row_max_chunk;
+ gpu_row_end = gpu_row_start2+gpu_row_max_chunk;
+
+ if ( gpu_row_end > nsrow ) gpu_row_end = nsrow;
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ private(iidx) if ( nscol2 > 32 )
+
+ for ( j=0; j<nscol2; j++ ) {
+ for ( i=gpu_row_start2*L_ENTRY; i<gpu_row_end*L_ENTRY; i++ ) {
+ iidx = j*nsrow*L_ENTRY+i;
+ Lx[psx*L_ENTRY+iidx] = gpu_p->h_Lx[iHostBuff][iidx];
+ }
+ }
+ }
+ }
+
+ /* Convenient to copy the L1 block here */
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+private ( iidx ) if ( nscol2 > 32 )
+
+ for ( j=0; j<nscol2; j++ ) {
+ for ( i=j*L_ENTRY; i<nscol2*L_ENTRY; i++ ) {
+ iidx = j*nsrow*L_ENTRY + i;
+ Lx[psx*L_ENTRY+iidx] = gpu_p->h_Lx[iHostBuff][iidx];
+ }
+ }
+
+ /* now account for the last HSTREAMS buffers */
+ for ( iwrap=0; iwrap<CHOLMOD_HOST_SUPERNODE_BUFFERS; iwrap++ )
+ {
+ int i, j;
+ Int gpu_row_start2 = nscol2 + (iblock-CHOLMOD_HOST_SUPERNODE_BUFFERS)
+ *gpu_row_max_chunk;
+ if (iblock-CHOLMOD_HOST_SUPERNODE_BUFFERS >= 0 &&
+ gpu_row_start2 < nsrow )
+ {
+ Int iidx;
+ Int gpu_row_end = gpu_row_start2+gpu_row_max_chunk;
+ if ( gpu_row_end > nsrow ) gpu_row_end = nsrow;
+ cudaEventSynchronize ( Common->updateCBuffersFree
+ [iblock%CHOLMOD_HOST_SUPERNODE_BUFFERS] );
+ /* copy into Lx */
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ private(iidx) if ( nscol2 > 32 )
+
+ for ( j=0; j<nscol2; j++ ) {
+ for ( i=gpu_row_start2*L_ENTRY; i<gpu_row_end*L_ENTRY; i++ ) {
+ iidx = j*nsrow*L_ENTRY+i;
+ Lx[psx*L_ENTRY+iidx] = gpu_p->h_Lx[iHostBuff][iidx];
+ }
+ }
+ }
+ iblock++;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* return */
+ /* ---------------------------------------------------------------------- */
+
+#ifndef NTIMER
+ Common->CHOLMOD_GPU_TRSM_TIME += SuiteSparse_time ( ) - tstart ;
+#endif
+
+ return (1) ;
+}
+
+/* ========================================================================== */
+/* === gpu_copy_supernode =================================================== */
+/* ========================================================================== */
+/*
+ * In the event gpu_triangular_sovle is not needed / called, this routine
+ * copies the factored diagonal block from the GPU to the CPU.
+ */
+
+void TEMPLATE2 (CHOLMOD (gpu_copy_supernode))
+(
+ cholmod_common *Common,
+ double *Lx,
+ Int psx,
+ Int nscol,
+ Int nscol2,
+ Int nsrow,
+ int supernodeUsedGPU,
+ int iHostBuff,
+ cholmod_gpu_pointers *gpu_p
+)
+{
+ Int iidx, i, j;
+ if ( supernodeUsedGPU && nscol2 * L_ENTRY >= CHOLMOD_POTRF_LIMIT ) {
+ cudaDeviceSynchronize();
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ private(iidx,i,j) if (nscol>32)
+
+ for ( j=0; j<nscol; j++ ) {
+ for ( i=j*L_ENTRY; i<nscol*L_ENTRY; i++ ) {
+ iidx = j*nsrow*L_ENTRY+i;
+ Lx[psx*L_ENTRY+iidx] = gpu_p->h_Lx[iHostBuff][iidx];
+ }
+ }
+ }
+ return;
+}
+
+#endif
+
+#undef REAL
+#undef COMPLEX
+#undef ZOMPLEX
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/License.txt b/src/C/SuiteSparse/CHOLMOD/Include/License.txt
index cfca615..ea2c374 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/License.txt
+++ b/src/C/SuiteSparse/CHOLMOD/Include/License.txt
@@ -1,7 +1,6 @@
CHOLMOD/Include/* files.
Copyright (C) 2005-2006, either Univ. of Florida or T. Davis,
depending on the file.
-http://www.cise.ufl.edu/research/sparse
Refer to each include file in this directory; each file is licensed
separately, according to the Module for which it contains definitions
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/README.txt b/src/C/SuiteSparse/CHOLMOD/Include/README.txt
index 387eb6e..ec68624 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/README.txt
+++ b/src/C/SuiteSparse/CHOLMOD/Include/README.txt
@@ -1,4 +1,4 @@
-CHOLMOD: a sparse Cholesky factorization package.
+CHOLMOD: a sparse Cholesky factorization package. http://www.suitesparse.com
The Include/*.h files in this directory provide a basic documentation of all
user-callable routines and user-visible data structures in the CHOLMOD
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod.h
index 1332516..21d3ed2 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod.h
@@ -4,11 +4,11 @@
/* -----------------------------------------------------------------------------
* CHOLMOD/Include/cholmod.h.
- * Copyright (C) 2005-2006, Univ. of Florida. Author: Timothy A. Davis
+ * Copyright (C) 2005-2013, Univ. of Florida. Author: Timothy A. Davis
* CHOLMOD/Include/cholmod.h is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
*
* Portions of CHOLMOD (the Core and Partition Modules) are copyrighted by the
* University of Florida. The Modify Module is co-authored by William W.
@@ -37,9 +37,9 @@
* -------------
*
* Most CHOLMOD routines return an int (TRUE (1) if successful, or FALSE
- * (0) otherwise. A UF_long or double return value is >= 0 if successful,
- * or -1 otherwise. A size_t return value is > 0 if successful, or 0
- * otherwise.
+ * (0) otherwise. A SuiteSparse_long or double return value is >= 0 if
+ * successful, or -1 otherwise. A size_t return value is > 0 if
+ * successful, or 0 otherwise.
*
* If a routine returns a pointer, it is a pointer to a newly allocated
* object or NULL if a failure occured, with one exception. cholmod_free
@@ -83,11 +83,11 @@ extern "C" {
/* assume large file support. If problems occur, compile with -DNLARGEFILE */
#include "cholmod_io64.h"
-/* define UF_long */
-#include "UFconfig.h"
+#include "SuiteSparse_config.h"
#include "cholmod_config.h"
+
/* CHOLMOD always includes the Core module. */
#include "cholmod_core.h"
@@ -107,6 +107,10 @@ extern "C" {
#include "cholmod_modify.h"
#endif
+#ifndef NCAMD
+#include "cholmod_camd.h"
+#endif
+
#ifndef NPARTITION
#include "cholmod_partition.h"
#endif
@@ -115,6 +119,10 @@ extern "C" {
#include "cholmod_supernodal.h"
#endif
+#ifdef GPU_BLAS
+#include "cholmod_gpu.h"
+#endif
+
#ifdef __cplusplus
}
#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_blas.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_blas.h
index 4d9d5e9..f99e04d 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_blas.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_blas.h
@@ -8,7 +8,6 @@
* CHOLMOD/Include/cholmod_blas.h is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* This does not need to be included in the user's program. */
@@ -32,6 +31,10 @@
#define CHOLMOD_LINUX
#define CHOLMOD_ARCHITECTURE "Linux"
+#elif defined (__APPLE__)
+#define CHOLMOD_MAC
+#define CHOLMOD_ARCHITECTURE "Mac"
+
#elif defined (_AIX) || defined (MIBM_RS) || defined (ARCH_IBM_RS)
#define CHOLMOD_AIX
#define CHOLMOD_ARCHITECTURE "IBM AIX"
@@ -69,7 +72,6 @@
#define CHOLMOD_ARCHITECTURE "unknown"
#endif
-
/* ========================================================================== */
/* === BLAS and LAPACK names ================================================ */
/* ========================================================================== */
@@ -77,7 +79,7 @@
/* Prototypes for the various versions of the BLAS. */
/* Determine if the 64-bit Sun Performance BLAS is to be used */
-#if defined(CHOLMOD_SOL2) && !defined(NSUNPERF) && defined(LONG) && defined(LONGBLAS)
+#if defined(CHOLMOD_SOL2) && !defined(NSUNPERF) && defined(BLAS64)
#define SUN64
#endif
@@ -147,23 +149,19 @@
/* === BLAS and LAPACK integer arguments ==================================== */
/* ========================================================================== */
-/* CHOLMOD can be compiled with -D'LONGBLAS=long' for the Sun Performance
- * Library, or -D'LONGBLAS=long long' for SGI's SCSL BLAS. This defines the
- * integer used in the BLAS for the cholmod_l_* routines.
- *
- * The "int" version of CHOLMOD always uses the "int" version of the BLAS.
- */
+/* Compile CHOLMOD, UMFPACK, and SPQR with -DBLAS64 if you have a BLAS that
+ * uses 64-bit integers */
-#if defined (LONGBLAS) && defined (LONG)
-#define BLAS_INT LONGBLAS
+#if defined (LONGBLAS) || defined (BLAS64)
+#define BLAS_INT SuiteSparse_long
#else
#define BLAS_INT int
#endif
/* If the BLAS integer is smaller than the basic CHOLMOD integer, then we need
* to check for integer overflow when converting from Int to BLAS_INT. If
- * any integer overflows, the externally-defined Common->blas_ok variable is
- * set to FALSE. Common->blas_ok should be set to TRUE before calling any
+ * any integer overflows, the externally-defined BLAS_OK variable is
+ * set to FALSE. BLAS_OK should be set to TRUE before calling any
* BLAS_* macro.
*/
@@ -184,9 +182,9 @@ void BLAS_DGEMV (char *trans, BLAS_INT *m, BLAS_INT *n, double *alpha,
if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
EQ (INCX,incx) && EQ (INCY,incy))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DGEMV (trans, &M, &N, alpha, A, &LDA, X, &INCX, beta, Y, &INCY) ; \
} \
@@ -202,9 +200,9 @@ void BLAS_ZGEMV (char *trans, BLAS_INT *m, BLAS_INT *n, double *alpha,
if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
EQ (INCX,incx) && EQ (INCY,incy))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZGEMV (trans, &M, &N, alpha, A, &LDA, X, &INCX, beta, Y, &INCY) ; \
} \
@@ -218,9 +216,9 @@ void BLAS_DTRSV (char *uplo, char *trans, char *diag, BLAS_INT *n, double *A,
BLAS_INT N = n, LDA = lda, INCX = incx ; \
if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DTRSV (uplo, trans, diag, &N, A, &LDA, X, &INCX) ; \
} \
@@ -234,9 +232,9 @@ void BLAS_ZTRSV (char *uplo, char *trans, char *diag, BLAS_INT *n, double *A,
BLAS_INT N = n, LDA = lda, INCX = incx ; \
if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZTRSV (uplo, trans, diag, &N, A, &LDA, X, &INCX) ; \
} \
@@ -252,9 +250,9 @@ void BLAS_DTRSM (char *side, char *uplo, char *transa, char *diag, BLAS_INT *m,
if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
EQ (LDB,ldb))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DTRSM (side, uplo, transa, diag, &M, &N, alpha, A, &LDA, B, &LDB);\
} \
@@ -270,9 +268,9 @@ void BLAS_ZTRSM (char *side, char *uplo, char *transa, char *diag, BLAS_INT *m,
if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
EQ (LDB,ldb))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZTRSM (side, uplo, transa, diag, &M, &N, alpha, A, &LDA, B, &LDB);\
} \
@@ -288,9 +286,9 @@ void BLAS_DGEMM (char *transa, char *transb, BLAS_INT *m, BLAS_INT *n,
if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (K,k) && \
EQ (LDA,lda) && EQ (LDB,ldb) && EQ (LDC,ldc))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DGEMM (transa, transb, &M, &N, &K, alpha, A, &LDA, B, &LDB, beta, \
C, &LDC) ; \
@@ -307,9 +305,9 @@ void BLAS_ZGEMM (char *transa, char *transb, BLAS_INT *m, BLAS_INT *n,
if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (K,k) && \
EQ (LDA,lda) && EQ (LDB,ldb) && EQ (LDC,ldc))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZGEMM (transa, transb, &M, &N, &K, alpha, A, &LDA, B, &LDB, beta, \
C, &LDC) ; \
@@ -326,9 +324,9 @@ void BLAS_DSYRK (char *uplo, char *trans, BLAS_INT *n, BLAS_INT *k,
if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (K,k) && EQ (LDA,lda) && \
EQ (LDC,ldc))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DSYRK (uplo, trans, &N, &K, alpha, A, &LDA, beta, C, &LDC) ; \
} \
@@ -344,9 +342,9 @@ void BLAS_ZHERK (char *uplo, char *trans, BLAS_INT *n, BLAS_INT *k,
if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (K,k) && EQ (LDA,lda) && \
EQ (LDC,ldc))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZHERK (uplo, trans, &N, &K, alpha, A, &LDA, beta, C, &LDC) ; \
} \
@@ -360,9 +358,9 @@ void LAPACK_DPOTRF (char *uplo, BLAS_INT *n, double *A, BLAS_INT *lda,
BLAS_INT N = n, LDA = lda, INFO = 1 ; \
if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (LDA,lda))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
LAPACK_DPOTRF (uplo, &N, A, &LDA, &INFO) ; \
} \
@@ -377,9 +375,9 @@ void LAPACK_ZPOTRF (char *uplo, BLAS_INT *n, double *A, BLAS_INT *lda,
BLAS_INT N = n, LDA = lda, INFO = 1 ; \
if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (LDA,lda))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
LAPACK_ZPOTRF (uplo, &N, A, &LDA, &INFO) ; \
} \
@@ -395,9 +393,9 @@ void BLAS_DSCAL (BLAS_INT *n, double *alpha, double *Y, BLAS_INT *incy) ;
BLAS_INT N = n, INCY = incy ; \
if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (INCY,incy))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DSCAL (&N, alpha, Y, &INCY) ; \
} \
@@ -410,9 +408,9 @@ void BLAS_ZSCAL (BLAS_INT *n, double *alpha, double *Y, BLAS_INT *incy) ;
BLAS_INT N = n, INCY = incy ; \
if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (INCY,incy))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZSCAL (&N, alpha, Y, &INCY) ; \
} \
@@ -428,9 +426,9 @@ void BLAS_DGER (BLAS_INT *m, BLAS_INT *n, double *alpha,
if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
EQ (INCX,incx) && EQ (INCY,incy))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DGER (&M, &N, alpha, X, &INCX, Y, &INCY, A, &LDA) ; \
} \
@@ -446,9 +444,9 @@ void BLAS_ZGER (BLAS_INT *m, BLAS_INT *n, double *alpha,
if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
EQ (INCX,incx) && EQ (INCY,incy))) \
{ \
- Common->blas_ok = FALSE ; \
+ BLAS_OK = FALSE ; \
} \
- if (!CHECK_BLAS_INT || Common->blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZGER (&M, &N, alpha, X, &INCX, Y, &INCY, A, &LDA) ; \
} \
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_camd.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_camd.h
new file mode 100644
index 0000000..3e1bf8d
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_camd.h
@@ -0,0 +1,102 @@
+/* ========================================================================== */
+/* === Include/cholmod_camd.h =============================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/Include/cholmod_camd.h.
+ * Copyright (C) 2005-2013, Univ. of Florida. Author: Timothy A. Davis
+ * CHOLMOD/Include/cholmod_partition.h is licensed under Version 2.1 of the GNU
+ * Lesser General Public License. See lesser.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * -------------------------------------------------------------------------- */
+
+/* CHOLMOD Partition module, interface to CAMD, CCOLAMD, and CSYMAMD
+ *
+ * An interface to CCOLAMD and CSYMAMD, constrained minimum degree ordering
+ * methods which order a matrix following constraints determined via nested
+ * dissection.
+ *
+ * These functions do not require METIS. They are installed unless NCAMD
+ * is defined:
+ * cholmod_ccolamd interface to CCOLAMD ordering
+ * cholmod_csymamd interface to CSYMAMD ordering
+ * cholmod_camd interface to CAMD ordering
+ *
+ * Requires the Core and Cholesky modules, and two packages: CAMD,
+ * and CCOLAMD. Used by functions in the Partition Module.
+ */
+
+#ifndef CHOLMOD_CAMD_H
+#define CHOLMOD_CAMD_H
+
+#include "cholmod_core.h"
+
+/* -------------------------------------------------------------------------- */
+/* cholmod_ccolamd */
+/* -------------------------------------------------------------------------- */
+
+/* Order AA' or A(:,f)*A(:,f)' using CCOLAMD. */
+
+int cholmod_ccolamd
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* matrix to order */
+ int *fset, /* subset of 0:(A->ncol)-1 */
+ size_t fsize, /* size of fset */
+ int *Cmember, /* size A->nrow. Cmember [i] = c if row i is in the
+ * constraint set c. c must be >= 0. The # of
+ * constraint sets is max (Cmember) + 1. If Cmember is
+ * NULL, then it is interpretted as Cmember [i] = 0 for
+ * all i */
+ /* ---- output --- */
+ int *Perm, /* size A->nrow, output permutation */
+ /* --------------- */
+ cholmod_common *Common
+) ;
+
+int cholmod_l_ccolamd (cholmod_sparse *, SuiteSparse_long *, size_t,
+ SuiteSparse_long *, SuiteSparse_long *, cholmod_common *) ;
+
+/* -------------------------------------------------------------------------- */
+/* cholmod_csymamd */
+/* -------------------------------------------------------------------------- */
+
+/* Order A using CSYMAMD. */
+
+int cholmod_csymamd
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* matrix to order */
+ /* ---- output --- */
+ int *Cmember, /* size nrow. see cholmod_ccolamd above */
+ int *Perm, /* size A->nrow, output permutation */
+ /* --------------- */
+ cholmod_common *Common
+) ;
+
+int cholmod_l_csymamd (cholmod_sparse *, SuiteSparse_long *,
+ SuiteSparse_long *, cholmod_common *) ;
+
+/* -------------------------------------------------------------------------- */
+/* cholmod_camd */
+/* -------------------------------------------------------------------------- */
+
+/* Order A using CAMD. */
+
+int cholmod_camd
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* matrix to order */
+ int *fset, /* subset of 0:(A->ncol)-1 */
+ size_t fsize, /* size of fset */
+ /* ---- output --- */
+ int *Cmember, /* size nrow. see cholmod_ccolamd above */
+ int *Perm, /* size A->nrow, output permutation */
+ /* --------------- */
+ cholmod_common *Common
+) ;
+
+int cholmod_l_camd (cholmod_sparse *, SuiteSparse_long *, size_t,
+ SuiteSparse_long *, SuiteSparse_long *, cholmod_common *) ;
+
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_check.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_check.h
index fcc64e0..e75c415 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_check.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_check.h
@@ -7,7 +7,7 @@
* CHOLMOD/Include/cholmod_check.h is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* CHOLMOD Check module.
@@ -95,6 +95,13 @@ int cholmod_print_common
int cholmod_l_print_common (const char *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
+/* cholmod_gpu_stats: print the GPU / CPU statistics */
+/* -------------------------------------------------------------------------- */
+
+int cholmod_gpu_stats (cholmod_common *) ;
+int cholmod_l_gpu_stats (cholmod_common *) ;
+
+/* -------------------------------------------------------------------------- */
/* cholmod_check_sparse: check a sparse matrix */
/* -------------------------------------------------------------------------- */
@@ -218,13 +225,14 @@ int cholmod_check_subset
(
/* ---- input ---- */
int *Set, /* Set [0:len-1] is a subset of 0:n-1. Duplicates OK */
- UF_long len, /* size of Set (an integer array) */
+ SuiteSparse_long len, /* size of Set (an integer array) */
size_t n, /* 0:n-1 is valid range */
/* --------------- */
cholmod_common *Common
) ;
-int cholmod_l_check_subset (UF_long *, UF_long, size_t, cholmod_common *) ;
+int cholmod_l_check_subset (SuiteSparse_long *, SuiteSparse_long, size_t,
+ cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_print_subset: print a subset */
@@ -234,15 +242,15 @@ int cholmod_print_subset
(
/* ---- input ---- */
int *Set, /* Set [0:len-1] is a subset of 0:n-1. Duplicates OK */
- UF_long len, /* size of Set (an integer array) */
+ SuiteSparse_long len, /* size of Set (an integer array) */
size_t n, /* 0:n-1 is valid range */
const char *name, /* printed name of Set */
/* --------------- */
cholmod_common *Common
) ;
-int cholmod_l_print_subset (UF_long *, UF_long, size_t, const char *,
- cholmod_common *) ;
+int cholmod_l_print_subset (SuiteSparse_long *, SuiteSparse_long, size_t,
+ const char *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_check_perm: check a permutation */
@@ -258,7 +266,7 @@ int cholmod_check_perm
cholmod_common *Common
) ;
-int cholmod_l_check_perm (UF_long *, size_t, size_t, cholmod_common *) ;
+int cholmod_l_check_perm (SuiteSparse_long *, size_t, size_t, cholmod_common *);
/* -------------------------------------------------------------------------- */
/* cholmod_print_perm: print a permutation vector */
@@ -275,7 +283,7 @@ int cholmod_print_perm
cholmod_common *Common
) ;
-int cholmod_l_print_perm (UF_long *, size_t, size_t, const char *,
+int cholmod_l_print_perm (SuiteSparse_long *, size_t, size_t, const char *,
cholmod_common *) ;
/* -------------------------------------------------------------------------- */
@@ -291,7 +299,7 @@ int cholmod_check_parent
cholmod_common *Common
) ;
-int cholmod_l_check_parent (UF_long *, size_t, cholmod_common *) ;
+int cholmod_l_check_parent (SuiteSparse_long *, size_t, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_print_parent */
@@ -307,7 +315,8 @@ int cholmod_print_parent
cholmod_common *Common
) ;
-int cholmod_l_print_parent (UF_long *, size_t, const char *, cholmod_common *) ;
+int cholmod_l_print_parent (SuiteSparse_long *, size_t, const char *,
+ cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_read_sparse: read a sparse matrix from a file */
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_cholesky.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_cholesky.h
index feb22a7..a6d6038 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_cholesky.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_cholesky.h
@@ -3,11 +3,11 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Include/cholmod_cholesky.h. Copyright (C) 2005-2006, Timothy A. Davis
+ * CHOLMOD/Include/cholmod_cholesky.h. Copyright (C) 2005-2013, Timothy A. Davis
* CHOLMOD/Include/cholmod_cholesky.h is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* CHOLMOD Cholesky module.
@@ -27,6 +27,7 @@
* cholmod_analyze order and analyze (simplicial or supernodal)
* cholmod_factorize simplicial or supernodal Cholesky factorization
* cholmod_solve solve a linear system (simplicial or supernodal)
+ * cholmod_solve2 like cholmod_solve, but reuse workspace
* cholmod_spsolve solve a linear system (sparse x and b)
*
* Secondary routines:
@@ -41,6 +42,7 @@
* cholmod_colamd order using COLAMD
* cholmod_rowfac incremental simplicial factorization
* cholmod_rowfac_mask rowfac, specific to LPDASA
+ * cholmod_rowfac_mask2 rowfac, specific to LPDASA
* cholmod_row_subtree find the nonzero pattern of a row of L
* cholmod_resymbol recompute the symbolic pattern of L
* cholmod_resymbol_noperm recompute the symbolic pattern of L, no L->Perm
@@ -102,8 +104,8 @@ cholmod_factor *cholmod_analyze_p
cholmod_common *Common
) ;
-cholmod_factor *cholmod_l_analyze_p (cholmod_sparse *, UF_long *, UF_long *,
- size_t, cholmod_common *) ;
+cholmod_factor *cholmod_l_analyze_p (cholmod_sparse *, SuiteSparse_long *,
+ SuiteSparse_long *, size_t, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_analyze_p2: analyze for sparse Cholesky or sparse QR */
@@ -112,7 +114,9 @@ cholmod_factor *cholmod_l_analyze_p (cholmod_sparse *, UF_long *, UF_long *,
cholmod_factor *cholmod_analyze_p2
(
/* ---- input ---- */
- int for_cholesky, /* if TRUE, then analyze for Cholesky; else for QR */
+ int for_whom, /* FOR_SPQR (0): for SPQR but not GPU-accelerated
+ FOR_CHOLESKY (1): for Cholesky (GPU or not)
+ FOR_SPQRGPU (2): for SPQR with GPU acceleration */
cholmod_sparse *A, /* matrix to order and analyze */
int *UserPerm, /* user-provided permutation, size A->nrow */
int *fset, /* subset of 0:(A->ncol)-1 */
@@ -121,8 +125,8 @@ cholmod_factor *cholmod_analyze_p2
cholmod_common *Common
) ;
-cholmod_factor *cholmod_l_analyze_p2 (int, cholmod_sparse *, UF_long *,
- UF_long *, size_t, cholmod_common *) ;
+cholmod_factor *cholmod_l_analyze_p2 (int, cholmod_sparse *, SuiteSparse_long *,
+ SuiteSparse_long *, size_t, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_factorize: simplicial or supernodal Cholesky factorization */
@@ -164,8 +168,8 @@ int cholmod_factorize_p
cholmod_common *Common
) ;
-int cholmod_l_factorize_p (cholmod_sparse *, double *, UF_long *, size_t,
- cholmod_factor *, cholmod_common *) ;
+int cholmod_l_factorize_p (cholmod_sparse *, double *, SuiteSparse_long *,
+ size_t, cholmod_factor *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_solve: solve a linear system (simplicial or supernodal) */
@@ -199,6 +203,31 @@ cholmod_dense *cholmod_l_solve (int, cholmod_factor *, cholmod_dense *,
cholmod_common *) ;
/* -------------------------------------------------------------------------- */
+/* cholmod_solve2: like cholmod_solve, but with reusable workspace */
+/* -------------------------------------------------------------------------- */
+
+int cholmod_solve2 /* returns TRUE on success, FALSE on failure */
+(
+ /* ---- input ---- */
+ int sys, /* system to solve */
+ cholmod_factor *L, /* factorization to use */
+ cholmod_dense *B, /* right-hand-side */
+ cholmod_sparse *Bset,
+ /* ---- output --- */
+ cholmod_dense **X_Handle, /* solution, allocated if need be */
+ cholmod_sparse **Xset_Handle,
+ /* ---- workspace */
+ cholmod_dense **Y_Handle, /* workspace, or NULL */
+ cholmod_dense **E_Handle, /* workspace, or NULL */
+ /* --------------- */
+ cholmod_common *Common
+) ;
+
+int cholmod_l_solve2 (int, cholmod_factor *, cholmod_dense *, cholmod_sparse *,
+ cholmod_dense **, cholmod_sparse **, cholmod_dense **, cholmod_dense **,
+ cholmod_common *) ;
+
+/* -------------------------------------------------------------------------- */
/* cholmod_spsolve: solve a linear system with a sparse right-hand-side */
/* -------------------------------------------------------------------------- */
@@ -229,7 +258,7 @@ int cholmod_etree
cholmod_common *Common
) ;
-int cholmod_l_etree (cholmod_sparse *, UF_long *, cholmod_common *) ;
+int cholmod_l_etree (cholmod_sparse *, SuiteSparse_long *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_rowcolcounts: compute the row/column counts of L */
@@ -257,8 +286,10 @@ int cholmod_rowcolcounts
cholmod_common *Common
) ;
-int cholmod_l_rowcolcounts (cholmod_sparse *, UF_long *, size_t, UF_long *,
- UF_long *, UF_long *, UF_long *, UF_long *, UF_long *, cholmod_common *) ;
+int cholmod_l_rowcolcounts (cholmod_sparse *, SuiteSparse_long *, size_t,
+ SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *,
+ SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *,
+ cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_analyze_ordering: analyze a fill-reducing ordering */
@@ -283,8 +314,9 @@ int cholmod_analyze_ordering
cholmod_common *Common
) ;
-int cholmod_l_analyze_ordering (cholmod_sparse *, int, UF_long *, UF_long *,
- size_t, UF_long *, UF_long *, UF_long *, UF_long *, UF_long *,
+int cholmod_l_analyze_ordering (cholmod_sparse *, int, SuiteSparse_long *,
+ SuiteSparse_long *, size_t, SuiteSparse_long *, SuiteSparse_long *,
+ SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *,
cholmod_common *) ;
/* -------------------------------------------------------------------------- */
@@ -306,8 +338,8 @@ int cholmod_amd
cholmod_common *Common
) ;
-int cholmod_l_amd (cholmod_sparse *, UF_long *, size_t, UF_long *,
- cholmod_common *) ;
+int cholmod_l_amd (cholmod_sparse *, SuiteSparse_long *, size_t,
+ SuiteSparse_long *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_colamd: order using COLAMD */
@@ -329,8 +361,8 @@ int cholmod_colamd
cholmod_common *Common
) ;
-int cholmod_l_colamd (cholmod_sparse *, UF_long *, size_t, int, UF_long *,
- cholmod_common *) ;
+int cholmod_l_colamd (cholmod_sparse *, SuiteSparse_long *, size_t, int,
+ SuiteSparse_long *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_rowfac: incremental simplicial factorization */
@@ -382,7 +414,29 @@ int cholmod_rowfac_mask
) ;
int cholmod_l_rowfac_mask (cholmod_sparse *, cholmod_sparse *, double *, size_t,
- size_t, UF_long *, UF_long *, cholmod_factor *, cholmod_common *) ;
+ size_t, SuiteSparse_long *, SuiteSparse_long *, cholmod_factor *,
+ cholmod_common *) ;
+
+int cholmod_rowfac_mask2
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* matrix to factorize */
+ cholmod_sparse *F, /* used for A*A' case only. F=A' or A(:,fset)' */
+ double beta [2], /* factorize beta*I+A or beta*I+A'*A */
+ size_t kstart, /* first row to factorize */
+ size_t kend, /* last row to factorize is kend-1 */
+ int *mask, /* if mask[i] >= maskmark, then set row i to zero */
+ int maskmark,
+ int *RLinkUp, /* link list of rows to compute */
+ /* ---- in/out --- */
+ cholmod_factor *L,
+ /* --------------- */
+ cholmod_common *Common
+) ;
+
+int cholmod_l_rowfac_mask2 (cholmod_sparse *, cholmod_sparse *, double *,
+ size_t, size_t, SuiteSparse_long *, SuiteSparse_long, SuiteSparse_long *,
+ cholmod_factor *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_row_subtree: find the nonzero pattern of a row of L */
@@ -399,13 +453,31 @@ int cholmod_row_subtree
size_t k, /* row k of L */
int *Parent, /* elimination tree */
/* ---- output --- */
- cholmod_sparse *R, /* pattern of L(k,:), 1-by-n with R->nzmax >= n */
+ cholmod_sparse *R, /* pattern of L(k,:), n-by-1 with R->nzmax >= n */
/* --------------- */
cholmod_common *Common
) ;
int cholmod_l_row_subtree (cholmod_sparse *, cholmod_sparse *, size_t,
- UF_long *, cholmod_sparse *, cholmod_common *) ;
+ SuiteSparse_long *, cholmod_sparse *, cholmod_common *) ;
+
+/* -------------------------------------------------------------------------- */
+/* cholmod_lsolve_pattern: find the nonzero pattern of x=L\b */
+/* -------------------------------------------------------------------------- */
+
+int cholmod_lsolve_pattern
+(
+ /* ---- input ---- */
+ cholmod_sparse *B, /* sparse right-hand-side (a single sparse column) */
+ cholmod_factor *L, /* the factor L from which parent(i) is derived */
+ /* ---- output --- */
+ cholmod_sparse *X, /* pattern of X=L\B, n-by-1 with X->nzmax >= n */
+ /* --------------- */
+ cholmod_common *Common
+) ;
+
+int cholmod_l_lsolve_pattern (cholmod_sparse *, cholmod_factor *,
+ cholmod_sparse *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_row_lsubtree: find the nonzero pattern of a row of L */
@@ -423,12 +495,12 @@ int cholmod_row_lsubtree
size_t k, /* row k of L */
cholmod_factor *L, /* the factor L from which parent(i) is derived */
/* ---- output --- */
- cholmod_sparse *R, /* pattern of L(k,:), 1-by-n with R->nzmax >= n */
+ cholmod_sparse *R, /* pattern of L(k,:), n-by-1 with R->nzmax >= n */
/* --------------- */
cholmod_common *Common
) ;
-int cholmod_l_row_lsubtree (cholmod_sparse *, UF_long *, size_t,
+int cholmod_l_row_lsubtree (cholmod_sparse *, SuiteSparse_long *, size_t,
size_t, cholmod_factor *, cholmod_sparse *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
@@ -455,7 +527,7 @@ int cholmod_resymbol
cholmod_common *Common
) ;
-int cholmod_l_resymbol (cholmod_sparse *, UF_long *, size_t, int,
+int cholmod_l_resymbol (cholmod_sparse *, SuiteSparse_long *, size_t, int,
cholmod_factor *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
@@ -478,7 +550,7 @@ int cholmod_resymbol_noperm
cholmod_common *Common
) ;
-int cholmod_l_resymbol_noperm (cholmod_sparse *, UF_long *, size_t, int,
+int cholmod_l_resymbol_noperm (cholmod_sparse *, SuiteSparse_long *, size_t, int,
cholmod_factor *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
@@ -499,7 +571,7 @@ double cholmod_l_rcond (cholmod_factor *, cholmod_common *) ;
/* cholmod_postorder: Compute the postorder of a tree */
/* -------------------------------------------------------------------------- */
-UF_long cholmod_postorder /* return # of nodes postordered */
+SuiteSparse_long cholmod_postorder /* return # of nodes postordered */
(
/* ---- input ---- */
int *Parent, /* size n. Parent [j] = p if p is the parent of j */
@@ -511,7 +583,7 @@ UF_long cholmod_postorder /* return # of nodes postordered */
cholmod_common *Common
) ;
-UF_long cholmod_l_postorder (UF_long *, size_t, UF_long *, UF_long *,
- cholmod_common *) ;
+SuiteSparse_long cholmod_l_postorder (SuiteSparse_long *, size_t,
+ SuiteSparse_long *, SuiteSparse_long *, cholmod_common *) ;
#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_complexity.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_complexity.h
index a84583a..2fd60c8 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_complexity.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_complexity.h
@@ -128,7 +128,7 @@ x [2*(p)+1] -= (-ax [2*(q)+1]) * bx [2*(r)] + ax [2*(q) ] * bx [2*(r)+1]
/* s = s / a */
#define C_DIV(x,z,p,ax,az,q) \
- Common->complex_divide ( \
+ SuiteSparse_config.divcomplex_func ( \
x [2*(p)], x [2*(p)+1], \
ax [2*(q)], ax [2*(q)+1], \
&x [2*(p)], &x [2*(p)+1])
@@ -219,9 +219,10 @@ x [2*(p)+1] -= (-ax [2*(q)+1]) * bx [2*(r)] + ax [2*(q) ] * bx [2*(r)+1]
#define Z_CLEAR_IMAG(x,z,p) \
z [p] = 0
-/* s = s/a */
+/* s = s / a */
#define Z_DIV(x,z,p,ax,az,q) \
- Common->complex_divide (x [p], z [p], ax [q], az [q], &x [p], &z [p])
+ SuiteSparse_config.divcomplex_func \
+ (x [p], z [p], ax [q], az [q], &x [p], &z [p])
/* s -= conj(a)*a ; note that the result of conj(a)*a is real */
#define Z_LLDOT(x,p, ax,az,q) \
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_config.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_config.h
index b9de51b..5ada402 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_config.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_config.h
@@ -4,11 +4,10 @@
/* -----------------------------------------------------------------------------
* CHOLMOD/Include/cholmod_config.h.
- * Copyright (C) 2005-2006, Univ. of Florida. Author: Timothy A. Davis
+ * Copyright (C) 2005-2013, Univ. of Florida. Author: Timothy A. Davis
* CHOLMOD/Include/cholmod_config.h is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* CHOLMOD configuration file, for inclusion in user programs.
@@ -26,6 +25,8 @@
* -DNCHECK do not include the Check module. License: GNU LGPL
* -DNCHOLESKY do not include the Cholesky module. License: GNU LGPL
* -DNPARTITION do not include the Partition module. License: GNU LGPL
+ * -DNCAMD do not include the interfaces to CAMD,
+ * CCOLAMD, CSYMAND in Partition module. License: GNU LGPL
*
* -DNGPL do not include any GNU GPL Modules in the CHOLMOD library.
* -DNMATRIXOPS do not include the MatrixOps module. License: GNU GPL
@@ -56,6 +57,7 @@
/*
#define NCHECK
#define NCHOLESKY
+#define NCAMD
#define NPARTITION
#define NGPL
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_core.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_core.h
index 61c91ed..f2d9d90 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_core.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_core.h
@@ -4,11 +4,10 @@
/* -----------------------------------------------------------------------------
* CHOLMOD/Include/cholmod_core.h.
- * Copyright (C) 2005-2006, Univ. of Florida. Author: Timothy A. Davis
+ * Copyright (C) 2005-2013, Univ. of Florida. Author: Timothy A. Davis
* CHOLMOD/Include/cholmod_core.h is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* CHOLMOD Core module: basic CHOLMOD objects and routines.
@@ -160,6 +159,7 @@
* cholmod_copy_dense create a copy of a dense matrix
* cholmod_copy_dense2 copy a dense matrix (pre-allocated)
* cholmod_dense_xtype change the xtype of a dense matrix
+ * cholmod_ensure_dense ensure a dense matrix has a given size and type
*
* ============================================================================
* === cholmod_triplet ========================================================
@@ -200,7 +200,7 @@
*
* int TRUE (1) if successful, or FALSE (0) otherwise.
* (exception: cholmod_divcomplex)
- * UF_long a value >= 0 if successful, or -1 otherwise.
+ * SuiteSparse_long a value >= 0 if successful, or -1 otherwise.
* double a value >= 0 if successful, or -1 otherwise.
* size_t a value > 0 if successful, or 0 otherwise.
* void * a non-NULL pointer to newly allocated memory if
@@ -244,11 +244,13 @@
* #endif
*/
-#define CHOLMOD_DATE "Sept 30, 2008"
+#define CHOLMOD_HAS_VERSION_FUNCTION
+
+#define CHOLMOD_DATE "July 14, 2015"
#define CHOLMOD_VER_CODE(main,sub) ((main) * 1000 + (sub))
-#define CHOLMOD_MAIN_VERSION 1
-#define CHOLMOD_SUB_VERSION 7
-#define CHOLMOD_SUBSUB_VERSION 1
+#define CHOLMOD_MAIN_VERSION 3
+#define CHOLMOD_SUB_VERSION 0
+#define CHOLMOD_SUBSUB_VERSION 6
#define CHOLMOD_VERSION \
CHOLMOD_VER_CODE(CHOLMOD_MAIN_VERSION,CHOLMOD_SUB_VERSION)
@@ -269,6 +271,25 @@
#include <stdlib.h>
/* ========================================================================== */
+/* === CUDA BLAS for the GPU ================================================ */
+/* ========================================================================== */
+
+/* The number of OMP threads should typically be set to the number of cores */
+/* per socket inthe machine being used. This maximizes memory performance. */
+#ifndef CHOLMOD_OMP_NUM_THREADS
+#define CHOLMOD_OMP_NUM_THREADS 4
+#endif
+
+/* Define buffering parameters for GPU processing */
+#ifdef GPU_BLAS
+#include <cublas_v2.h>
+#endif
+
+#define CHOLMOD_DEVICE_SUPERNODE_BUFFERS 6
+#define CHOLMOD_HOST_SUPERNODE_BUFFERS 8
+#define CHOLMOD_DEVICE_STREAMS 2
+
+/* ========================================================================== */
/* === CHOLMOD objects ====================================================== */
/* ========================================================================== */
@@ -286,8 +307,8 @@
/* itype defines the types of integer used: */
#define CHOLMOD_INT 0 /* all integer arrays are int */
-#define CHOLMOD_INTLONG 1 /* most are int, some are UF_long */
-#define CHOLMOD_LONG 2 /* all integer arrays are UF_long */
+#define CHOLMOD_INTLONG 1 /* most are int, some are SuiteSparse_long */
+#define CHOLMOD_LONG 2 /* all integer arrays are SuiteSparse_long */
/* The itype of all parameters for all CHOLMOD routines must match.
* FUTURE WORK: CHOLMOD_INTLONG is not yet supported.
@@ -366,6 +387,7 @@
#define CHOLMOD_OUT_OF_MEMORY (-2) /* failure: out of memory */
#define CHOLMOD_TOO_LARGE (-3) /* failure: integer overflow occured */
#define CHOLMOD_INVALID (-4) /* failure: invalid input */
+#define CHOLMOD_GPU_PROBLEM (-5) /* failure: GPU fatal error */
#define CHOLMOD_NOT_POSDEF (1) /* warning: matrix not pos. def. */
#define CHOLMOD_DSMALL (2) /* warning: D for LDL' or diag(L) or */
/* LL' has tiny absolute value */
@@ -519,13 +541,23 @@ typedef struct cholmod_common_struct
* factorization will return quickly if
* the matrix is not positive definite. Default: FALSE. */
+ int prefer_binary ; /* cholmod_read_triplet converts a symmetric
+ * pattern-only matrix into a real matrix. If
+ * prefer_binary is FALSE, the diagonal entries are set to 1 + the degree
+ * of the row/column, and off-diagonal entries are set to -1 (resulting
+ * in a positive definite matrix if the diagonal is zero-free). Most
+ * symmetric patterns are the pattern a positive definite matrix. If
+ * this parameter is TRUE, then the matrix is returned with a 1 in each
+ * entry, instead. Default: FALSE. Added in v1.3. */
+
/* ---------------------------------------------------------------------- */
/* printing and error handling options */
/* ---------------------------------------------------------------------- */
int print ; /* print level. Default: 3 */
int precise ; /* if TRUE, print 16 digits. Otherwise print 5 */
- int (*print_function) (const char *, ...) ; /* pointer to printf */
+
+ /* CHOLMOD print_function replaced with SuiteSparse_config.print_func */
int try_catch ; /* if TRUE, then ignore errors; CHOLMOD is in the middle
* of a try/catch block. No error message is printed
@@ -675,13 +707,13 @@ typedef struct cholmod_common_struct
* separator is discarded if it consists of the entire graph.
* Default: 1 */
- double other1 [4] ; /* future expansion */
+ double other_1 [4] ; /* future expansion */
size_t nd_small ; /* do not partition graphs with fewer nodes than
* nd_small, in NESDIS. Default: 200 (same as
* METIS) */
- size_t other2 [4] ; /* future expansion */
+ size_t other_2 [4] ; /* future expansion */
int aggressive ; /* Aggresive absorption in AMD, COLAMD, SYMAMD,
* CCOLAMD, and CSYMAMD. Default: TRUE */
@@ -714,7 +746,7 @@ typedef struct cholmod_common_struct
/* fill-reducing ordering to use */
int ordering ;
- size_t other3 [4] ; /* future expansion */
+ size_t other_3 [4] ; /* future expansion */
} method [CHOLMOD_MAXMETHODS + 1] ;
@@ -723,36 +755,21 @@ typedef struct cholmod_common_struct
* supernode amalgamation. Does not affect fundamental nnz(L) and
* flop count. Default: TRUE. */
- /* ---------------------------------------------------------------------- */
- /* memory management routines */
- /* ---------------------------------------------------------------------- */
-
- void *(*malloc_memory) (size_t) ; /* pointer to malloc */
- void *(*realloc_memory) (void *, size_t) ; /* pointer to realloc */
- void (*free_memory) (void *) ; /* pointer to free */
- void *(*calloc_memory) (size_t, size_t) ; /* pointer to calloc */
+ int default_nesdis ; /* Default: FALSE. If FALSE, then the default
+ * ordering strategy (when Common->nmethods == 0)
+ * is to try the given ordering (if present), AMD, and then METIS if AMD
+ * reports high fill-in. If Common->default_nesdis is TRUE then NESDIS
+ * is used instead in the default strategy. */
/* ---------------------------------------------------------------------- */
- /* routines for complex arithmetic */
+ /* memory management, complex divide, and hypot function pointers moved */
/* ---------------------------------------------------------------------- */
- int (*complex_divide) (double ax, double az, double bx, double bz,
- double *cx, double *cz) ;
-
- /* flag = complex_divide (ax, az, bx, bz, &cx, &cz) computes the complex
- * division c = a/b, where ax and az hold the real and imaginary part
- * of a, and b and c are stored similarly. flag is returned as 1 if
- * a divide-by-zero occurs, or 0 otherwise. By default, the function
- * pointer Common->complex_divide is set equal to cholmod_divcomplex.
- */
-
- double (*hypotenuse) (double x, double y) ;
-
- /* s = hypotenuse (x,y) computes s = sqrt (x*x + y*y), but does so more
- * accurately. By default, the function pointer Common->hypotenuse is
- * set equal to cholmod_hypot. See also the hypot function in the C99
- * standard, which has an identical syntax and function. If you have
- * a C99-compliant compiler, you can set Common->hypotenuse = hypot. */
+ /* Function pointers moved from here (in CHOLMOD 2.2.0) to
+ SuiteSparse_config.[ch]. See CHOLMOD/Include/cholmod_back.h
+ for a set of macros that can be #include'd or copied into your
+ application to define these function pointers on any version of CHOLMOD.
+ */
/* ---------------------------------------------------------------------- */
/* METIS workarounds */
@@ -822,7 +839,7 @@ typedef struct cholmod_common_struct
*/
size_t nrow ; /* size of Flag and Head */
- UF_long mark ; /* mark value for Flag array */
+ SuiteSparse_long mark ; /* mark value for Flag array */
size_t iworksize ; /* size of Iwork. Upper bound: 6*nrow+ncol */
size_t xworksize ; /* size of Xwork, in bytes.
* maxrank*nrow*sizeof(double) for update/downdate.
@@ -847,8 +864,8 @@ typedef struct cholmod_common_struct
void *Iwork ; /* size iworksize, 2*nrow+ncol for most routines,
* up to 6*nrow+ncol for cholmod_analyze. */
- int itype ; /* If CHOLMOD_LONG, Flag, Head, and Iwork are UF_long.
- * Otherwise all three arrays are int. */
+ int itype ; /* If CHOLMOD_LONG, Flag, Head, and Iwork are
+ * SuiteSparse_long. Otherwise all three are int. */
int dtype ; /* double or float */
@@ -890,68 +907,147 @@ typedef struct cholmod_common_struct
double rowfacfl ; /* # of flops in last call to cholmod_rowfac */
double aatfl ; /* # of flops to compute A(:,f)*A(:,f)' */
+ int called_nd ; /* TRUE if the last call to
+ * cholmod_analyze called NESDIS or METIS. */
+ int blas_ok ; /* FALSE if BLAS int overflow; TRUE otherwise */
+
/* ---------------------------------------------------------------------- */
- /* future expansion */
+ /* SuiteSparseQR control parameters: */
/* ---------------------------------------------------------------------- */
- /* To allow CHOLMOD to be updated without recompiling the user application,
- * additional space is set aside here for future statistics, parameters,
- * and workspace. Note: additional entries were added in v1.1 to the
- * method array, above, and thus v1.0 and v1.1 are not binary compatible.
- *
- * v1.1 to the current version are binary compatible.
- */
+ double SPQR_grain ; /* task size is >= max (total flops / grain) */
+ double SPQR_small ; /* task size is >= small */
+ int SPQR_shrink ; /* controls stack realloc method */
+ int SPQR_nthreads ; /* number of TBB threads, 0 = auto */
/* ---------------------------------------------------------------------- */
- double other1 [12] ; /* reduced from size 16 in v1.6 */
+ /* SuiteSparseQR statistics */
+ /* ---------------------------------------------------------------------- */
- double SPQR_xstat [2] ; /* for SuiteSparseQR statistics */
+ /* was other1 [0:3] */
+ double SPQR_flopcount ; /* flop count for SPQR */
+ double SPQR_analyze_time ; /* analysis time in seconds for SPQR */
+ double SPQR_factorize_time ; /* factorize time in seconds for SPQR */
+ double SPQR_solve_time ; /* backsolve time in seconds */
- /* SuiteSparseQR control parameters: */
- double SPQR_grain ; /* task size is >= max (total flops / grain) */
- double SPQR_small ; /* task size is >= small */
+ /* was SPQR_xstat [0:3] */
+ double SPQR_flopcount_bound ; /* upper bound on flop count */
+ double SPQR_tol_used ; /* tolerance used */
+ double SPQR_norm_E_fro ; /* Frobenius norm of dropped entries */
- /* ---------------------------------------------------------------------- */
- UF_long SPQR_istat [10] ; /* for SuiteSparseQR statistics */
- UF_long other2 [6] ; /* reduced from size 16 in v1.6 */
+ /* was SPQR_istat [0:9] */
+ SuiteSparse_long SPQR_istat [10] ;
/* ---------------------------------------------------------------------- */
- int other3 [10] ; /* reduced from size 16 in v1.1. */
+ /* GPU configuration and statistics */
+ /* ---------------------------------------------------------------------- */
- int prefer_binary ; /* cholmod_read_triplet converts a symmetric
- * pattern-only matrix into a real matrix. If
- * prefer_binary is FALSE, the diagonal entries are set to 1 + the degree
- * of the row/column, and off-diagonal entries are set to -1 (resulting
- * in a positive definite matrix if the diagonal is zero-free). Most
- * symmetric patterns are the pattern a positive definite matrix. If
- * this parameter is TRUE, then the matrix is returned with a 1 in each
- * entry, instead. Default: FALSE. Added in v1.3. */
+ /* useGPU: 1 if gpu-acceleration is requested */
+ /* 0 if gpu-acceleration is prohibited */
+ /* -1 if gpu-acceleration is undefined in which case the */
+ /* environment CHOLMOD_USE_GPU will be queried and used. */
+ /* useGPU=-1 is only used by CHOLMOD and treated as 0 by SPQR */
+ int useGPU;
+
+ /* for CHOLMOD: */
+ size_t maxGpuMemBytes;
+ double maxGpuMemFraction;
+
+ /* for SPQR: */
+ size_t gpuMemorySize; /* Amount of memory in bytes on the GPU */
+ double gpuKernelTime; /* Time taken by GPU kernels */
+ SuiteSparse_long gpuFlops; /* Number of flops performed by the GPU */
+ int gpuNumKernelLaunches; /* Number of GPU kernel launches */
+
+ /* If not using the GPU, these items are not used, but they should be
+ present so that the CHOLMOD Common has the same size whether the GPU
+ is used or not. This way, all packages will agree on the size of
+ the CHOLMOD Common, regardless of whether or not they are compiled
+ with the GPU libraries or not */
+
+#ifdef GPU_BLAS
+ /* in CUDA, these three types are pointers */
+ #define CHOLMOD_CUBLAS_HANDLE cublasHandle_t
+ #define CHOLMOD_CUDASTREAM cudaStream_t
+ #define CHOLMOD_CUDAEVENT cudaEvent_t
+#else
+ /* ... so make them void * pointers if the GPU is not being used */
+ #define CHOLMOD_CUBLAS_HANDLE void *
+ #define CHOLMOD_CUDASTREAM void *
+ #define CHOLMOD_CUDAEVENT void *
+#endif
- /* control parameter (added for v1.2): */
- int default_nesdis ; /* Default: FALSE. If FALSE, then the default
- * ordering strategy (when Common->nmethods == 0)
- * is to try the given ordering (if present), AMD, and then METIS if AMD
- * reports high fill-in. If Common->default_nesdis is TRUE then NESDIS
- * is used instead in the default strategy. */
+ CHOLMOD_CUBLAS_HANDLE cublasHandle ;
- /* statistic (added for v1.2): */
- int called_nd ; /* TRUE if the last call to
- * cholmod_analyze called NESDIS or METIS. */
+ /* a set of streams for general use */
+ CHOLMOD_CUDASTREAM gpuStream[CHOLMOD_HOST_SUPERNODE_BUFFERS];
- int blas_ok ; /* FALSE if BLAS int overflow; TRUE otherwise */
+ CHOLMOD_CUDAEVENT cublasEventPotrf [3] ;
+ CHOLMOD_CUDAEVENT updateCKernelsComplete;
+ CHOLMOD_CUDAEVENT updateCBuffersFree[CHOLMOD_HOST_SUPERNODE_BUFFERS];
- /* SuiteSparseQR control parameters: */
- int SPQR_shrink ; /* controls stack realloc method */
- int SPQR_nthreads ; /* number of TBB threads, 0 = auto */
+ void *dev_mempool; /* pointer to single allocation of device memory */
+ size_t dev_mempool_size;
- /* ---------------------------------------------------------------------- */
- size_t other4 [16] ;
+ void *host_pinned_mempool; /* pointer to single allocation of pinned mem */
+ size_t host_pinned_mempool_size;
- /* ---------------------------------------------------------------------- */
- void *other5 [16] ;
+ size_t devBuffSize;
+ int ibuffer;
+
+ double syrkStart ; /* time syrk started */
+
+ /* run times of the different parts of CHOLMOD (GPU and CPU) */
+ double cholmod_cpu_gemm_time ;
+ double cholmod_cpu_syrk_time ;
+ double cholmod_cpu_trsm_time ;
+ double cholmod_cpu_potrf_time ;
+ double cholmod_gpu_gemm_time ;
+ double cholmod_gpu_syrk_time ;
+ double cholmod_gpu_trsm_time ;
+ double cholmod_gpu_potrf_time ;
+ double cholmod_assemble_time ;
+ double cholmod_assemble_time2 ;
+
+ /* number of times the BLAS are called on the CPU and the GPU */
+ size_t cholmod_cpu_gemm_calls ;
+ size_t cholmod_cpu_syrk_calls ;
+ size_t cholmod_cpu_trsm_calls ;
+ size_t cholmod_cpu_potrf_calls ;
+ size_t cholmod_gpu_gemm_calls ;
+ size_t cholmod_gpu_syrk_calls ;
+ size_t cholmod_gpu_trsm_calls ;
+ size_t cholmod_gpu_potrf_calls ;
} cholmod_common ;
+/* size_t BLAS statistcs in Common: */
+#define CHOLMOD_CPU_GEMM_CALLS cholmod_cpu_gemm_calls
+#define CHOLMOD_CPU_SYRK_CALLS cholmod_cpu_syrk_calls
+#define CHOLMOD_CPU_TRSM_CALLS cholmod_cpu_trsm_calls
+#define CHOLMOD_CPU_POTRF_CALLS cholmod_cpu_potrf_calls
+#define CHOLMOD_GPU_GEMM_CALLS cholmod_gpu_gemm_calls
+#define CHOLMOD_GPU_SYRK_CALLS cholmod_gpu_syrk_calls
+#define CHOLMOD_GPU_TRSM_CALLS cholmod_gpu_trsm_calls
+#define CHOLMOD_GPU_POTRF_CALLS cholmod_gpu_potrf_calls
+
+/* double BLAS statistics in Common: */
+#define CHOLMOD_CPU_GEMM_TIME cholmod_cpu_gemm_time
+#define CHOLMOD_CPU_SYRK_TIME cholmod_cpu_syrk_time
+#define CHOLMOD_CPU_TRSM_TIME cholmod_cpu_trsm_time
+#define CHOLMOD_CPU_POTRF_TIME cholmod_cpu_potrf_time
+#define CHOLMOD_GPU_GEMM_TIME cholmod_gpu_gemm_time
+#define CHOLMOD_GPU_SYRK_TIME cholmod_gpu_syrk_time
+#define CHOLMOD_GPU_TRSM_TIME cholmod_gpu_trsm_time
+#define CHOLMOD_GPU_POTRF_TIME cholmod_gpu_potrf_time
+#define CHOLMOD_ASSEMBLE_TIME cholmod_assemble_time
+#define CHOLMOD_ASSEMBLE_TIME2 cholmod_assemble_time2
+
+/* for supernodal analysis */
+#define CHOLMOD_ANALYZE_FOR_SPQR 0
+#define CHOLMOD_ANALYZE_FOR_CHOLESKY 1
+#define CHOLMOD_ANALYZE_FOR_SPQRGPU 2
+
/* -------------------------------------------------------------------------- */
/* cholmod_start: first call to CHOLMOD */
/* -------------------------------------------------------------------------- */
@@ -1041,12 +1137,12 @@ int cholmod_l_free_work (cholmod_common *) ;
} \
}
-UF_long cholmod_clear_flag
+SuiteSparse_long cholmod_clear_flag
(
cholmod_common *Common
) ;
-UF_long cholmod_l_clear_flag (cholmod_common *) ;
+SuiteSparse_long cholmod_l_clear_flag (cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_error: called when CHOLMOD encounters an error */
@@ -1119,7 +1215,7 @@ typedef struct cholmod_sparse_struct
size_t ncol ;
size_t nzmax ; /* maximum number of entries in the matrix */
- /* pointers to int or UF_long: */
+ /* pointers to int or SuiteSparse_long: */
void *p ; /* p [0..ncol], the column pointers */
void *i ; /* i [0..nzmax-1], the row indices */
@@ -1152,8 +1248,9 @@ typedef struct cholmod_sparse_struct
*/
int itype ; /* CHOLMOD_INT: p, i, and nz are int.
- * CHOLMOD_INTLONG: p is UF_long, i and nz are int.
- * CHOLMOD_LONG: p, i, and nz are UF_long. */
+ * CHOLMOD_INTLONG: p is SuiteSparse_long,
+ * i and nz are int.
+ * CHOLMOD_LONG: p, i, and nz are SuiteSparse_long */
int xtype ; /* pattern, real, complex, or zomplex */
int dtype ; /* x and z are double or float */
@@ -1163,6 +1260,18 @@ typedef struct cholmod_sparse_struct
} cholmod_sparse ;
+typedef struct cholmod_descendant_score_t {
+ double score;
+ SuiteSparse_long d;
+} descendantScore;
+
+/* For sorting descendant supernodes with qsort */
+int cholmod_score_comp (struct cholmod_descendant_score_t *i,
+ struct cholmod_descendant_score_t *j);
+
+int cholmod_l_score_comp (struct cholmod_descendant_score_t *i,
+ struct cholmod_descendant_score_t *j);
+
/* -------------------------------------------------------------------------- */
/* cholmod_allocate_sparse: allocate a sparse matrix */
/* -------------------------------------------------------------------------- */
@@ -1218,7 +1327,7 @@ int cholmod_l_reallocate_sparse ( size_t, cholmod_sparse *, cholmod_common *) ;
/* cholmod_nnz: return number of nonzeros in a sparse matrix */
/* -------------------------------------------------------------------------- */
-UF_long cholmod_nnz
+SuiteSparse_long cholmod_nnz
(
/* ---- input ---- */
cholmod_sparse *A,
@@ -1226,7 +1335,7 @@ UF_long cholmod_nnz
cholmod_common *Common
) ;
-UF_long cholmod_l_nnz (cholmod_sparse *, cholmod_common *) ;
+SuiteSparse_long cholmod_l_nnz (cholmod_sparse *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_speye: sparse identity matrix */
@@ -1303,8 +1412,8 @@ int cholmod_transpose_unsym
cholmod_common *Common
) ;
-int cholmod_l_transpose_unsym (cholmod_sparse *, int, UF_long *, UF_long *,
- size_t, cholmod_sparse *, cholmod_common *) ;
+int cholmod_l_transpose_unsym (cholmod_sparse *, int, SuiteSparse_long *,
+ SuiteSparse_long *, size_t, cholmod_sparse *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_transpose_sym: transpose a symmetric sparse matrix */
@@ -1325,8 +1434,8 @@ int cholmod_transpose_sym
cholmod_common *Common
) ;
-int cholmod_l_transpose_sym (cholmod_sparse *, int, UF_long *, cholmod_sparse *,
- cholmod_common *) ;
+int cholmod_l_transpose_sym (cholmod_sparse *, int, SuiteSparse_long *,
+ cholmod_sparse *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_ptranspose: transpose a sparse matrix */
@@ -1347,8 +1456,8 @@ cholmod_sparse *cholmod_ptranspose
cholmod_common *Common
) ;
-cholmod_sparse *cholmod_l_ptranspose (cholmod_sparse *, int, UF_long *,
- UF_long *, size_t, cholmod_common *) ;
+cholmod_sparse *cholmod_l_ptranspose (cholmod_sparse *, int, SuiteSparse_long *,
+ SuiteSparse_long *, size_t, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_sort: sort row indices in each column of sparse matrix */
@@ -1372,15 +1481,15 @@ cholmod_sparse *cholmod_band
(
/* ---- input ---- */
cholmod_sparse *A, /* matrix to extract band matrix from */
- UF_long k1, /* ignore entries below the k1-st diagonal */
- UF_long k2, /* ignore entries above the k2-nd diagonal */
+ SuiteSparse_long k1, /* ignore entries below the k1-st diagonal */
+ SuiteSparse_long k2, /* ignore entries above the k2-nd diagonal */
int mode, /* >0: numerical, 0: pattern, <0: pattern (no diag) */
/* --------------- */
cholmod_common *Common
) ;
-cholmod_sparse *cholmod_l_band (cholmod_sparse *, UF_long, UF_long, int,
- cholmod_common *) ;
+cholmod_sparse *cholmod_l_band (cholmod_sparse *, SuiteSparse_long,
+ SuiteSparse_long, int, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_band_inplace: A = tril (triu (A,k1), k2) */
@@ -1389,8 +1498,8 @@ cholmod_sparse *cholmod_l_band (cholmod_sparse *, UF_long, UF_long, int,
int cholmod_band_inplace
(
/* ---- input ---- */
- UF_long k1, /* ignore entries below the k1-st diagonal */
- UF_long k2, /* ignore entries above the k2-nd diagonal */
+ SuiteSparse_long k1, /* ignore entries below the k1-st diagonal */
+ SuiteSparse_long k2, /* ignore entries above the k2-nd diagonal */
int mode, /* >0: numerical, 0: pattern, <0: pattern (no diag) */
/* ---- in/out --- */
cholmod_sparse *A, /* matrix from which entries not in band are removed */
@@ -1398,8 +1507,8 @@ int cholmod_band_inplace
cholmod_common *Common
) ;
-int cholmod_l_band_inplace (UF_long, UF_long, int, cholmod_sparse *,
- cholmod_common *) ;
+int cholmod_l_band_inplace (SuiteSparse_long, SuiteSparse_long, int,
+ cholmod_sparse *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_aat: C = A*A' or A(:,f)*A(:,f)' */
@@ -1418,8 +1527,8 @@ cholmod_sparse *cholmod_aat
cholmod_common *Common
) ;
-cholmod_sparse *cholmod_l_aat (cholmod_sparse *, UF_long *, size_t, int,
- cholmod_common *) ;
+cholmod_sparse *cholmod_l_aat (cholmod_sparse *, SuiteSparse_long *, size_t,
+ int, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_copy_sparse: C = A, create an exact copy of a sparse matrix */
@@ -1439,7 +1548,7 @@ cholmod_sparse *cholmod_l_copy_sparse (cholmod_sparse *, cholmod_common *) ;
/* cholmod_copy: C = A, with possible change of stype */
/* -------------------------------------------------------------------------- */
-cholmod_sparse *cholmod_copy
+cholmod_sparse *cholmod_copy
(
/* ---- input ---- */
cholmod_sparse *A, /* matrix to copy */
@@ -1515,6 +1624,9 @@ typedef struct cholmod_factor_struct
void *Perm ; /* size n, permutation used */
void *ColCount ; /* size n, column counts for simplicial L */
+ void *IPerm ; /* size n, inverse permutation. Only created by
+ * cholmod_solve2 if Bset is used. */
+
/* ---------------------------------------------------------------------- */
/* simplicial factorization */
/* ---------------------------------------------------------------------- */
@@ -1606,13 +1718,16 @@ typedef struct cholmod_factor_struct
* except for the numerical values (x and z).
*/
- int itype ; /* The integer arrays are Perm, ColCount, p, i, nz,
- * next, prev, super, pi, px, and s. If itype is
- * CHOLMOD_INT, all of these are int arrays.
- * CHOLMOD_INTLONG: p, pi, px are UF_long, others int.
- * CHOLMOD_LONG: all integer arrays are UF_long. */
- int xtype ; /* pattern, real, complex, or zomplex */
- int dtype ; /* x and z double or float */
+ int itype ; /* The integer arrays are Perm, ColCount, p, i, nz,
+ * next, prev, super, pi, px, and s. If itype is
+ * CHOLMOD_INT, all of these are int arrays.
+ * CHOLMOD_INTLONG: p, pi, px are SuiteSparse_long, others int.
+ * CHOLMOD_LONG: all integer arrays are SuiteSparse_long. */
+ int xtype ; /* pattern, real, complex, or zomplex */
+ int dtype ; /* x and z double or float */
+
+ int useGPU; /* Indicates the symbolic factorization supports
+ * GPU acceleration */
} cholmod_factor ;
@@ -1868,6 +1983,26 @@ int cholmod_free_dense
int cholmod_l_free_dense (cholmod_dense **, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
+/* cholmod_ensure_dense: ensure a dense matrix has a given size and type */
+/* -------------------------------------------------------------------------- */
+
+cholmod_dense *cholmod_ensure_dense
+(
+ /* ---- input/output ---- */
+ cholmod_dense **XHandle, /* matrix handle to check */
+ /* ---- input ---- */
+ size_t nrow, /* # of rows of matrix */
+ size_t ncol, /* # of columns of matrix */
+ size_t d, /* leading dimension */
+ int xtype, /* CHOLMOD_REAL, _COMPLEX, or _ZOMPLEX */
+ /* --------------- */
+ cholmod_common *Common
+) ;
+
+cholmod_dense *cholmod_l_ensure_dense (cholmod_dense **, size_t, size_t, size_t,
+ int, cholmod_common *) ;
+
+/* -------------------------------------------------------------------------- */
/* cholmod_sparse_to_dense: create a dense matrix copy of a sparse matrix */
/* -------------------------------------------------------------------------- */
@@ -2008,9 +2143,9 @@ typedef struct cholmod_triplet_struct
* no entry in a triplet matrix is ever ignored.
*/
- int itype ; /* CHOLMOD_LONG: i and j are UF_long. Otherwise int. */
- int xtype ; /* pattern, real, complex, or zomplex */
- int dtype ; /* x and z are double or float */
+ int itype ; /* CHOLMOD_LONG: i and j are SuiteSparse_long. Otherwise int */
+ int xtype ; /* pattern, real, complex, or zomplex */
+ int dtype ; /* x and z are double or float */
} cholmod_triplet ;
@@ -2198,13 +2333,13 @@ int cholmod_realloc_multiple
(
/* ---- input ---- */
size_t nnew, /* requested # of items in reallocated blocks */
- int nint, /* number of int/UF_long blocks */
+ int nint, /* number of int/SuiteSparse_long blocks */
int xtype, /* CHOLMOD_PATTERN, _REAL, _COMPLEX, or _ZOMPLEX */
/* ---- in/out --- */
- void **I, /* int or UF_long block */
- void **J, /* int or UF_long block */
- void **X, /* complex, double, or float block */
- void **Z, /* zomplex case only: double or float block */
+ void **Iblock, /* int or SuiteSparse_long block */
+ void **Jblock, /* int or SuiteSparse_long block */
+ void **Xblock, /* complex, double, or float block */
+ void **Zblock, /* zomplex case only: double or float block */
size_t *n, /* current size of the I,J,X,Z blocks on input,
* nnew on output if successful */
/* --------------- */
@@ -2215,6 +2350,31 @@ int cholmod_l_realloc_multiple (size_t, int, int, void **, void **, void **,
void **, size_t *, cholmod_common *) ;
/* ========================================================================== */
+/* === version control ====================================================== */
+/* ========================================================================== */
+
+int cholmod_version /* returns CHOLMOD_VERSION */
+(
+ /* output, contents not defined on input. Not used if NULL.
+ version [0] = CHOLMOD_MAIN_VERSION
+ version [1] = CHOLMOD_SUB_VERSION
+ version [2] = CHOLMOD_SUBSUB_VERSION
+ */
+ int version [3]
+) ;
+
+int cholmod_l_version (int version [3]) ;
+
+/* Versions prior to 2.1.1 do not have the above function. The following
+ code fragment will work with any version of CHOLMOD:
+ #ifdef CHOLMOD_HAS_VERSION_FUNCTION
+ v = cholmod_version (NULL) ;
+ #else
+ v = CHOLMOD_VERSION ;
+ #endif
+*/
+
+/* ========================================================================== */
/* === symmetry types ======================================================= */
/* ========================================================================== */
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_function.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_function.h
new file mode 100644
index 0000000..aec275e
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_function.h
@@ -0,0 +1,155 @@
+/* ========================================================================== */
+/* === CHOLMOD/Include/cholmod_function.h ================================ */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/Include/cholmod_function.h
+ * Copyright (C) 2014, Timothy A. Davis
+ * This specific file (CHOLMOD/Include/cholmod_function.h) has no license
+ * restrictions at all. You may freely include this in your applications, and
+ * modify it at will.
+ * -------------------------------------------------------------------------- */
+
+/* Memory management, printing, and math function pointers were removed from
+ the CHOLMOD Common struct as of version 2.2.0 and later. They now appear in
+ SuiteSparse_config.h instead. This file assists in backward compatibility,
+ so that you can use either old or new versions of CHOLMOD and SuiteSparse in
+ an application that uses the function pointers. You can copy the file into
+ your own application that uses older versions of CHOLMOD, or the current
+ version, so that you have a transparent method for setting these function
+ pointers for any version of CHOLMOD and SuiteSparse.
+
+ In both old and new versions of CHOLMOD (and SuiteSparse), the intent of
+ these function pointers is that they are not to be called directly.
+ Instead, you should use (for example), the cholmod_malloc function. That
+ function is a wrapper that then uses the cc->malloc_memory or
+ SuiteSparse_config.malloc_func function pointers.
+
+ In each of the macros below, 'cc' is a pointer to the CHOLMOD Common struct.
+
+ Usage: to assign, say, 'malloc' as your memory allocator, use this:
+
+ #include "cholmod_function.h"
+ ...
+ cholmod_common *cc, Common ;
+ cc = &Common ;
+ cholmod_start (cc) ;
+ ...
+ CHOLMOD_FUNCTION_DEFAULTS ;
+ CHOLMOD_FUNCTION_MALLOC (cc) = mymalloc ;
+
+ instead of this, in older versions of CHOLMOD:
+
+ cc->malloc_memory = mymalloc ;
+
+ or in newer versions of CHOLMOD:
+
+ SuiteSparse_config.malloc_func = mymalloc ;
+*/
+
+#ifndef CHOLMOD_FUNCTION_H
+#define CHOLMOD_FUNCTION_H
+
+#include "cholmod.h"
+
+/* -------------------------------------------------------------------------- */
+/* location of function pointers, depending on the CHOLMOD version */
+/* -------------------------------------------------------------------------- */
+
+#if (CHOLMOD_VERSION < (CHOLMOD_VER_CODE(2,2)))
+
+ #define CHOLMOD_FUNCTION_MALLOC(cc) cc->malloc_memory
+ #define CHOLMOD_FUNCTION_REALLOC(cc) cc->realloc_memory
+ #define CHOLMOD_FUNCTION_FREE(cc) cc->free_memory
+ #define CHOLMOD_FUNCTION_CALLOC(cc) cc->calloc_memory
+ #define CHOLMOD_FUNCTION_PRINTF(cc) cc->print_function
+ #define CHOLMOD_FUNCTION_DIVCOMPLEX(cc) cc->complex_divide
+ #define CHOLMOD_FUNCTION_HYPOTENUSE(cc) cc->hypotenuse
+
+#else
+
+ #include "SuiteSparse_config.h"
+ #define CHOLMOD_FUNCTION_MALLOC(cc) SuiteSparse_config.malloc_func
+ #define CHOLMOD_FUNCTION_REALLOC(cc) SuiteSparse_config.realloc_func
+ #define CHOLMOD_FUNCTION_FREE(cc) SuiteSparse_config.free_func
+ #define CHOLMOD_FUNCTION_CALLOC(cc) SuiteSparse_config.calloc_func
+ #define CHOLMOD_FUNCTION_PRINTF(cc) SuiteSparse_config.printf_func
+ #define CHOLMOD_FUNCTION_DIVCOMPLEX(cc) SuiteSparse_config.divcomplex_func
+ #define CHOLMOD_FUNCTION_HYPOTENUSE(cc) SuiteSparse_config.hypot_func
+
+#endif
+
+/* -------------------------------------------------------------------------- */
+/* default math functions, depending on the CHOLMOD version */
+/* -------------------------------------------------------------------------- */
+
+#if (CHOLMOD_VERSION < (CHOLMOD_VER_CODE(2,2)))
+
+ #define CHOLMOD_FUNCTION_DEFAULT_DIVCOMPLEX cholmod_l_divcomplex
+ #define CHOLMOD_FUNCTION_DEFAULT_HYPOTENUSE cholmod_l_hypot
+
+#else
+
+ #define CHOLMOD_FUNCTION_DEFAULT_DIVCOMPLEX SuiteSparse_divcomplex
+ #define CHOLMOD_FUNCTION_DEFAULT_HYPOTENUSE SuiteSparse_hypot
+
+#endif
+
+/* -------------------------------------------------------------------------- */
+/* default memory manager functions */
+/* -------------------------------------------------------------------------- */
+
+#ifndef NMALLOC
+ #ifdef MATLAB_MEX_FILE
+ /* MATLAB mexFunction */
+ #define CHOLMOD_FUNCTION_DEFAULT_MALLOC mxMalloc
+ #define CHOLMOD_FUNCTION_DEFAULT_CALLOC mxCalloc
+ #define CHOLMOD_FUNCTION_DEFAULT_REALLOC mxRealloc
+ #define CHOLMOD_FUNCTION_DEFAULT_FREE mxFree
+ #else
+ /* standard ANSI C */
+ #define CHOLMOD_FUNCTION_DEFAULT_MALLOC malloc
+ #define CHOLMOD_FUNCTION_DEFAULT_CALLOC calloc
+ #define CHOLMOD_FUNCTION_DEFAULT_REALLOC realloc
+ #define CHOLMOD_FUNCTION_DEFAULT_FREE free
+ #endif
+#else
+ /* no memory manager defined at compile time */
+ #define CHOLMOD_FUNCTION_DEFAULT_MALLOC NULL
+ #define CHOLMOD_FUNCTION_DEFAULT_CALLOC NULL
+ #define CHOLMOD_FUNCTION_DEFAULT_REALLOC NULL
+ #define CHOLMOD_FUNCTION_DEFAULT_FREE NULL
+#endif
+
+/* -------------------------------------------------------------------------- */
+/* default printf function */
+/* -------------------------------------------------------------------------- */
+
+#ifdef MATLAB_MEX_FILE
+ #define CHOLMOD_FUNCTION_DEFAULT_PRINTF mexPrintf
+#else
+ #define CHOLMOD_FUNCTION_DEFAULT_PRINTF printf
+#endif
+
+/* -------------------------------------------------------------------------- */
+/* set all the defaults */
+/* -------------------------------------------------------------------------- */
+
+/* Use this macro to initialize all the function pointers to their defaults
+ for any version of CHOLMOD. For CHOLMD 2.2.0 and later, it sets function
+ pointers in the SuiteSparse_config struct. For older versions, it sets
+ function pointers in the CHOLMOD Common. This assignment is not
+ thread-safe, and should be done before launching any threads. */
+
+#define CHOLMOD_FUNCTION_DEFAULTS \
+{ \
+ CHOLMOD_FUNCTION_MALLOC (cc) = CHOLMOD_FUNCTION_DEFAULT_MALLOC ; \
+ CHOLMOD_FUNCTION_REALLOC (cc) = CHOLMOD_FUNCTION_DEFAULT_REALLOC ; \
+ CHOLMOD_FUNCTION_FREE (cc) = CHOLMOD_FUNCTION_DEFAULT_FREE ; \
+ CHOLMOD_FUNCTION_CALLOC (cc) = CHOLMOD_FUNCTION_DEFAULT_CALLOC ; \
+ CHOLMOD_FUNCTION_PRINTF (cc) = CHOLMOD_FUNCTION_DEFAULT_PRINTF ; \
+ CHOLMOD_FUNCTION_DIVCOMPLEX (cc) = CHOLMOD_FUNCTION_DEFAULT_DIVCOMPLEX ; \
+ CHOLMOD_FUNCTION_HYPOTENUSE (cc) = CHOLMOD_FUNCTION_DEFAULT_HYPOTENUSE ; \
+}
+
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_gpu.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_gpu.h
new file mode 100644
index 0000000..d34f174
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_gpu.h
@@ -0,0 +1,80 @@
+/* ========================================================================== */
+/* === Include/cholmod_gpu.h ================================================ */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/Include/cholmod_gpu.h.
+ * Copyright (C) 2014, Timothy A. Davis
+ * CHOLMOD/Include/cholmod_gpu.h and the CHOLMOD GPU Module are licensed under
+ * Version 2.0 of the GNU General Public License. See gpl.txt for a text of
+ * the license. CHOLMOD is also available under other licenses; contact
+ * authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* CHOLMOD GPU module
+ */
+
+#ifndef CHOLMOD_GPU_H
+#define CHOLMOD_GPU_H
+
+#ifdef GPU_BLAS
+#include "omp.h"
+#include <fenv.h>
+#endif
+
+/* CHOLMOD_GPU_PRINTF: for printing GPU debug error messages */
+/*
+#define CHOLMOD_GPU_PRINTF(args) printf args
+*/
+#define CHOLMOD_GPU_PRINTF(args)
+
+/* define supernode requirements for processing on GPU */
+#define CHOLMOD_ND_ROW_LIMIT 256 /* required descendant rows */
+#define CHOLMOD_ND_COL_LIMIT 32 /* required descendnat cols */
+#define CHOLMOD_POTRF_LIMIT 512 /* required cols for POTRF & TRSM on GPU */
+
+/* # of host supernodes to perform before checking for free pinned buffers */
+#define CHOLMOD_GPU_SKIP 3
+
+#define CHOLMOD_HANDLE_CUDA_ERROR(e,s) {if (e) {ERROR(CHOLMOD_GPU_PROBLEM,s);}}
+
+typedef struct cholmod_gpu_pointers
+{
+ double *h_Lx [CHOLMOD_HOST_SUPERNODE_BUFFERS] ;
+ double *d_Lx [CHOLMOD_DEVICE_STREAMS] ;
+ double *d_C ;
+ double *d_A [CHOLMOD_DEVICE_STREAMS] ;
+ void *d_Ls ;
+ void *d_Map ;
+ void *d_RelativeMap ;
+
+} cholmod_gpu_pointers ;
+
+int cholmod_gpu_memorysize /* GPU memory size available, 1 if no GPU */
+(
+ size_t *total_mem,
+ size_t *available_mem,
+ cholmod_common *Common
+) ;
+
+int cholmod_l_gpu_memorysize /* GPU memory size available, 1 if no GPU */
+(
+ size_t *total_mem,
+ size_t *available_mem,
+ cholmod_common *Common
+) ;
+
+int cholmod_gpu_probe ( cholmod_common *Common ) ;
+int cholmod_l_gpu_probe ( cholmod_common *Common ) ;
+
+int cholmod_gpu_deallocate ( cholmod_common *Common ) ;
+int cholmod_l_gpu_deallocate ( cholmod_common *Common ) ;
+
+void cholmod_gpu_end ( cholmod_common *Common ) ;
+void cholmod_l_gpu_end ( cholmod_common *Common ) ;
+
+int cholmod_gpu_allocate ( cholmod_common *Common ) ;
+int cholmod_l_gpu_allocate ( cholmod_common *Common ) ;
+
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_gpu_kernels.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_gpu_kernels.h
new file mode 100644
index 0000000..9fa3d47
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_gpu_kernels.h
@@ -0,0 +1,50 @@
+/* ========================================================================== */
+/* === Include/cholmod_gpu_kernels.h ======================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/Include/cholmod_gpu_kernels.h.
+ * Copyright (C) 2014, Timothy A. Davis
+ * CHOLMOD/Include/cholmod_gpu.h and the CHOLMOD GPU Module are licensed under
+ * Version 2.0 of the GNU General Public License. See gpl.txt for a text of
+ * the license. CHOLMOD is also available under other licenses; contact
+ * authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* -----------------------------------------------------------------------------
+ * CUDA kernel support routines for CHOLMOD
+ * -------------------------------------------------------------------------- */
+
+#ifndef CHOLMODGPUKERNELS_H
+#define CHOLMODGPUKERNELS_H
+
+/* make it easy for C++ programs to include CHOLMOD */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "SuiteSparse_config.h"
+
+int createMapOnDevice ( Int *d_Map, Int *d_Ls, Int psi, Int nsrow );
+
+int createRelativeMapOnDevice ( Int *d_Map, Int *d_Ls, Int *d_RelativeMap,
+ Int pdi1, Int ndrow, cudaStream_t astream );
+
+int addUpateOnDevice ( double *d_A, double *devPtrC, Int *d_RelativeMap,
+ Int ndrow1, Int ndrow2, Int nsrow, cudaStream_t astream );
+
+int addComplexUpateOnDevice ( double *d_A, double *devPtrC, Int *d_RelativeMap,
+ Int ndrow1, Int ndrow2, Int nsrow, cudaStream_t astream );
+
+int sumAOnDevice ( double *a1, double *a2, const double alpha, int nsrow,
+ int nscol );
+
+int sumComplexAOnDevice ( double *a1, double *a2, const double alpha,
+ int nsrow, int nscol );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_internal.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_internal.h
index d27bf9b..0cef5f9 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_internal.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_internal.h
@@ -4,11 +4,10 @@
/* -----------------------------------------------------------------------------
* CHOLMOD/Include/cholmod_internal.h.
- * Copyright (C) 2005-2006, Univ. of Florida. Author: Timothy A. Davis
+ * Copyright (C) 2005-2013, Univ. of Florida. Author: Timothy A. Davis
* CHOLMOD/Include/cholmod_internal.h is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* CHOLMOD internal include file.
@@ -155,14 +154,14 @@
#define HUGE_DOUBLE 1e308
/* ========================================================================== */
-/* === int/UF_long and double/float definitions ============================= */
+/* === int/long and double/float definitions ================================ */
/* ========================================================================== */
/* CHOLMOD is designed for 3 types of integer variables:
*
* (1) all integers are int
- * (2) most integers are int, some are UF_long
- * (3) all integers are UF_long
+ * (2) most integers are int, some are SuiteSparse_long
+ * (3) all integers are SuiteSparse_long
*
* and two kinds of floating-point values:
*
@@ -177,17 +176,17 @@
* first two are currently supported):
*
* DINT double, int prefix: cholmod_
- * DLONG double, UF_long prefix: cholmod_l_
- * DMIX double, mixed int/UF_long prefix: cholmod_m_
+ * DLONG double, SuiteSparse_long prefix: cholmod_l_
+ * DMIX double, mixed int/SuiteSparse_long prefix: cholmod_m_
* SINT float, int prefix: cholmod_si_
- * SLONG float, UF_long prefix: cholmod_sl_
+ * SLONG float, SuiteSparse_long prefix: cholmod_sl_
* SMIX float, mixed int/log prefix: cholmod_sm_
*
* These are selected with compile time flags (-DDLONG, for example). If no
* flag is selected, the default is DINT.
*
* All six versions use the same include files. The user-visible include files
- * are completely independent of which int/UF_long/double/float version is being
+ * are completely independent of which int/long/double/float version is being
* used. The integer / real types in all data structures (sparse, triplet,
* dense, common, and triplet) are defined at run-time, not compile-time, so
* there is only one "cholmod_sparse" data type. Void pointers are used inside
@@ -195,13 +194,14 @@
* structure has an itype and dtype field which determines the kind of basic
* types used. These are defined in Include/cholmod_core.h.
*
- * FUTURE WORK: support all six types (float, and mixed int/UF_long)
+ * FUTURE WORK: support all six types (float, and mixed int/long)
*
- * UF_long is normally defined as long. However, for WIN64 it is __int64.
- * It can also be redefined for other platforms, by modifying UFconfig.h.
+ * SuiteSparse_long is normally defined as long. However, for WIN64 it is
+ * __int64. It can also be redefined for other platforms, by modifying
+ * SuiteSparse_config.h.
*/
-#include "UFconfig.h"
+#include "SuiteSparse_config.h"
/* -------------------------------------------------------------------------- */
/* Size_max: the largest value of size_t */
@@ -216,47 +216,19 @@ size_t cholmod_l_add_size_t (size_t a, size_t b, int *ok) ;
size_t cholmod_l_mult_size_t (size_t a, size_t k, int *ok) ;
/* -------------------------------------------------------------------------- */
-/* double (also complex double), UF_long */
+/* double (also complex double), SuiteSparse_long */
/* -------------------------------------------------------------------------- */
#ifdef DLONG
#define Real double
-#define Int UF_long
-#define Int_max UF_long_max
+#define Int SuiteSparse_long
+#define Int_max SuiteSparse_long_max
#define CHOLMOD(name) cholmod_l_ ## name
#define LONG
#define DOUBLE
#define ITYPE CHOLMOD_LONG
#define DTYPE CHOLMOD_DOUBLE
-#define ID UF_long_id
-
-/* -------------------------------------------------------------------------- */
-/* double, int/UF_long */
-/* -------------------------------------------------------------------------- */
-
-#elif defined (DMIX)
-#error "mixed int/UF_long not yet supported"
-
-/* -------------------------------------------------------------------------- */
-/* single, int */
-/* -------------------------------------------------------------------------- */
-
-#elif defined (SINT)
-#error "single-precision not yet supported"
-
-/* -------------------------------------------------------------------------- */
-/* single, UF_long */
-/* -------------------------------------------------------------------------- */
-
-#elif defined (SLONG)
-#error "single-precision not yet supported"
-
-/* -------------------------------------------------------------------------- */
-/* single, int/UF_long */
-/* -------------------------------------------------------------------------- */
-
-#elif defined (SMIX)
-#error "single-precision not yet supported"
+#define ID SuiteSparse_long_id
/* -------------------------------------------------------------------------- */
/* double (also complex double), int: this is the default */
@@ -278,6 +250,9 @@ size_t cholmod_l_mult_size_t (size_t a, size_t k, int *ok) ;
#define DTYPE CHOLMOD_DOUBLE
#define ID "%d"
+/* GPU acceleration is not available for the int version of CHOLMOD */
+#undef GPU_BLAS
+
#endif
@@ -291,6 +266,7 @@ size_t cholmod_l_mult_size_t (size_t a, size_t k, int *ok) ;
/* === Architecture and BLAS ================================================ */
/* ========================================================================== */
+#define BLAS_OK Common->blas_ok
#include "cholmod_blas.h"
/* ========================================================================== */
@@ -315,7 +291,8 @@ size_t cholmod_l_mult_size_t (size_t a, size_t k, int *ok) ;
/* double, int */
EXTERN int cholmod_dump ;
EXTERN int cholmod_dump_malloc ;
-UF_long cholmod_dump_sparse (cholmod_sparse *, const char *, cholmod_common *);
+SuiteSparse_long cholmod_dump_sparse (cholmod_sparse *, const char *,
+ cholmod_common *) ;
int cholmod_dump_factor (cholmod_factor *, const char *, cholmod_common *) ;
int cholmod_dump_triplet (cholmod_triplet *, const char *, cholmod_common *) ;
int cholmod_dump_dense (cholmod_dense *, const char *, cholmod_common *) ;
@@ -324,46 +301,49 @@ int cholmod_dump_subset (int *, size_t, size_t, const char *,
int cholmod_dump_perm (int *, size_t, size_t, const char *, cholmod_common *) ;
int cholmod_dump_parent (int *, size_t, const char *, cholmod_common *) ;
void cholmod_dump_init (const char *, cholmod_common *) ;
-int cholmod_dump_mem (const char *, UF_long, cholmod_common *) ;
-void cholmod_dump_real (const char *, Real *, UF_long, UF_long, int, int,
- cholmod_common *) ;
-void cholmod_dump_super (UF_long, int *, int *, int *, int *, double *, int,
- cholmod_common *) ;
-int cholmod_dump_partition (UF_long, int *, int *, int *, int *, UF_long,
- cholmod_common *) ;
-int cholmod_dump_work(int, int, UF_long, cholmod_common *) ;
-
-/* double, UF_long */
+int cholmod_dump_mem (const char *, SuiteSparse_long, cholmod_common *) ;
+void cholmod_dump_real (const char *, Real *, SuiteSparse_long,
+ SuiteSparse_long, int, int, cholmod_common *) ;
+void cholmod_dump_super (SuiteSparse_long, int *, int *, int *, int *, double *,
+ int, cholmod_common *) ;
+int cholmod_dump_partition (SuiteSparse_long, int *, int *, int *, int *,
+ SuiteSparse_long, cholmod_common *) ;
+int cholmod_dump_work(int, int, SuiteSparse_long, cholmod_common *) ;
+
+/* double, SuiteSparse_long */
EXTERN int cholmod_l_dump ;
EXTERN int cholmod_l_dump_malloc ;
-UF_long cholmod_l_dump_sparse (cholmod_sparse *, const char *,
+SuiteSparse_long cholmod_l_dump_sparse (cholmod_sparse *, const char *,
cholmod_common *) ;
int cholmod_l_dump_factor (cholmod_factor *, const char *, cholmod_common *) ;
int cholmod_l_dump_triplet (cholmod_triplet *, const char *, cholmod_common *);
int cholmod_l_dump_dense (cholmod_dense *, const char *, cholmod_common *) ;
-int cholmod_l_dump_subset (UF_long *, size_t, size_t, const char *,
+int cholmod_l_dump_subset (SuiteSparse_long *, size_t, size_t, const char *,
+ cholmod_common *) ;
+int cholmod_l_dump_perm (SuiteSparse_long *, size_t, size_t, const char *,
cholmod_common *) ;
-int cholmod_l_dump_perm (UF_long *, size_t, size_t, const char *,
+int cholmod_l_dump_parent (SuiteSparse_long *, size_t, const char *,
cholmod_common *) ;
-int cholmod_l_dump_parent (UF_long *, size_t, const char *, cholmod_common *) ;
void cholmod_l_dump_init (const char *, cholmod_common *) ;
-int cholmod_l_dump_mem (const char *, UF_long, cholmod_common *) ;
-void cholmod_l_dump_real (const char *, Real *, UF_long, UF_long, int, int,
- cholmod_common *) ;
-void cholmod_l_dump_super (UF_long, UF_long *, UF_long *, UF_long *, UF_long *,
- double *, int, cholmod_common *) ;
-int cholmod_l_dump_partition (UF_long, UF_long *, UF_long *, UF_long *,
- UF_long *, UF_long, cholmod_common *) ;
-int cholmod_l_dump_work(int, int, UF_long, cholmod_common *) ;
+int cholmod_l_dump_mem (const char *, SuiteSparse_long, cholmod_common *) ;
+void cholmod_l_dump_real (const char *, Real *, SuiteSparse_long,
+ SuiteSparse_long, int, int, cholmod_common *) ;
+void cholmod_l_dump_super (SuiteSparse_long, SuiteSparse_long *,
+ SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *,
+ double *, int, cholmod_common *) ;
+int cholmod_l_dump_partition (SuiteSparse_long, SuiteSparse_long *,
+ SuiteSparse_long *, SuiteSparse_long *,
+ SuiteSparse_long *, SuiteSparse_long, cholmod_common *) ;
+int cholmod_l_dump_work(int, int, SuiteSparse_long, cholmod_common *) ;
#define DEBUG_INIT(s,Common) { CHOLMOD(dump_init)(s, Common) ; }
#define ASSERT(expression) (assert (expression))
#define PRK(k,params) \
{ \
- if (CHOLMOD(dump) >= (k) && Common->print_function != NULL) \
+ if (CHOLMOD(dump) >= (k) && SuiteSparse_config.printf_func != NULL) \
{ \
- (Common->print_function) params ; \
+ (SuiteSparse_config.printf_func) params ; \
} \
}
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_io64.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_io64.h
index 98bf2b3..1964418 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_io64.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_io64.h
@@ -8,7 +8,6 @@
* CHOLMOD/Include/cholmod_io64.h is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Definitions required for large file I/O, which must come before any other
@@ -27,7 +26,7 @@
#if defined(MATLAB_MEX_FILE) || defined(MATHWORKS)
-/* CHOLMOD is being compiled as a MATLAB MEX file, or for use inside MATLAB */
+/* CHOLMOD is being compiled as a MATLAB mexFunction, or for use in MATLAB */
#include "io64.h"
#else
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_matrixops.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_matrixops.h
index b4d090b..7cce7b2 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_matrixops.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_matrixops.h
@@ -8,7 +8,7 @@
* CHOLMOD/Include/cholmod_matrixops.h is licensed under Version 2.0 of the GNU
* General Public License. See gpl.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* CHOLMOD MatrixOps module.
@@ -182,17 +182,18 @@ cholmod_sparse *cholmod_submatrix
/* ---- input ---- */
cholmod_sparse *A, /* matrix to subreference */
int *rset, /* set of row indices, duplicates OK */
- UF_long rsize, /* size of r; rsize < 0 denotes ":" */
+ SuiteSparse_long rsize, /* size of r; rsize < 0 denotes ":" */
int *cset, /* set of column indices, duplicates OK */
- UF_long csize, /* size of c; csize < 0 denotes ":" */
+ SuiteSparse_long csize, /* size of c; csize < 0 denotes ":" */
int values, /* if TRUE compute the numerical values of C */
int sorted, /* if TRUE then return C with sorted columns */
/* --------------- */
cholmod_common *Common
) ;
-cholmod_sparse *cholmod_l_submatrix (cholmod_sparse *, UF_long *, UF_long,
- UF_long *, UF_long, int, int, cholmod_common *) ;
+cholmod_sparse *cholmod_l_submatrix (cholmod_sparse *, SuiteSparse_long *,
+ SuiteSparse_long, SuiteSparse_long *, SuiteSparse_long, int, int,
+ cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_vertcat: C = [A ; B] */
@@ -229,7 +230,8 @@ int cholmod_symmetry
cholmod_common *Common
) ;
-int cholmod_l_symmetry (cholmod_sparse *, int, UF_long *, UF_long *, UF_long *,
- UF_long *, cholmod_common *) ;
+int cholmod_l_symmetry (cholmod_sparse *, int, SuiteSparse_long *,
+ SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *,
+ cholmod_common *) ;
#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_modify.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_modify.h
index bb7dd5a..0fd68f8 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_modify.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_modify.h
@@ -8,7 +8,7 @@
* CHOLMOD/Include/cholmod_modify.h is licensed under Version 2.0 of the GNU
* General Public License. See gpl.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* CHOLMOD Modify module.
@@ -33,6 +33,7 @@
* cholmod_updown_solve update/downdate, and modify solution to Lx=b
* cholmod_updown_mark update/downdate, and modify solution to partial Lx=b
* cholmod_updown_mask update/downdate for LPDASA
+ * cholmod_updown_mask2 update/downdate for LPDASA
* cholmod_rowadd_solve add a row, and update solution to Lx=b
* cholmod_rowadd_mark add a row, and update solution to partial Lx=b
* cholmod_rowdel_solve delete a row, and downdate Lx=b
@@ -117,8 +118,8 @@ int cholmod_updown_mark
cholmod_common *Common
) ;
-int cholmod_l_updown_mark (int, cholmod_sparse *, UF_long *, cholmod_factor *,
- cholmod_dense *, cholmod_dense *, cholmod_common *) ;
+int cholmod_l_updown_mark (int, cholmod_sparse *, SuiteSparse_long *,
+ cholmod_factor *, cholmod_dense *, cholmod_dense *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_updown_mask: update/downdate, for LPDASA */
@@ -143,8 +144,29 @@ int cholmod_updown_mask
cholmod_common *Common
) ;
-int cholmod_l_updown_mask (int, cholmod_sparse *, UF_long *, UF_long *,
- cholmod_factor *, cholmod_dense *, cholmod_dense *, cholmod_common *) ;
+int cholmod_l_updown_mask (int, cholmod_sparse *, SuiteSparse_long *,
+ SuiteSparse_long *, cholmod_factor *, cholmod_dense *, cholmod_dense *,
+ cholmod_common *) ;
+
+int cholmod_updown_mask2
+(
+ /* ---- input ---- */
+ int update, /* TRUE for update, FALSE for downdate */
+ cholmod_sparse *C, /* the incoming sparse update */
+ int *colmark, /* int array of size n. See cholmod_updown.c */
+ int *mask, /* size n */
+ int maskmark,
+ /* ---- in/out --- */
+ cholmod_factor *L, /* factor to modify */
+ cholmod_dense *X, /* solution to Lx=b (size n-by-1) */
+ cholmod_dense *DeltaB, /* change in b, zero on output */
+ /* --------------- */
+ cholmod_common *Common
+) ;
+
+int cholmod_l_updown_mask2 (int, cholmod_sparse *, SuiteSparse_long *,
+ SuiteSparse_long *, SuiteSparse_long, cholmod_factor *, cholmod_dense *,
+ cholmod_dense *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_rowadd: add a row to an LDL' factorization (a rank-2 update) */
@@ -219,8 +241,8 @@ int cholmod_rowadd_mark
cholmod_common *Common
) ;
-int cholmod_l_rowadd_mark (size_t, cholmod_sparse *, double *, UF_long *,
- cholmod_factor *, cholmod_dense *, cholmod_dense *,
+int cholmod_l_rowadd_mark (size_t, cholmod_sparse *, double *,
+ SuiteSparse_long *, cholmod_factor *, cholmod_dense *, cholmod_dense *,
cholmod_common *) ;
/* -------------------------------------------------------------------------- */
@@ -298,7 +320,8 @@ int cholmod_rowdel_mark
cholmod_common *Common
) ;
-int cholmod_l_rowdel_mark (size_t, cholmod_sparse *, double *, UF_long *,
- cholmod_factor *, cholmod_dense *, cholmod_dense *, cholmod_common *) ;
+int cholmod_l_rowdel_mark (size_t, cholmod_sparse *, double *,
+ SuiteSparse_long *, cholmod_factor *, cholmod_dense *, cholmod_dense *,
+ cholmod_common *) ;
#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_partition.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_partition.h
index 1adbc46..1e8ecd3 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_partition.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_partition.h
@@ -4,11 +4,10 @@
/* -----------------------------------------------------------------------------
* CHOLMOD/Include/cholmod_partition.h.
- * Copyright (C) 2005-2006, Univ. of Florida. Author: Timothy A. Davis
+ * Copyright (C) 2005-2013, Univ. of Florida. Author: Timothy A. Davis
* CHOLMOD/Include/cholmod_partition.h is licensed under Version 2.1 of the GNU
* Lesser General Public License. See lesser.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* CHOLMOD Partition module.
@@ -18,28 +17,28 @@
* methods which order a matrix following constraints determined via nested
* dissection.
*
+ * These functions require METIS:
* cholmod_nested_dissection CHOLMOD nested dissection ordering
* cholmod_metis METIS nested dissection ordering (METIS_NodeND)
- * cholmod_ccolamd interface to CCOLAMD ordering
- * cholmod_csymamd interface to CSYMAMD ordering
- * cholmod_camd interface to CAMD ordering
* cholmod_bisect graph partitioner (currently based on METIS)
* cholmod_metis_bisector direct interface to METIS_NodeComputeSeparator
*
* Requires the Core and Cholesky modules, and three packages: METIS, CAMD,
* and CCOLAMD. Optionally used by the Cholesky module.
*
- * Note that METIS does not have a version that uses UF_long integers. If you
- * try to use cholmod_nested_dissection, cholmod_metis, cholmod_bisect, or
- * cholmod_metis_bisector on a matrix that is too large, an error code will be
- * returned. METIS does have an "idxtype", which could be redefined as UF_long,
- * if you wish to edit METIS or use compile-time flags to redefine idxtype.
+ * Note that METIS does not have a version that uses SuiteSparse_long integers.
+ * If you try to use cholmod_nested_dissection, cholmod_metis, cholmod_bisect,
+ * or cholmod_metis_bisector on a matrix that is too large, an error code will
+ * be returned. METIS does have an "idxtype", which could be redefined as
+ * SuiteSparse_long, if you wish to edit METIS or use compile-time flags to
+ * redefine idxtype.
*/
#ifndef CHOLMOD_PARTITION_H
#define CHOLMOD_PARTITION_H
#include "cholmod_core.h"
+#include "cholmod_camd.h"
/* -------------------------------------------------------------------------- */
/* cholmod_nested_dissection */
@@ -51,7 +50,7 @@
* finds better orderings than METIS_NodeND, but takes longer.
*/
-UF_long cholmod_nested_dissection /* returns # of components */
+SuiteSparse_long cholmod_nested_dissection /* returns # of components */
(
/* ---- input ---- */
cholmod_sparse *A, /* matrix to order */
@@ -68,8 +67,9 @@ UF_long cholmod_nested_dissection /* returns # of components */
cholmod_common *Common
) ;
-UF_long cholmod_l_nested_dissection (cholmod_sparse *, UF_long *, size_t,
- UF_long *, UF_long *, UF_long *, cholmod_common *) ;
+SuiteSparse_long cholmod_l_nested_dissection (cholmod_sparse *,
+ SuiteSparse_long *, size_t, SuiteSparse_long *, SuiteSparse_long *,
+ SuiteSparse_long *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_metis */
@@ -90,76 +90,8 @@ int cholmod_metis
cholmod_common *Common
) ;
-int cholmod_l_metis (cholmod_sparse *, UF_long *, size_t, int, UF_long *,
- cholmod_common *) ;
-
-/* -------------------------------------------------------------------------- */
-/* cholmod_ccolamd */
-/* -------------------------------------------------------------------------- */
-
-/* Order AA' or A(:,f)*A(:,f)' using CCOLAMD. */
-
-int cholmod_ccolamd
-(
- /* ---- input ---- */
- cholmod_sparse *A, /* matrix to order */
- int *fset, /* subset of 0:(A->ncol)-1 */
- size_t fsize, /* size of fset */
- int *Cmember, /* size A->nrow. Cmember [i] = c if row i is in the
- * constraint set c. c must be >= 0. The # of
- * constraint sets is max (Cmember) + 1. If Cmember is
- * NULL, then it is interpretted as Cmember [i] = 0 for
- * all i */
- /* ---- output --- */
- int *Perm, /* size A->nrow, output permutation */
- /* --------------- */
- cholmod_common *Common
-) ;
-
-int cholmod_l_ccolamd (cholmod_sparse *, UF_long *, size_t, UF_long *,
- UF_long *, cholmod_common *) ;
-
-/* -------------------------------------------------------------------------- */
-/* cholmod_csymamd */
-/* -------------------------------------------------------------------------- */
-
-/* Order A using CSYMAMD. */
-
-int cholmod_csymamd
-(
- /* ---- input ---- */
- cholmod_sparse *A, /* matrix to order */
- /* ---- output --- */
- int *Cmember, /* size nrow. see cholmod_ccolamd above */
- int *Perm, /* size A->nrow, output permutation */
- /* --------------- */
- cholmod_common *Common
-) ;
-
-int cholmod_l_csymamd (cholmod_sparse *, UF_long *, UF_long *,
- cholmod_common *) ;
-
-/* -------------------------------------------------------------------------- */
-/* cholmod_camd */
-/* -------------------------------------------------------------------------- */
-
-/* Order A using CAMD. */
-
-int cholmod_camd
-(
- /* ---- input ---- */
- cholmod_sparse *A, /* matrix to order */
- int *fset, /* subset of 0:(A->ncol)-1 */
- size_t fsize, /* size of fset */
- /* ---- output --- */
- int *Cmember, /* size nrow. see cholmod_ccolamd above */
- int *Perm, /* size A->nrow, output permutation */
- /* --------------- */
- cholmod_common *Common
-) ;
-
-int cholmod_l_camd (cholmod_sparse *, UF_long *, size_t, UF_long *, UF_long *,
- cholmod_common *) ;
+int cholmod_l_metis (cholmod_sparse *, SuiteSparse_long *, size_t, int,
+ SuiteSparse_long *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_bisect */
@@ -167,7 +99,7 @@ int cholmod_l_camd (cholmod_sparse *, UF_long *, size_t, UF_long *, UF_long *,
/* Finds a node bisector of A, A*A', A(:,f)*A(:,f)'. */
-UF_long cholmod_bisect /* returns # of nodes in separator */
+SuiteSparse_long cholmod_bisect /* returns # of nodes in separator */
(
/* ---- input ---- */
cholmod_sparse *A, /* matrix to bisect */
@@ -182,8 +114,8 @@ UF_long cholmod_bisect /* returns # of nodes in separator */
cholmod_common *Common
) ;
-UF_long cholmod_l_bisect (cholmod_sparse *, UF_long *, size_t, int, UF_long *,
- cholmod_common *) ;
+SuiteSparse_long cholmod_l_bisect (cholmod_sparse *, SuiteSparse_long *,
+ size_t, int, SuiteSparse_long *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_metis_bisector */
@@ -192,7 +124,7 @@ UF_long cholmod_l_bisect (cholmod_sparse *, UF_long *, size_t, int, UF_long *,
/* Find a set of nodes that bisects the graph of A or AA' (direct interface
* to METIS_NodeComputeSeparator). */
-UF_long cholmod_metis_bisector /* returns separator size */
+SuiteSparse_long cholmod_metis_bisector /* returns separator size */
(
/* ---- input ---- */
cholmod_sparse *A, /* matrix to bisect */
@@ -204,8 +136,9 @@ UF_long cholmod_metis_bisector /* returns separator size */
cholmod_common *Common
) ;
-UF_long cholmod_l_metis_bisector (cholmod_sparse *, UF_long *, UF_long *,
- UF_long *, cholmod_common *) ;
+SuiteSparse_long cholmod_l_metis_bisector (cholmod_sparse *,
+ SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *,
+ cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_collapse_septree */
@@ -213,7 +146,7 @@ UF_long cholmod_l_metis_bisector (cholmod_sparse *, UF_long *, UF_long *,
/* Collapse nodes in a separator tree. */
-UF_long cholmod_collapse_septree
+SuiteSparse_long cholmod_collapse_septree
(
/* ---- input ---- */
size_t n, /* # of nodes in the graph */
@@ -227,7 +160,7 @@ UF_long cholmod_collapse_septree
cholmod_common *Common
) ;
-UF_long cholmod_l_collapse_septree (size_t, size_t, double, size_t, UF_long *,
- UF_long *, cholmod_common *) ;
+SuiteSparse_long cholmod_l_collapse_septree (size_t, size_t, double, size_t,
+ SuiteSparse_long *, SuiteSparse_long *, cholmod_common *) ;
#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_supernodal.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_supernodal.h
index 1a49973..36efa97 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_supernodal.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_supernodal.h
@@ -8,7 +8,7 @@
* CHOLMOD/Include/cholmod_supernodal.h is licensed under Version 2.0 of the GNU
* General Public License. See gpl.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* CHOLMOD Supernodal module.
@@ -71,21 +71,21 @@ int cholmod_super_symbolic
cholmod_common *Common
) ;
-int cholmod_l_super_symbolic (cholmod_sparse *, cholmod_sparse *, UF_long *,
- cholmod_factor *, cholmod_common *) ;
+int cholmod_l_super_symbolic (cholmod_sparse *, cholmod_sparse *,
+ SuiteSparse_long *, cholmod_factor *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_super_symbolic2 */
/* -------------------------------------------------------------------------- */
-/* Analyze for supernodal Cholesky or multifrontal QR. CHOLMOD itself always
- * analyzes for supernodal Cholesky, of course. This "for_cholesky = TRUE"
- * option is used by SuiteSparseQR only. Added for V1.7 */
+/* Analyze for supernodal Cholesky or multifrontal QR */
int cholmod_super_symbolic2
(
/* ---- input ---- */
- int for_cholesky, /* Cholesky if TRUE, QR if FALSE */
+ int for_whom, /* FOR_SPQR (0): for SPQR but not GPU-accelerated
+ FOR_CHOLESKY (1): for Cholesky (GPU or not)
+ FOR_SPQRGPU (2): for SPQR with GPU acceleration */
cholmod_sparse *A, /* matrix to analyze */
cholmod_sparse *F, /* F = A' or A(:,f)' */
int *Parent, /* elimination tree */
@@ -97,7 +97,7 @@ int cholmod_super_symbolic2
) ;
int cholmod_l_super_symbolic2 (int, cholmod_sparse *, cholmod_sparse *,
- UF_long *, cholmod_factor *, cholmod_common *) ;
+ SuiteSparse_long *, cholmod_factor *, cholmod_common *) ;
/* -------------------------------------------------------------------------- */
/* cholmod_super_numeric */
diff --git a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_template.h b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_template.h
index aa45b4d..5623a38 100644
--- a/src/C/SuiteSparse/CHOLMOD/Include/cholmod_template.h
+++ b/src/C/SuiteSparse/CHOLMOD/Include/cholmod_template.h
@@ -7,6 +7,7 @@
/* -------------------------------------------------------------------------- */
#undef TEMPLATE
+#undef TEMPLATE2
#undef XTYPE
#undef XTYPE2
#undef XTYPE_OK
@@ -53,6 +54,7 @@
#define PREFIX p_
#define TEMPLATE(name) P_TEMPLATE(name)
+#define TEMPLATE2(name) P_TEMPLATE(name)
#define XTYPE CHOLMOD_PATTERN
#define XTYPE2 CHOLMOD_REAL
#define XTYPE_OK(type) (TRUE)
@@ -96,6 +98,7 @@
#define PREFIX r_
#define TEMPLATE(name) R_TEMPLATE(name)
+#define TEMPLATE2(name) R_TEMPLATE(name)
#define XTYPE CHOLMOD_REAL
#define XTYPE2 CHOLMOD_REAL
#define XTYPE_OK(type) R_XTYPE_OK(type)
@@ -143,8 +146,10 @@
#ifdef NCONJUGATE
#define TEMPLATE(name) CT_TEMPLATE(name)
+#define TEMPLATE2(name) CT_TEMPLATE(name)
#else
#define TEMPLATE(name) C_TEMPLATE(name)
+#define TEMPLATE2(name) C_TEMPLATE(name)
#endif
#define ASSEMBLE(x,z,p,ax,az,q) C_ASSEMBLE(x,z,p,ax,az,q)
@@ -194,8 +199,10 @@
#ifdef NCONJUGATE
#define TEMPLATE(name) ZT_TEMPLATE(name)
+#define TEMPLATE2(name) CT_TEMPLATE(name)
#else
#define TEMPLATE(name) Z_TEMPLATE(name)
+#define TEMPLATE2(name) C_TEMPLATE(name)
#endif
#define ASSEMBLE(x,z,p,ax,az,q) Z_ASSEMBLE(x,z,p,ax,az,q)
diff --git a/src/C/SuiteSparse/CHOLMOD/Lib/Makefile b/src/C/SuiteSparse/CHOLMOD/Lib/Makefile
index 7d736d3..3893d39 100644
--- a/src/C/SuiteSparse/CHOLMOD/Lib/Makefile
+++ b/src/C/SuiteSparse/CHOLMOD/Lib/Makefile
@@ -6,9 +6,49 @@ default: all
ccode: all
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
-C = $(CC) $(CFLAGS) $(CHOLMOD_CONFIG)
+#-------------------------------------------------------------------------------
+# the optional Partition module requires METIS, CAMD, and CCOLAMD.
+# CAMD and CCOLAMD can be installed without METIS, but are optional.
+I_WITH_PARTITION =
+LIB_WITH_PARTITION =
+CONFIG = -DNPARTITION -DNCAMD
+# check if CAMD/CCOLAMD and METIS are requested and available
+ifeq (,$(findstring -DNCAMD, $(CHOLMOD_CONFIG)))
+ # CAMD and CCOLAMD are requested. See if they are available
+ ifeq (../../CAMD, $(wildcard ../../CAMD))
+ ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
+ # CAMD and CCOLAMD are requested and available
+ LIB_WITH_PARTITION = \
+ ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a
+ I_WITH_PARTITION = \
+ -I../../CCOLAMD/Include -I../../CAMD/Include
+ CONFIG = -DNPARTITION
+ # check if METIS is requested and available
+ ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+ # METIS is requested. See if it is available
+ ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH)))
+ # METIS is available
+ LIB_WITH_PARTITION = $(METIS) \
+ ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a
+ I_WITH_PARTITION = -I$(METIS_PATH)/Lib \
+ -I../../CCOLAMD/Include -I../../CAMD/Include
+ CONFIG =
+ endif
+ endif
+ endif
+ endif
+endif
+
+#-------------------------------------------------------------------------------
+
+I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
+ $(I_WITH_PARTITION) -I../Include -I../../SuiteSparse_config
+
+#-------------------------------------------------------------------------------
+
+C = $(CC) $(CF) $(CHOLMOD_CONFIG) $(CONFIG)
all: libcholmod.a
@@ -38,7 +78,8 @@ INC = ../Include/cholmod.h \
../Include/cholmod_modify.h \
../Include/cholmod_partition.h \
../Include/cholmod_supernodal.h \
- ../Include/cholmod_template.h
+ ../Include/cholmod_template.h \
+ ../Include/cholmod_gpu.h
#-------------------------------------------------------------------------------
# The 7 CHOLMOD library modules (int, double)
@@ -48,7 +89,8 @@ CORE = cholmod_aat.o cholmod_add.o cholmod_band.o \
cholmod_change_factor.o cholmod_common.o cholmod_complex.o \
cholmod_copy.o cholmod_dense.o cholmod_error.o cholmod_factor.o \
cholmod_memory.o cholmod_sparse.o \
- cholmod_transpose.o cholmod_triplet.o
+ cholmod_transpose.o cholmod_triplet.o \
+ cholmod_version.o
CHECK = cholmod_check.o cholmod_read.o cholmod_write.o
@@ -69,8 +111,14 @@ MODIFY = cholmod_rowadd.o cholmod_rowdel.o cholmod_updown.o
SUPERNODAL = cholmod_super_numeric.o cholmod_super_solve.o \
cholmod_super_symbolic.o
+ifneq ($(GPU_CONFIG),)
+GPU = cholmod_gpu.o cholmod_gpu_kernels.o
+else
+GPU =
+endif
+
DI = $(CORE) $(CHECK) $(CHOLESKY) $(MATRIXOPS) $(MODIFY) $(SUPERNODAL) \
- $(PARTITION)
+ $(GPU) $(PARTITION)
#-------------------------------------------------------------------------------
# CHOLMOD library modules (long, double)
@@ -80,7 +128,8 @@ LCORE = cholmod_l_aat.o cholmod_l_add.o cholmod_l_band.o \
cholmod_l_change_factor.o cholmod_l_common.o cholmod_l_complex.o \
cholmod_l_copy.o cholmod_l_dense.o cholmod_l_error.o \
cholmod_l_factor.o cholmod_l_memory.o \
- cholmod_l_sparse.o cholmod_l_transpose.o cholmod_l_triplet.o
+ cholmod_l_sparse.o cholmod_l_transpose.o cholmod_l_triplet.o \
+ cholmod_l_version.o
LCHECK = cholmod_l_check.o cholmod_l_read.o cholmod_l_write.o
@@ -101,8 +150,14 @@ LMODIFY = cholmod_l_rowadd.o cholmod_l_rowdel.o cholmod_l_updown.o
LSUPERNODAL = cholmod_l_super_numeric.o cholmod_l_super_solve.o \
cholmod_l_super_symbolic.o
+ifneq ($(GPU_CONFIG),)
+LGPU = cholmod_l_gpu.o cholmod_gpu_kernels.o
+else
+LGPU =
+endif
+
DL = $(LCORE) $(LCHECK) $(LCHOLESKY) $(LMATRIXOPS) $(LMODIFY) $(LSUPERNODAL) \
- $(LPARTITION)
+ $(LPARTITION) $(LGPU)
#-------------------------------------------------------------------------------
@@ -110,15 +165,11 @@ DL = $(LCORE) $(LCHECK) $(LCHOLESKY) $(LMATRIXOPS) $(LMODIFY) $(LSUPERNODAL) \
OBJ = $(DI) $(DL)
libcholmod.a: $(OBJ)
- $(AR) libcholmod.a $(OBJ)
- $(RANLIB) libcholmod.a
+ $(ARCHIVE) libcholmod.a $(OBJ)
+ - $(RANLIB) libcholmod.a
$(OBJ): $(INC)
-I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
- -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \
- -I../Include -I../../UFconfig
-
#-------------------------------------------------------------------------------
# Check Module:
#-------------------------------------------------------------------------------
@@ -191,6 +242,9 @@ cholmod_aat.o: ../Core/cholmod_aat.c
cholmod_add.o: ../Core/cholmod_add.c
$(C) -c $(I) $<
+cholmod_version.o: ../Core/cholmod_version.c
+ $(C) -c $(I) $<
+
#-------------------------------------------------------------------------------
cholmod_l_common.o: ../Core/cholmod_common.c
@@ -236,6 +290,9 @@ cholmod_l_aat.o: ../Core/cholmod_aat.c
cholmod_l_add.o: ../Core/cholmod_add.c
$(C) -DDLONG -c $(I) $< -o $@
+cholmod_l_version.o: ../Core/cholmod_version.c
+ $(C) -DDLONG -c $(I) $< -o $@
+
#-------------------------------------------------------------------------------
# Cholesky Module:
@@ -448,6 +505,7 @@ cholmod_l_updown.o: ../Modify/cholmod_updown.c \
#-------------------------------------------------------------------------------
cholmod_super_numeric.o: ../Supernodal/cholmod_super_numeric.c \
+ ../GPU/t_cholmod_gpu.c \
../Supernodal/t_cholmod_super_numeric.c
$(C) -c $(I) $<
@@ -470,3 +528,17 @@ cholmod_l_super_symbolic.o: ../Supernodal/cholmod_super_symbolic.c
cholmod_l_super_solve.o: ../Supernodal/cholmod_super_solve.c \
../Supernodal/t_cholmod_super_solve.c
$(C) -DDLONG -c $(I) $< -o $@
+
+#-------------------------------------------------------------------------------
+# GPU module
+#-------------------------------------------------------------------------------
+
+cholmod_gpu_kernels.o: ../GPU/cholmod_gpu_kernels.cu
+ $(NVCC) -I../../SuiteSparse_config -Xcompiler -fPIC -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -c ../GPU/cholmod_gpu_kernels.cu
+
+cholmod_gpu.o: ../GPU/cholmod_gpu.c
+ $(C) -c $(I) $<
+
+cholmod_l_gpu.o: ../GPU/cholmod_gpu.c
+ $(C) -DDLONG -c $(I) $< -o $@
+
diff --git a/src/C/SuiteSparse/CHOLMOD/Makefile b/src/C/SuiteSparse/CHOLMOD/Makefile
index 62595b7..f5b82ec 100644
--- a/src/C/SuiteSparse/CHOLMOD/Makefile
+++ b/src/C/SuiteSparse/CHOLMOD/Makefile
@@ -2,16 +2,18 @@
# CHOLMOD Makefile
#-------------------------------------------------------------------------------
+VERSION = 3.0.6
+
# Note: If you do not have METIS, or do not wish to use it in CHOLMOD, you must
-# compile CHOLMOD with the -DNPARTITION flag. See ../UFconfig/UFconfig.mk.
+# compile CHOLMOD with the -DNPARTITION flag.
+# See ../SuiteSparse_config/SuiteSparse_config.mk .
default: all
-include ../UFconfig/UFconfig.mk
+include ../SuiteSparse_config/SuiteSparse_config.mk
# Compile the C-callable libraries and the Demo programs.
all:
- ( cd Lib ; $(MAKE) )
( cd Demo ; $(MAKE) )
# Compile the C-callable libraries only.
@@ -20,40 +22,54 @@ library:
# Remove all files not in the original distribution
purge:
- ( cd MATLAB ; $(MAKE) purge )
( cd Tcov ; $(MAKE) purge )
( cd Lib ; $(MAKE) purge )
( cd Valgrind ; $(MAKE) dopurge )
( cd Demo ; $(MAKE) purge )
( cd Doc ; $(MAKE) purge )
+ ( cd MATLAB ; $(RM) $(CLEAN) rename.h *.mex* )
# Remove all files not in the original distribution, except keep the
# compiled libraries.
clean:
- ( cd MATLAB ; $(MAKE) clean )
( cd Tcov ; $(MAKE) clean )
( cd Lib ; $(MAKE) clean )
( cd Valgrind ; $(MAKE) clean )
( cd Demo ; $(MAKE) clean )
+ ( cd MATLAB ; $(RM) $(CLEAN) )
distclean: purge
ccode: all
-# Compile the MATLAB mexFunctions (you can also use cholmod_make.m in MATLAB)
-mex:
- ( cd MATLAB ; $(MAKE) )
-
# Run the test coverage suite. Takes about 40 minutes on a 3.2GHz Pentium.
# Requires Linux (gcc, gcov).
cov:
- ( cd Tcov ; $(MAKE) go )
+ ( cd Tcov ; $(MAKE) )
# Run the test coverage suite using Valgrind. This takes a *** long *** time.
valgrind:
( cd Valgrind ; $(MAKE) )
# Compile the C-callable libraries and the Demo programs.
-demo:
+demos:
( cd Demo ; $(MAKE) )
+# create PDF documents for the original distribution
+docs:
+ ( cd Doc ; $(MAKE) )
+
+# install CHOLMOD
+install:
+ $(CP) Lib/libcholmod.a $(INSTALL_LIB)/libcholmod.$(VERSION).a
+ ( cd $(INSTALL_LIB) ; ln -sf libcholmod.$(VERSION).a libcholmod.a )
+ $(CP) Include/cholmod*.h $(INSTALL_INCLUDE)
+ $(RM) $(INSTALL_INCLUDE)/cholmod_internal.h
+ chmod 644 $(INSTALL_LIB)/libcholmod*.a
+ chmod 644 $(INSTALL_INCLUDE)/cholmod*.h
+
+# uninstall CHOLMOD
+uninstall:
+ $(RM) $(INSTALL_LIB)/libcholmod*.a
+ $(RM) $(INSTALL_INCLUDE)/cholmod*.h
+
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/License.txt b/src/C/SuiteSparse/CHOLMOD/MatrixOps/License.txt
new file mode 100644
index 0000000..8c23f46
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/License.txt
@@ -0,0 +1,25 @@
+CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006,
+Timothy A. Davis
+CHOLMOD is also available under other licenses; contact authors for details.
+http://www.suitesparse.com
+
+Note that this license is for the CHOLMOD/MatrixOps module only.
+All CHOLMOD modules are licensed separately.
+
+
+--------------------------------------------------------------------------------
+
+
+This Module is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This Module is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this Module; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_drop.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_drop.c
new file mode 100644
index 0000000..de0ce8a
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_drop.c
@@ -0,0 +1,185 @@
+/* ========================================================================== */
+/* === MatrixOps/cholmod_drop =============================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* Drop small entries from A, and entries in the ignored part of A if A
+ * is symmetric. None of the matrix operations drop small numerical entries
+ * from a matrix, except for this one. NaN's and Inf's are kept.
+ *
+ * workspace: none
+ *
+ * Supports pattern and real matrices, complex and zomplex not supported.
+ */
+
+#ifndef NGPL
+#ifndef NMATRIXOPS
+
+#include "cholmod_internal.h"
+#include "cholmod_matrixops.h"
+
+
+/* ========================================================================== */
+/* === cholmod_drop ========================================================= */
+/* ========================================================================== */
+
+int CHOLMOD(drop)
+(
+ /* ---- input ---- */
+ double tol, /* keep entries with absolute value > tol */
+ /* ---- in/out --- */
+ cholmod_sparse *A, /* matrix to drop entries from */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double aij ;
+ double *Ax ;
+ Int *Ap, *Ai, *Anz ;
+ Int packed, i, j, nrow, ncol, p, pend, nz, values ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (FALSE) ;
+ RETURN_IF_NULL (A, FALSE) ;
+ RETURN_IF_XTYPE_INVALID (A, CHOLMOD_PATTERN, CHOLMOD_REAL, FALSE) ;
+ Common->status = CHOLMOD_OK ;
+ ASSERT (CHOLMOD(dump_sparse) (A, "A predrop", Common) >= 0) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+ Ap = A->p ;
+ Ai = A->i ;
+ Ax = A->x ;
+ Anz = A->nz ;
+ packed = A->packed ;
+ ncol = A->ncol ;
+ nrow = A->nrow ;
+ values = (A->xtype != CHOLMOD_PATTERN) ;
+ nz = 0 ;
+
+ if (values)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* drop small numerical entries from A, and entries in ignored part */
+ /* ------------------------------------------------------------------ */
+
+ if (A->stype > 0)
+ {
+
+ /* -------------------------------------------------------------- */
+ /* A is symmetric, with just upper triangular part stored */
+ /* -------------------------------------------------------------- */
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ Ap [j] = nz ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ aij = Ax [p] ;
+ if (i <= j && (fabs (aij) > tol || IS_NAN (aij)))
+ {
+ Ai [nz] = i ;
+ Ax [nz] = aij ;
+ nz++ ;
+ }
+ }
+ }
+
+ }
+ else if (A->stype < 0)
+ {
+
+ /* -------------------------------------------------------------- */
+ /* A is symmetric, with just lower triangular part stored */
+ /* -------------------------------------------------------------- */
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ Ap [j] = nz ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ aij = Ax [p] ;
+ if (i >= j && (fabs (aij) > tol || IS_NAN (aij)))
+ {
+ Ai [nz] = i ;
+ Ax [nz] = aij ;
+ nz++ ;
+ }
+ }
+ }
+ }
+ else
+ {
+
+ /* -------------------------------------------------------------- */
+ /* both parts of A present, just drop small entries */
+ /* -------------------------------------------------------------- */
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ Ap [j] = nz ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ aij = Ax [p] ;
+ if (fabs (aij) > tol || IS_NAN (aij))
+ {
+ Ai [nz] = i ;
+ Ax [nz] = aij ;
+ nz++ ;
+ }
+ }
+ }
+ }
+ Ap [ncol] = nz ;
+
+ /* reduce A->i and A->x in size */
+ ASSERT (MAX (1,nz) <= A->nzmax) ;
+ CHOLMOD(reallocate_sparse) (nz, A, Common) ;
+ ASSERT (Common->status >= CHOLMOD_OK) ;
+
+ }
+ else
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* consider only the pattern of A */
+ /* ------------------------------------------------------------------ */
+
+ /* Note that cholmod_band_inplace calls cholmod_reallocate_sparse */
+ if (A->stype > 0)
+ {
+ CHOLMOD(band_inplace) (0, ncol, 0, A, Common) ;
+ }
+ else if (A->stype < 0)
+ {
+ CHOLMOD(band_inplace) (-nrow, 0, 0, A, Common) ;
+ }
+ }
+
+ ASSERT (CHOLMOD(dump_sparse) (A, "A dropped", Common) >= 0) ;
+ return (TRUE) ;
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_horzcat.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_horzcat.c
new file mode 100644
index 0000000..b57961b
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_horzcat.c
@@ -0,0 +1,205 @@
+/* ========================================================================== */
+/* === MatrixOps/cholmod_horzcat ============================================ */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* Horizontal concatenation, C = [A , B] in MATLAB notation.
+ *
+ * A and B can be up/lo/unsym; C is unsymmetric and packed.
+ * A and B must have the same number of rows.
+ * C is sorted if both A and B are sorted.
+ *
+ * workspace: Iwork (max (A->nrow, A->ncol, B->nrow, B->ncol)).
+ * allocates temporary copies of A and B if they are symmetric.
+ *
+ * A and B must have the same numeric xtype, unless values is FALSE.
+ * A and B cannot be complex or zomplex, unless values is FALSE.
+ */
+
+#ifndef NGPL
+#ifndef NMATRIXOPS
+
+#include "cholmod_internal.h"
+#include "cholmod_matrixops.h"
+
+
+/* ========================================================================== */
+/* === cholmod_horzcat ====================================================== */
+/* ========================================================================== */
+
+cholmod_sparse *CHOLMOD(horzcat)
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* left matrix to concatenate */
+ cholmod_sparse *B, /* right matrix to concatenate */
+ int values, /* if TRUE compute the numerical values of C */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double *Ax, *Bx, *Cx ;
+ Int *Ap, *Ai, *Anz, *Bp, *Bi, *Bnz, *Cp, *Ci ;
+ cholmod_sparse *C, *A2, *B2 ;
+ Int apacked, bpacked, ancol, bncol, ncol, nrow, anz, bnz, nz, j, p, pend,
+ pdest ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (NULL) ;
+ RETURN_IF_NULL (A, NULL) ;
+ RETURN_IF_NULL (B, NULL) ;
+ values = values &&
+ (A->xtype != CHOLMOD_PATTERN) && (B->xtype != CHOLMOD_PATTERN) ;
+ RETURN_IF_XTYPE_INVALID (A, CHOLMOD_PATTERN,
+ values ? CHOLMOD_REAL : CHOLMOD_ZOMPLEX, NULL) ;
+ RETURN_IF_XTYPE_INVALID (B, CHOLMOD_PATTERN,
+ values ? CHOLMOD_REAL : CHOLMOD_ZOMPLEX, NULL) ;
+ if (A->nrow != B->nrow)
+ {
+ /* A and B must have the same number of rows */
+ ERROR (CHOLMOD_INVALID, "A and B must have same # rows") ;
+ return (NULL) ;
+ }
+ /* A and B must have the same numerical type if values is TRUE (both must
+ * be CHOLMOD_REAL, this is implicitly checked above) */
+
+ Common->status = CHOLMOD_OK ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate workspace */
+ /* ---------------------------------------------------------------------- */
+
+ ancol = A->ncol ;
+ bncol = B->ncol ;
+ nrow = A->nrow ;
+ CHOLMOD(allocate_work) (0, MAX3 (nrow, ancol, bncol), 0, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (NULL) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+ /* convert A to unsymmetric, if necessary */
+ A2 = NULL ;
+ if (A->stype != 0)
+ {
+ /* workspace: Iwork (max (A->nrow,A->ncol)) */
+ A2 = CHOLMOD(copy) (A, 0, values, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (NULL) ;
+ }
+ A = A2 ;
+ }
+
+ /* convert B to unsymmetric, if necessary */
+ B2 = NULL ;
+ if (B->stype != 0)
+ {
+ /* workspace: Iwork (max (B->nrow,B->ncol)) */
+ B2 = CHOLMOD(copy) (B, 0, values, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ return (NULL) ;
+ }
+ B = B2 ;
+ }
+
+ Ap = A->p ;
+ Anz = A->nz ;
+ Ai = A->i ;
+ Ax = A->x ;
+ apacked = A->packed ;
+
+ Bp = B->p ;
+ Bnz = B->nz ;
+ Bi = B->i ;
+ Bx = B->x ;
+ bpacked = B->packed ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate C */
+ /* ---------------------------------------------------------------------- */
+
+ anz = CHOLMOD(nnz) (A, Common) ;
+ bnz = CHOLMOD(nnz) (B, Common) ;
+ ncol = ancol + bncol ;
+ nz = anz + bnz ;
+
+ C = CHOLMOD(allocate_sparse) (nrow, ncol, nz, A->sorted && B->sorted, TRUE,
+ 0, values ? A->xtype : CHOLMOD_PATTERN, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ return (NULL) ;
+ }
+ Cp = C->p ;
+ Ci = C->i ;
+ Cx = C->x ;
+
+ /* ---------------------------------------------------------------------- */
+ /* C = [A , B] */
+ /* ---------------------------------------------------------------------- */
+
+ pdest = 0 ;
+
+ /* copy A as the first A->ncol columns of C */
+ for (j = 0 ; j < ancol ; j++)
+ {
+ /* A(:,j) is the jth column of C */
+ p = Ap [j] ;
+ pend = (apacked) ? (Ap [j+1]) : (p + Anz [j]) ;
+ Cp [j] = pdest ;
+ for ( ; p < pend ; p++)
+ {
+ Ci [pdest] = Ai [p] ;
+ if (values) Cx [pdest] = Ax [p] ;
+ pdest++ ;
+ }
+ }
+
+ /* copy B as the next B->ncol columns of C */
+ for (j = 0 ; j < bncol ; j++)
+ {
+ /* B(:,j) is the (ancol+j)th column of C */
+ p = Bp [j] ;
+ pend = (bpacked) ? (Bp [j+1]) : (p + Bnz [j]) ;
+ Cp [ancol + j] = pdest ;
+ for ( ; p < pend ; p++)
+ {
+ Ci [pdest] = Bi [p] ;
+ if (values) Cx [pdest] = Bx [p] ;
+ pdest++ ;
+ }
+ }
+ Cp [ncol] = pdest ;
+ ASSERT (pdest == anz + bnz) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* free the unsymmetric copies of A and B, and return C */
+ /* ---------------------------------------------------------------------- */
+
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ return (C) ;
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_norm.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_norm.c
new file mode 100644
index 0000000..4864853
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_norm.c
@@ -0,0 +1,454 @@
+/* ========================================================================== */
+/* === MatrixOps/cholmod_norm =============================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* r = norm (A), compute the infinity-norm, 1-norm, or 2-norm of a sparse or
+ * dense matrix. Can compute the 2-norm only for a dense column vector.
+ * Returns -1 if an error occurs.
+ *
+ * Pattern, real, complex, and zomplex sparse matrices are supported.
+ */
+
+#ifndef NGPL
+#ifndef NMATRIXOPS
+
+#include "cholmod_internal.h"
+#include "cholmod_matrixops.h"
+
+
+/* ========================================================================== */
+/* === abs_value ============================================================ */
+/* ========================================================================== */
+
+/* Compute the absolute value of a real, complex, or zomplex value */
+
+static double abs_value
+(
+ int xtype,
+ double *Ax,
+ double *Az,
+ Int p,
+ cholmod_common *Common
+)
+{
+ double s = 0 ;
+ switch (xtype)
+ {
+ case CHOLMOD_PATTERN:
+ s = 1 ;
+ break ;
+
+ case CHOLMOD_REAL:
+ s = fabs (Ax [p]) ;
+ break ;
+
+ case CHOLMOD_COMPLEX:
+ s = SuiteSparse_config.hypot_func (Ax [2*p], Ax [2*p+1]) ;
+ break ;
+
+ case CHOLMOD_ZOMPLEX:
+ s = SuiteSparse_config.hypot_func (Ax [p], Az [p]) ;
+ break ;
+ }
+ return (s) ;
+}
+
+
+/* ========================================================================== */
+/* === cholmod_norm_dense =================================================== */
+/* ========================================================================== */
+
+double CHOLMOD(norm_dense)
+(
+ /* ---- input ---- */
+ cholmod_dense *X, /* matrix to compute the norm of */
+ int norm, /* type of norm: 0: inf. norm, 1: 1-norm, 2: 2-norm */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double xnorm, s, x, z ;
+ double *Xx, *Xz, *W ;
+ Int nrow, ncol, d, i, j, use_workspace, xtype ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (EMPTY) ;
+ RETURN_IF_NULL (X, EMPTY) ;
+ RETURN_IF_XTYPE_INVALID (X, CHOLMOD_REAL, CHOLMOD_ZOMPLEX, EMPTY) ;
+ Common->status = CHOLMOD_OK ;
+ ncol = X->ncol ;
+ if (norm < 0 || norm > 2 || (norm == 2 && ncol > 1))
+ {
+ ERROR (CHOLMOD_INVALID, "invalid norm") ;
+ return (EMPTY) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+ nrow = X->nrow ;
+ d = X->d ;
+ Xx = X->x ;
+ Xz = X->z ;
+ xtype = X->xtype ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate workspace, if needed */
+ /* ---------------------------------------------------------------------- */
+
+ W = NULL ;
+ use_workspace = (norm == 0 && ncol > 4) ;
+ if (use_workspace)
+ {
+ CHOLMOD(allocate_work) (0, 0, nrow, Common) ;
+ W = Common->Xwork ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* oops, no workspace */
+ use_workspace = FALSE ;
+ }
+ }
+
+
+ /* ---------------------------------------------------------------------- */
+ /* compute the norm */
+ /* ---------------------------------------------------------------------- */
+
+ xnorm = 0 ;
+
+ if (use_workspace)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* infinity-norm = max row sum, using stride-1 access of X */
+ /* ------------------------------------------------------------------ */
+
+ DEBUG (for (i = 0 ; i < nrow ; i++) ASSERT (W [i] == 0)) ;
+
+ /* this is faster than stride-d, but requires O(nrow) workspace */
+ for (j = 0 ; j < ncol ; j++)
+ {
+ for (i = 0 ; i < nrow ; i++)
+ {
+ W [i] += abs_value (xtype, Xx, Xz, i+j*d, Common) ;
+ }
+ }
+ for (i = 0 ; i < nrow ; i++)
+ {
+ s = W [i] ;
+ if ((IS_NAN (s) || s > xnorm) && !IS_NAN (xnorm))
+ {
+ xnorm = s ;
+ }
+ W [i] = 0 ;
+ }
+
+ }
+ else if (norm == 0)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* infinity-norm = max row sum, using stride-d access of X */
+ /* ------------------------------------------------------------------ */
+
+ for (i = 0 ; i < nrow ; i++)
+ {
+ s = 0 ;
+ for (j = 0 ; j < ncol ; j++)
+ {
+ s += abs_value (xtype, Xx, Xz, i+j*d, Common) ;
+ }
+ if ((IS_NAN (s) || s > xnorm) && !IS_NAN (xnorm))
+ {
+ xnorm = s ;
+ }
+ }
+
+ }
+ else if (norm == 1)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* 1-norm = max column sum */
+ /* ------------------------------------------------------------------ */
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ s = 0 ;
+ for (i = 0 ; i < nrow ; i++)
+ {
+ s += abs_value (xtype, Xx, Xz, i+j*d, Common) ;
+ }
+ if ((IS_NAN (s) || s > xnorm) && !IS_NAN (xnorm))
+ {
+ xnorm = s ;
+ }
+ }
+ }
+ else
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* 2-norm = sqrt (sum (X.^2)) */
+ /* ------------------------------------------------------------------ */
+
+ switch (xtype)
+ {
+
+ case CHOLMOD_REAL:
+ for (i = 0 ; i < nrow ; i++)
+ {
+ x = Xx [i] ;
+ xnorm += x*x ;
+ }
+ break ;
+
+ case CHOLMOD_COMPLEX:
+ for (i = 0 ; i < nrow ; i++)
+ {
+ x = Xx [2*i ] ;
+ z = Xx [2*i+1] ;
+ xnorm += x*x + z*z ;
+ }
+ break ;
+
+ case CHOLMOD_ZOMPLEX:
+ for (i = 0 ; i < nrow ; i++)
+ {
+ x = Xx [i] ;
+ z = Xz [i] ;
+ xnorm += x*x + z*z ;
+ }
+ break ;
+ }
+
+ xnorm = sqrt (xnorm) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* return result */
+ /* ---------------------------------------------------------------------- */
+
+ return (xnorm) ;
+}
+
+
+/* ========================================================================== */
+/* === cholmod_norm_sparse ================================================== */
+/* ========================================================================== */
+
+double CHOLMOD(norm_sparse)
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* matrix to compute the norm of */
+ int norm, /* type of norm: 0: inf. norm, 1: 1-norm */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double anorm, s ;
+ double *Ax, *Az, *W ;
+ Int *Ap, *Ai, *Anz ;
+ Int i, j, p, pend, nrow, ncol, packed, xtype ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (EMPTY) ;
+ RETURN_IF_NULL (A, EMPTY) ;
+ RETURN_IF_XTYPE_INVALID (A, CHOLMOD_PATTERN, CHOLMOD_ZOMPLEX, EMPTY) ;
+ Common->status = CHOLMOD_OK ;
+ ncol = A->ncol ;
+ nrow = A->nrow ;
+ if (norm < 0 || norm > 1)
+ {
+ ERROR (CHOLMOD_INVALID, "invalid norm") ;
+ return (EMPTY) ;
+ }
+ if (A->stype && nrow != ncol)
+ {
+ ERROR (CHOLMOD_INVALID, "matrix invalid") ;
+ return (EMPTY) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+ Ap = A->p ;
+ Ai = A->i ;
+ Ax = A->x ;
+ Az = A->z ;
+ Anz = A->nz ;
+ packed = A->packed ;
+ xtype = A->xtype ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate workspace, if needed */
+ /* ---------------------------------------------------------------------- */
+
+ W = NULL ;
+ if (A->stype || norm == 0)
+ {
+ CHOLMOD(allocate_work) (0, 0, nrow, Common) ;
+ W = Common->Xwork ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (EMPTY) ;
+ }
+ DEBUG (for (i = 0 ; i < nrow ; i++) ASSERT (W [i] == 0)) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* compute the norm */
+ /* ---------------------------------------------------------------------- */
+
+ anorm = 0 ;
+
+ if (A->stype > 0)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* A is symmetric with upper triangular part stored */
+ /* ------------------------------------------------------------------ */
+
+ /* infinity-norm = 1-norm = max row/col sum */
+ for (j = 0 ; j < ncol ; j++)
+ {
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ s = abs_value (xtype, Ax, Az, p, Common) ;
+ if (i == j)
+ {
+ W [i] += s ;
+ }
+ else if (i < j)
+ {
+ W [i] += s ;
+ W [j] += s ;
+ }
+ }
+ }
+
+ }
+ else if (A->stype < 0)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* A is symmetric with lower triangular part stored */
+ /* ------------------------------------------------------------------ */
+
+ /* infinity-norm = 1-norm = max row/col sum */
+ for (j = 0 ; j < ncol ; j++)
+ {
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ s = abs_value (xtype, Ax, Az, p, Common) ;
+ if (i == j)
+ {
+ W [i] += s ;
+ }
+ else if (i > j)
+ {
+ W [i] += s ;
+ W [j] += s ;
+ }
+ }
+ }
+
+ }
+ else if (norm == 0)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* A is unsymmetric, compute the infinity-norm */
+ /* ------------------------------------------------------------------ */
+
+ /* infinity-norm = max row sum */
+ for (j = 0 ; j < ncol ; j++)
+ {
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ W [Ai [p]] += abs_value (xtype, Ax, Az, p, Common) ;
+ }
+ }
+
+ }
+ else
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* A is unsymmetric, compute the 1-norm */
+ /* ------------------------------------------------------------------ */
+
+ /* 1-norm = max column sum */
+ for (j = 0 ; j < ncol ; j++)
+ {
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ if (xtype == CHOLMOD_PATTERN)
+ {
+ s = pend - p ;
+ }
+ else
+ {
+ s = 0 ;
+ for ( ; p < pend ; p++)
+ {
+ s += abs_value (xtype, Ax, Az, p, Common) ;
+ }
+ }
+ if ((IS_NAN (s) || s > anorm) && !IS_NAN (anorm))
+ {
+ anorm = s ;
+ }
+ }
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* compute the max row sum */
+ /* ---------------------------------------------------------------------- */
+
+ if (A->stype || norm == 0)
+ {
+ for (i = 0 ; i < nrow ; i++)
+ {
+ s = W [i] ;
+ if ((IS_NAN (s) || s > anorm) && !IS_NAN (anorm))
+ {
+ anorm = s ;
+ }
+ W [i] = 0 ;
+ }
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* return result */
+ /* ---------------------------------------------------------------------- */
+
+ return (anorm) ;
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_scale.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_scale.c
new file mode 100644
index 0000000..e2bf173
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_scale.c
@@ -0,0 +1,219 @@
+/* ========================================================================== */
+/* === MatrixOps/cholmod_scale ============================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* scale a matrix: A = diag(s)*A, A*diag(s), s*A, or diag(s)*A*diag(s)
+ *
+ * A can be of any type (packed/unpacked, upper/lower/unsymmetric).
+ * The symmetry of A is ignored; all entries in the matrix are modified.
+ *
+ * If A is m-by-n unsymmetric but scaled symmtrically, the result is
+ * A = diag (s (1:m)) * A * diag (s (1:n)).
+ *
+ * Note: diag(s) should be interpretted as spdiags(s,0,n,n) where n=length(s).
+ *
+ * Row or column scaling of a symmetric matrix still results in a symmetric
+ * matrix, since entries are still ignored by other routines.
+ * For example, when row-scaling a symmetric matrix where just the upper
+ * triangular part is stored (and lower triangular entries ignored)
+ * A = diag(s)*triu(A) is performed, where the result A is also
+ * symmetric-upper. This has the effect of modifying the implicit lower
+ * triangular part. In MATLAB notation:
+ *
+ * U = diag(s)*triu(A) ;
+ * L = tril (U',-1)
+ * A = L + U ;
+ *
+ * The scale parameter determines the kind of scaling to perform:
+ *
+ * CHOLMOD_SCALAR: s[0]*A
+ * CHOLMOD_ROW: diag(s)*A
+ * CHOLMOD_COL: A*diag(s)
+ * CHOLMOD_SYM: diag(s)*A*diag(s)
+ *
+ * The size of S depends on the scale parameter:
+ *
+ * CHOLMOD_SCALAR: size 1
+ * CHOLMOD_ROW: size nrow-by-1 or 1-by-nrow
+ * CHOLMOD_COL: size ncol-by-1 or 1-by-ncol
+ * CHOLMOD_SYM: size max(nrow,ncol)-by-1, or 1-by-max(nrow,ncol)
+ *
+ * workspace: none
+ *
+ * Only real matrices are supported.
+ */
+
+#ifndef NGPL
+#ifndef NMATRIXOPS
+
+#include "cholmod_internal.h"
+#include "cholmod_matrixops.h"
+
+
+/* ========================================================================== */
+/* === cholmod_scale ======================================================== */
+/* ========================================================================== */
+
+int CHOLMOD(scale)
+(
+ /* ---- input ---- */
+ cholmod_dense *S, /* scale factors (scalar or vector) */
+ int scale, /* type of scaling to compute */
+ /* ---- in/out --- */
+ cholmod_sparse *A, /* matrix to scale */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double t ;
+ double *Ax, *s ;
+ Int *Ap, *Anz, *Ai ;
+ Int packed, j, ncol, nrow, p, pend, sncol, snrow, nn, ok ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (FALSE) ;
+ RETURN_IF_NULL (A, FALSE) ;
+ RETURN_IF_NULL (S, FALSE) ;
+ RETURN_IF_XTYPE_INVALID (A, CHOLMOD_REAL, CHOLMOD_REAL, FALSE) ;
+ RETURN_IF_XTYPE_INVALID (S, CHOLMOD_REAL, CHOLMOD_REAL, FALSE) ;
+ ncol = A->ncol ;
+ nrow = A->nrow ;
+ sncol = S->ncol ;
+ snrow = S->nrow ;
+ if (scale == CHOLMOD_SCALAR)
+ {
+ ok = (snrow == 1 && sncol == 1) ;
+ }
+ else if (scale == CHOLMOD_ROW)
+ {
+ ok = (snrow == nrow && sncol == 1) || (snrow == 1 && sncol == nrow) ;
+ }
+ else if (scale == CHOLMOD_COL)
+ {
+ ok = (snrow == ncol && sncol == 1) || (snrow == 1 && sncol == ncol) ;
+ }
+ else if (scale == CHOLMOD_SYM)
+ {
+ nn = MAX (nrow, ncol) ;
+ ok = (snrow == nn && sncol == 1) || (snrow == 1 && sncol == nn) ;
+ }
+ else
+ {
+ /* scale invalid */
+ ERROR (CHOLMOD_INVALID, "invalid scaling option") ;
+ return (FALSE) ;
+ }
+ if (!ok)
+ {
+ /* S is wrong size */
+ ERROR (CHOLMOD_INVALID, "invalid scale factors") ;
+ return (FALSE) ;
+ }
+ Common->status = CHOLMOD_OK ;
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+ Ap = A->p ;
+ Anz = A->nz ;
+ Ai = A->i ;
+ Ax = A->x ;
+ packed = A->packed ;
+ s = S->x ;
+
+ /* ---------------------------------------------------------------------- */
+ /* scale the matrix */
+ /* ---------------------------------------------------------------------- */
+
+ if (scale == CHOLMOD_ROW)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* A = diag(s)*A, row scaling */
+ /* ------------------------------------------------------------------ */
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ Ax [p] *= s [Ai [p]] ;
+ }
+ }
+
+ }
+ else if (scale == CHOLMOD_COL)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* A = A*diag(s), column scaling */
+ /* ------------------------------------------------------------------ */
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ t = s [j] ;
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ Ax [p] *= t ;
+ }
+ }
+
+ }
+ else if (scale == CHOLMOD_SYM)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* A = diag(s)*A*diag(s), symmetric scaling */
+ /* ------------------------------------------------------------------ */
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ t = s [j] ;
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ Ax [p] *= t * s [Ai [p]] ;
+ }
+ }
+
+ }
+ else if (scale == CHOLMOD_SCALAR)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* A = s[0] * A, scalar scaling */
+ /* ------------------------------------------------------------------ */
+
+ t = s [0] ;
+ for (j = 0 ; j < ncol ; j++)
+ {
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ Ax [p] *= t ;
+ }
+ }
+ }
+
+ ASSERT (CHOLMOD(dump_sparse) (A, "A scaled", Common) >= 0) ;
+ return (TRUE) ;
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_sdmult.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_sdmult.c
new file mode 100644
index 0000000..876921d
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_sdmult.c
@@ -0,0 +1,151 @@
+/* ========================================================================== */
+/* === MatrixOps/cholmod_sdmult ============================================= */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* Sparse matrix times dense matrix:
+ * Y = alpha*(A*X) + beta*Y or Y = alpha*(A'*X) + beta*Y,
+ * where A is sparse and X and Y are dense.
+ *
+ * when using A, X has A->ncol columns and Y has A->nrow rows
+ * when using A', X has A->nrow columns and Y has A->ncol rows
+ *
+ * workspace: none in Common. Temporary workspace of size 4*(X->nrow) is used
+ * if A is stored in symmetric form and X has four columns or more. If the
+ * workspace is not available, a slower method is used instead that requires
+ * no workspace.
+ *
+ * transpose = 0: use A
+ * otherwise, use A' (complex conjugate transpose)
+ *
+ * transpose is ignored if the matrix is symmetric or Hermitian.
+ * (the array transpose A.' is not supported).
+ *
+ * Supports real, complex, and zomplex matrices, but the xtypes of A, X, and Y
+ * must all match.
+ */
+
+#ifndef NGPL
+#ifndef NMATRIXOPS
+
+#include "cholmod_internal.h"
+#include "cholmod_matrixops.h"
+
+
+/* ========================================================================== */
+/* === TEMPLATE ============================================================= */
+/* ========================================================================== */
+
+#define REAL
+#include "t_cholmod_sdmult.c"
+#define COMPLEX
+#include "t_cholmod_sdmult.c"
+#define ZOMPLEX
+#include "t_cholmod_sdmult.c"
+
+/* ========================================================================== */
+/* === cholmod_sdmult ======================================================= */
+/* ========================================================================== */
+
+int CHOLMOD(sdmult)
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* sparse matrix to multiply */
+ int transpose, /* use A if 0, otherwise use A' */
+ double alpha [2], /* scale factor for A */
+ double beta [2], /* scale factor for Y */
+ cholmod_dense *X, /* dense matrix to multiply */
+ /* ---- in/out --- */
+ cholmod_dense *Y, /* resulting dense matrix */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double *w ;
+ size_t nx, ny ;
+ Int e ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (FALSE) ;
+ RETURN_IF_NULL (A, FALSE) ;
+ RETURN_IF_NULL (X, FALSE) ;
+ RETURN_IF_NULL (Y, FALSE) ;
+ RETURN_IF_XTYPE_INVALID (A, CHOLMOD_REAL, CHOLMOD_ZOMPLEX, FALSE) ;
+ RETURN_IF_XTYPE_INVALID (X, CHOLMOD_REAL, CHOLMOD_ZOMPLEX, FALSE) ;
+ RETURN_IF_XTYPE_INVALID (Y, CHOLMOD_REAL, CHOLMOD_ZOMPLEX, FALSE) ;
+ ny = transpose ? A->ncol : A->nrow ; /* required length of Y */
+ nx = transpose ? A->nrow : A->ncol ; /* required length of X */
+ if (X->nrow != nx || X->ncol != Y->ncol || Y->nrow != ny)
+ {
+ /* X and/or Y have the wrong dimension */
+ ERROR (CHOLMOD_INVALID, "X and/or Y have wrong dimensions") ;
+ return (FALSE) ;
+ }
+ if (A->xtype != X->xtype || A->xtype != Y->xtype)
+ {
+ ERROR (CHOLMOD_INVALID, "A, X, and Y must have same xtype") ;
+ return (FALSE) ;
+ }
+ Common->status = CHOLMOD_OK ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate workspace, if required */
+ /* ---------------------------------------------------------------------- */
+
+ w = NULL ;
+ e = (A->xtype == CHOLMOD_REAL ? 1:2) ;
+ if (A->stype && X->ncol >= 4)
+ {
+ w = CHOLMOD(malloc) (nx, 4*e*sizeof (double), Common) ;
+ }
+ if (Common->status < CHOLMOD_OK)
+ {
+ return (FALSE) ; /* out of memory */
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* Y = alpha*op(A)*X + beta*Y via template routine */
+ /* ---------------------------------------------------------------------- */
+
+ ASSERT (CHOLMOD(dump_sparse) (A, "A", Common) >= 0) ;
+ DEBUG (CHOLMOD(dump_dense) (X, "X", Common)) ;
+ DEBUG (if (IS_NONZERO (beta [0])
+ || (IS_NONZERO (beta [1]) && A->xtype != CHOLMOD_REAL))
+ CHOLMOD(dump_dense) (Y, "Y", Common)) ;
+
+ switch (A->xtype)
+ {
+
+ case CHOLMOD_REAL:
+ r_cholmod_sdmult (A, transpose, alpha, beta, X, Y, w) ;
+ break ;
+
+ case CHOLMOD_COMPLEX:
+ c_cholmod_sdmult (A, transpose, alpha, beta, X, Y, w) ;
+ break ;
+
+ case CHOLMOD_ZOMPLEX:
+ z_cholmod_sdmult (A, transpose, alpha, beta, X, Y, w) ;
+ break ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* free workspace */
+ /* ---------------------------------------------------------------------- */
+
+ CHOLMOD(free) (4*nx, e*sizeof (double), w, Common) ;
+ DEBUG (CHOLMOD(dump_dense) (Y, "Y", Common)) ;
+ return (TRUE) ;
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_ssmult.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_ssmult.c
new file mode 100644
index 0000000..13b3a40
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_ssmult.c
@@ -0,0 +1,489 @@
+/* ========================================================================== */
+/* === MatrixOps/cholmod_ssmult ============================================= */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* C = A*B. Multiply two sparse matrices.
+ *
+ * A and B can be packed or unpacked, sorted or unsorted, and of any stype.
+ * If A or B are symmetric, an internal unsymmetric copy is made first, however.
+ * C is computed as if A and B are unsymmetric, and then if the stype input
+ * parameter requests a symmetric form (upper or lower) the matrix is converted
+ * into that form.
+ *
+ * C is returned as packed, and either unsorted or sorted, depending on the
+ * "sorted" input parameter. If C is returned sorted, then either C = (B'*A')'
+ * or C = (A*B)'' is computed, depending on the number of nonzeros in A, B, and
+ * C.
+ *
+ * workspace:
+ * if C unsorted: Flag (A->nrow), W (A->nrow) if values
+ * if C sorted: Flag (B->ncol), W (B->ncol) if values
+ * Iwork (max (A->ncol, A->nrow, B->nrow, B->ncol))
+ * allocates temporary copies for A, B, and C, if required.
+ *
+ * Only pattern and real matrices are supported. Complex and zomplex matrices
+ * are supported only when the numerical values are not computed ("values"
+ * is FALSE).
+ */
+
+#ifndef NGPL
+#ifndef NMATRIXOPS
+
+#include "cholmod_internal.h"
+#include "cholmod_matrixops.h"
+
+
+/* ========================================================================== */
+/* === cholmod_ssmult ======================================================= */
+/* ========================================================================== */
+
+cholmod_sparse *CHOLMOD(ssmult)
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* left matrix to multiply */
+ cholmod_sparse *B, /* right matrix to multiply */
+ int stype, /* requested stype of C */
+ int values, /* TRUE: do numerical values, FALSE: pattern only */
+ int sorted, /* if TRUE then return C with sorted columns */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double bjt ;
+ double *Ax, *Bx, *Cx, *W ;
+ Int *Ap, *Anz, *Ai, *Bp, *Bnz, *Bi, *Cp, *Ci, *Flag ;
+ cholmod_sparse *C, *A2, *B2, *A3, *B3, *C2 ;
+ Int apacked, bpacked, j, i, pa, paend, pb, pbend, ncol, mark, cnz, t, p,
+ nrow, anz, bnz, do_swap_and_transpose, n1, n2 ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (NULL) ;
+ RETURN_IF_NULL (A, NULL) ;
+ RETURN_IF_NULL (B, NULL) ;
+ values = values &&
+ (A->xtype != CHOLMOD_PATTERN) && (B->xtype != CHOLMOD_PATTERN) ;
+ RETURN_IF_XTYPE_INVALID (A, CHOLMOD_PATTERN,
+ values ? CHOLMOD_REAL : CHOLMOD_ZOMPLEX, NULL) ;
+ RETURN_IF_XTYPE_INVALID (B, CHOLMOD_PATTERN,
+ values ? CHOLMOD_REAL : CHOLMOD_ZOMPLEX, NULL) ;
+ if (A->ncol != B->nrow)
+ {
+ /* inner dimensions must agree */
+ ERROR (CHOLMOD_INVALID, "A and B inner dimensions must match") ;
+ return (NULL) ;
+ }
+ /* A and B must have the same numerical type if values is TRUE (both must
+ * be CHOLMOD_REAL, this is implicitly checked above) */
+ Common->status = CHOLMOD_OK ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate workspace */
+ /* ---------------------------------------------------------------------- */
+
+ if (A->nrow <= 1)
+ {
+ /* C will be implicitly sorted, so no need to sort it here */
+ sorted = FALSE ;
+ }
+ if (sorted)
+ {
+ n1 = MAX (A->nrow, B->ncol) ;
+ }
+ else
+ {
+ n1 = A->nrow ;
+ }
+ n2 = MAX4 (A->ncol, A->nrow, B->nrow, B->ncol) ;
+ CHOLMOD(allocate_work) (n1, n2, values ? n1 : 0, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (NULL) ;
+ }
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1 : 0, Common)) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+ /* convert A to unsymmetric, if necessary */
+ A2 = NULL ;
+ B2 = NULL ;
+ if (A->stype)
+ {
+ /* workspace: Iwork (max (A->nrow,A->ncol)) */
+ A2 = CHOLMOD(copy) (A, 0, values, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common)) ;
+ return (NULL) ;
+ }
+ A = A2 ;
+ }
+
+ /* convert B to unsymmetric, if necessary */
+ if (B->stype)
+ {
+ /* workspace: Iwork (max (B->nrow,B->ncol)) */
+ B2 = CHOLMOD(copy) (B, 0, values, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common)) ;
+ return (NULL) ;
+ }
+ B = B2 ;
+ }
+
+ ASSERT (CHOLMOD(dump_sparse) (A, "A", Common) >= 0) ;
+ ASSERT (CHOLMOD(dump_sparse) (B, "B", Common) >= 0) ;
+
+ /* get the A matrix */
+ Ap = A->p ;
+ Anz = A->nz ;
+ Ai = A->i ;
+ Ax = A->x ;
+ apacked = A->packed ;
+
+ /* get the B matrix */
+ Bp = B->p ;
+ Bnz = B->nz ;
+ Bi = B->i ;
+ Bx = B->x ;
+ bpacked = B->packed ;
+
+ /* get the size of C */
+ nrow = A->nrow ;
+ ncol = B->ncol ;
+
+ /* get workspace */
+ W = Common->Xwork ; /* size nrow, unused if values is FALSE */
+ Flag = Common->Flag ; /* size nrow, Flag [0..nrow-1] < mark on input*/
+
+ /* ---------------------------------------------------------------------- */
+ /* count the number of entries in the result C */
+ /* ---------------------------------------------------------------------- */
+
+ cnz = 0 ;
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* clear the Flag array */
+ /* mark = CHOLMOD(clear_flag) (Common) ; */
+ CHOLMOD_CLEAR_FLAG (Common) ;
+ mark = Common->mark ;
+
+ /* for each nonzero B(t,j) in column j, do: */
+ pb = Bp [j] ;
+ pbend = (bpacked) ? (Bp [j+1]) : (pb + Bnz [j]) ;
+ for ( ; pb < pbend ; pb++)
+ {
+ /* B(t,j) is nonzero */
+ t = Bi [pb] ;
+
+ /* add the nonzero pattern of A(:,t) to the pattern of C(:,j) */
+ pa = Ap [t] ;
+ paend = (apacked) ? (Ap [t+1]) : (pa + Anz [t]) ;
+ for ( ; pa < paend ; pa++)
+ {
+ i = Ai [pa] ;
+ if (Flag [i] != mark)
+ {
+ Flag [i] = mark ;
+ cnz++ ;
+ }
+ }
+ }
+ if (cnz < 0)
+ {
+ break ; /* integer overflow case */
+ }
+ }
+
+ /* mark = CHOLMOD(clear_flag) (Common) ; */
+ CHOLMOD_CLEAR_FLAG (Common) ;
+ mark = Common->mark ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check for integer overflow */
+ /* ---------------------------------------------------------------------- */
+
+ if (cnz < 0)
+ {
+ ERROR (CHOLMOD_TOO_LARGE, "problem too large") ;
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common)) ;
+ return (NULL) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* Determine how to return C sorted (if requested) */
+ /* ---------------------------------------------------------------------- */
+
+ do_swap_and_transpose = FALSE ;
+
+ if (sorted)
+ {
+ /* Determine the best way to return C with sorted columns. Computing
+ * C = (B'*A')' takes cnz + anz + bnz time (ignoring O(n) terms).
+ * Sorting C when done, C = (A*B)'', takes 2*cnz time. Pick the one
+ * with the least amount of work. */
+
+ anz = CHOLMOD(nnz) (A, Common) ;
+ bnz = CHOLMOD(nnz) (B, Common) ;
+
+ do_swap_and_transpose = (anz + bnz < cnz) ;
+
+ if (do_swap_and_transpose)
+ {
+
+ /* -------------------------------------------------------------- */
+ /* C = (B'*A')' */
+ /* -------------------------------------------------------------- */
+
+ /* workspace: Iwork (A->nrow) */
+ A3 = CHOLMOD(ptranspose) (A, values, NULL, NULL, 0, Common) ;
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ A2 = A3 ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common));
+ return (NULL) ;
+ }
+ /* workspace: Iwork (B->nrow) */
+ B3 = CHOLMOD(ptranspose) (B, values, NULL, NULL, 0, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ B2 = B3 ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common));
+ return (NULL) ;
+ }
+ A = B2 ;
+ B = A2 ;
+
+ /* get the new A matrix */
+ Ap = A->p ;
+ Anz = A->nz ;
+ Ai = A->i ;
+ Ax = A->x ;
+ apacked = A->packed ;
+
+ /* get the new B matrix */
+ Bp = B->p ;
+ Bnz = B->nz ;
+ Bi = B->i ;
+ Bx = B->x ;
+ bpacked = B->packed ;
+
+ /* get the size of C' */
+ nrow = A->nrow ;
+ ncol = B->ncol ;
+ }
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate C */
+ /* ---------------------------------------------------------------------- */
+
+ C = CHOLMOD(allocate_sparse) (nrow, ncol, cnz, FALSE, TRUE, 0,
+ values ? A->xtype : CHOLMOD_PATTERN, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common)) ;
+ return (NULL) ;
+ }
+
+ Cp = C->p ;
+ Ci = C->i ;
+ Cx = C->x ;
+
+ /* ---------------------------------------------------------------------- */
+ /* C = A*B */
+ /* ---------------------------------------------------------------------- */
+
+ cnz = 0 ;
+
+ if (values)
+ {
+
+ /* pattern and values */
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* clear the Flag array */
+ /* mark = CHOLMOD(clear_flag (Common)) ; */
+ CHOLMOD_CLEAR_FLAG (Common) ;
+ mark = Common->mark ;
+
+ /* start column j of C */
+ Cp [j] = cnz ;
+
+ /* for each nonzero B(t,j) in column j, do: */
+ pb = Bp [j] ;
+ pbend = (bpacked) ? (Bp [j+1]) : (pb + Bnz [j]) ;
+ for ( ; pb < pbend ; pb++)
+ {
+ /* B(t,j) is nonzero */
+ t = Bi [pb] ;
+ bjt = Bx [pb] ;
+
+ /* add the nonzero pattern of A(:,t) to the pattern of C(:,j)
+ * and scatter the values into W */
+ pa = Ap [t] ;
+ paend = (apacked) ? (Ap [t+1]) : (pa + Anz [t]) ;
+ for ( ; pa < paend ; pa++)
+ {
+ i = Ai [pa] ;
+ if (Flag [i] != mark)
+ {
+ Flag [i] = mark ;
+ Ci [cnz++] = i ;
+ }
+ W [i] += Ax [pa] * bjt ;
+ }
+ }
+
+ /* gather the values into C(:,j) */
+ for (p = Cp [j] ; p < cnz ; p++)
+ {
+ i = Ci [p] ;
+ Cx [p] = W [i] ;
+ W [i] = 0 ;
+ }
+ }
+
+ }
+ else
+ {
+
+ /* pattern only */
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* clear the Flag array */
+ /* mark = CHOLMOD(clear_flag) (Common) ; */
+ CHOLMOD_CLEAR_FLAG (Common) ;
+ mark = Common->mark ;
+
+ /* start column j of C */
+ Cp [j] = cnz ;
+
+ /* for each nonzero B(t,j) in column j, do: */
+ pb = Bp [j] ;
+ pbend = (bpacked) ? (Bp [j+1]) : (pb + Bnz [j]) ;
+ for ( ; pb < pbend ; pb++)
+ {
+ /* B(t,j) is nonzero */
+ t = Bi [pb] ;
+
+ /* add the nonzero pattern of A(:,t) to the pattern of C(:,j) */
+ pa = Ap [t] ;
+ paend = (apacked) ? (Ap [t+1]) : (pa + Anz [t]) ;
+ for ( ; pa < paend ; pa++)
+ {
+ i = Ai [pa] ;
+ if (Flag [i] != mark)
+ {
+ Flag [i] = mark ;
+ Ci [cnz++] = i ;
+ }
+ }
+ }
+ }
+ }
+
+ Cp [ncol] = cnz ;
+ ASSERT (MAX (1,cnz) == C->nzmax) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* clear workspace and free temporary matrices */
+ /* ---------------------------------------------------------------------- */
+
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ /* CHOLMOD(clear_flag) (Common) ; */
+ CHOLMOD_CLEAR_FLAG (Common) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common)) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* convert C to a symmetric upper/lower matrix if requested */
+ /* ---------------------------------------------------------------------- */
+
+ /* convert C in place, which cannot fail since no memory is allocated */
+ if (stype > 0)
+ {
+ /* C = triu (C), in place */
+ (void) CHOLMOD(band_inplace) (0, ncol, values, C, Common) ;
+ C->stype = 1 ;
+ }
+ else if (stype < 0)
+ {
+ /* C = tril (C), in place */
+ (void) CHOLMOD(band_inplace) (-nrow, 0, values, C, Common) ;
+ C->stype = -1 ;
+ }
+ ASSERT (Common->status >= CHOLMOD_OK) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* sort C, if requested */
+ /* ---------------------------------------------------------------------- */
+
+ if (sorted)
+ {
+ if (do_swap_and_transpose)
+ {
+ /* workspace: Iwork (C->ncol), which is A->nrow since C=(B'*A') */
+ C2 = CHOLMOD(ptranspose) (C, values, NULL, NULL, 0, Common) ;
+ CHOLMOD(free_sparse) (&C, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common));
+ return (NULL) ;
+ }
+ C = C2 ;
+ }
+ else
+ {
+ /* workspace: Iwork (max (C->nrow,C->ncol)) */
+ if (!CHOLMOD(sort) (C, Common))
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&C, Common) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common));
+ return (NULL) ;
+ }
+ }
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* return result */
+ /* ---------------------------------------------------------------------- */
+
+ DEBUG (CHOLMOD(dump_sparse) (C, "ssmult", Common) >= 0) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, values ? n1:0, Common)) ;
+ return (C) ;
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_submatrix.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_submatrix.c
new file mode 100644
index 0000000..7acb9c0
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_submatrix.c
@@ -0,0 +1,427 @@
+/* ========================================================================== */
+/* === MatrixOps/cholmod_submatrix ========================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* C = A (rset,cset), where C becomes length(rset)-by-length(cset) in dimension.
+ * rset and cset can have duplicate entries. A and C must be unsymmetric. C
+ * is packed. If the sorted flag is TRUE on input, or rset is sorted and A is
+ * sorted, then C is sorted; otherwise C is unsorted.
+ *
+ * A NULL rset or cset means "[ ]" in MATLAB notation.
+ * If the length of rset or cset is negative, it denotes ":" in MATLAB notation.
+ *
+ * For permuting a matrix, this routine is an alternative to cholmod_ptranspose
+ * (which permutes and transposes a matrix and can work on symmetric matrices).
+ *
+ * The time taken by this routine is O(A->nrow) if the Common workspace needs
+ * to be initialized, plus O(C->nrow + C->ncol + nnz (A (:,cset))). Thus, if C
+ * is small and the workspace is not initialized, the time can be dominated by
+ * the call to cholmod_allocate_work. However, once the workspace is
+ * allocated, subsequent calls take less time.
+ *
+ * workspace: Iwork (max (A->nrow + length (rset), length (cset))).
+ * allocates temporary copy of C if it is to be returned sorted.
+ *
+ * Future work: A common case occurs where A has sorted columns, and rset is in
+ * the form lo:hi in MATLAB notation. This routine could exploit that case
+ * to run even faster when the matrix is sorted, particularly when lo is small.
+ *
+ * Only pattern and real matrices are supported. Complex and zomplex matrices
+ * are supported only when "values" is FALSE.
+ */
+
+#ifndef NGPL
+#ifndef NMATRIXOPS
+
+#include "cholmod_internal.h"
+#include "cholmod_matrixops.h"
+
+/* ========================================================================== */
+/* === check_subset ========================================================= */
+/* ========================================================================== */
+
+/* Check the rset or cset, and return TRUE if valid, FALSE if invalid */
+
+static int check_subset (Int *set, Int len, Int n)
+{
+ Int k ;
+ if (set == NULL)
+ {
+ return (TRUE) ;
+ }
+ for (k = 0 ; k < len ; k++)
+ {
+ if (set [k] < 0 || set [k] >= n)
+ {
+ return (FALSE) ;
+ }
+ }
+ return (TRUE) ;
+}
+
+
+/* ========================================================================== */
+/* === cholmod_submatrix ==================================================== */
+/* ========================================================================== */
+
+cholmod_sparse *CHOLMOD(submatrix)
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* matrix to subreference */
+ Int *rset, /* set of row indices, duplicates OK */
+ SuiteSparse_long rsize, /* size of rset, or -1 for ":" */
+ Int *cset, /* set of column indices, duplicates OK */
+ SuiteSparse_long csize, /* size of cset, or -1 for ":" */
+ int values, /* if TRUE compute the numerical values of C */
+ int sorted, /* if TRUE then return C with sorted columns */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double aij = 0 ;
+ double *Ax, *Cx ;
+ Int *Ap, *Ai, *Anz, *Ci, *Cp, *Head, *Rlen, *Rnext, *Iwork ;
+ cholmod_sparse *C ;
+ Int packed, ancol, anrow, cnrow, cncol, nnz, i, j, csorted, ilast, p,
+ pend, pdest, ci, cj, head, nr, nc ;
+ size_t s ;
+ int ok = TRUE ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (NULL) ;
+ RETURN_IF_NULL (A, NULL) ;
+ values = (values && (A->xtype != CHOLMOD_PATTERN)) ;
+ RETURN_IF_XTYPE_INVALID (A, CHOLMOD_PATTERN,
+ values ? CHOLMOD_REAL : CHOLMOD_ZOMPLEX, NULL) ;
+ if (A->stype != 0)
+ {
+ /* A must be unsymmetric */
+ ERROR (CHOLMOD_INVALID, "symmetric upper or lower case not supported") ;
+ return (NULL) ;
+ }
+ Common->status = CHOLMOD_OK ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate workspace */
+ /* ---------------------------------------------------------------------- */
+
+ ancol = A->ncol ;
+ anrow = A->nrow ;
+ nr = rsize ;
+ nc = csize ;
+ if (rset == NULL)
+ {
+ /* nr = 0 denotes rset = [ ], nr < 0 denotes rset = 0:anrow-1 */
+ nr = (nr < 0) ? (-1) : 0 ;
+ }
+ if (cset == NULL)
+ {
+ /* nr = 0 denotes cset = [ ], nr < 0 denotes cset = 0:ancol-1 */
+ nc = (nc < 0) ? (-1) : 0 ;
+ }
+ cnrow = (nr < 0) ? anrow : nr ; /* negative rset means rset = 0:anrow-1 */
+ cncol = (nc < 0) ? ancol : nc ; /* negative cset means cset = 0:ancol-1 */
+
+ if (nr < 0 && nc < 0)
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* C = A (:,:), use cholmod_copy instead */
+ /* ------------------------------------------------------------------ */
+
+ /* workspace: Iwork (max (C->nrow,C->ncol)) */
+ PRINT1 (("submatrix C = A (:,:)\n")) ;
+ C = CHOLMOD(copy) (A, 0, values, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (NULL) ;
+ }
+ return (C) ;
+ }
+ PRINT1 (("submatrix nr "ID" nc "ID" Cnrow "ID" Cncol "ID""
+ " Anrow "ID" Ancol "ID"\n", nr, nc, cnrow, cncol, anrow, ancol)) ;
+
+ /* s = MAX3 (anrow+MAX(0,nr), cncol, cnrow) ; */
+ s = CHOLMOD(add_size_t) (anrow, MAX (0,nr), &ok) ;
+ if (!ok)
+ {
+ ERROR (CHOLMOD_TOO_LARGE, "problem too large") ;
+ return (NULL) ;
+ }
+ s = MAX3 (s, ((size_t) cncol), ((size_t) cnrow)) ;
+
+ CHOLMOD(allocate_work) (anrow, s, 0, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (NULL) ;
+ }
+
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, 0, Common)) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+ Ap = A->p ;
+ Anz = A->nz ;
+ Ai = A->i ;
+ Ax = A->x ;
+ packed = A->packed ;
+
+ /* ---------------------------------------------------------------------- */
+ /* get workspace */
+ /* ---------------------------------------------------------------------- */
+
+ Head = Common->Head ; /* size anrow */
+ Iwork = Common->Iwork ;
+ Rlen = Iwork ; /* size anrow (i/i/l) */
+ Rnext = Iwork + anrow ; /* size nr (i/i/l), not used if nr < 0 */
+
+ /* ---------------------------------------------------------------------- */
+ /* construct inverse of rset and compute nnz (C) */
+ /* ---------------------------------------------------------------------- */
+
+ PRINT1 (("nr "ID" nc "ID"\n", nr, nc)) ;
+ PRINT1 (("anrow "ID" ancol "ID"\n", anrow, ancol)) ;
+ PRINT1 (("cnrow "ID" cncol "ID"\n", cnrow, cncol)) ;
+ DEBUG (for (i = 0 ; i < nr ; i++) PRINT2 (("rset ["ID"] = "ID"\n",
+ i, rset [i])));
+ DEBUG (for (i = 0 ; i < nc ; i++) PRINT2 (("cset ["ID"] = "ID"\n",
+ i, cset [i])));
+
+ /* C is sorted if A and rset are sorted, or if C has one row or less */
+ csorted = A->sorted || (cnrow <= 1) ;
+
+ if (!check_subset (rset, nr, anrow))
+ {
+ ERROR (CHOLMOD_INVALID, "invalid rset") ;
+ return (NULL) ;
+ }
+
+ if (!check_subset (cset, nc, ancol))
+ {
+ ERROR (CHOLMOD_INVALID, "invalid cset") ;
+ return (NULL) ;
+ }
+
+ nnz = 0 ;
+ if (nr < 0)
+ {
+ /* C = A (:,cset) where cset = [ ] or cset is not empty */
+ ASSERT (IMPLIES (cncol > 0, cset != NULL)) ;
+ for (cj = 0 ; cj < cncol ; cj++)
+ {
+ /* construct column cj of C, which is column j of A */
+ j = cset [cj] ;
+ nnz += (packed) ? (Ap [j+1] - Ap [j]) : MAX (0, Anz [j]) ;
+ }
+ }
+ else
+ {
+ /* C = A (rset,cset), where rset is not empty but cset might be empty */
+ /* create link lists in reverse order to preserve natural order */
+ ilast = anrow ;
+ for (ci = nr-1 ; ci >= 0 ; ci--)
+ {
+ /* row i of A becomes row ci of C; add ci to ith link list */
+ i = rset [ci] ;
+ head = Head [i] ;
+ Rlen [i] = (head == EMPTY) ? 1 : (Rlen [i] + 1) ;
+ Rnext [ci] = head ;
+ Head [i] = ci ;
+ if (i > ilast)
+ {
+ /* row indices in columns of C will not be sorted */
+ csorted = FALSE ;
+ }
+ ilast = i ;
+ }
+
+#ifndef NDEBUG
+ for (i = 0 ; i < anrow ; i++)
+ {
+ Int k = 0 ;
+ Int rlen = (Head [i] != EMPTY) ? Rlen [i] : -1 ;
+ PRINT1 (("Row "ID" Rlen "ID": ", i, rlen)) ;
+ for (ci = Head [i] ; ci != EMPTY ; ci = Rnext [ci])
+ {
+ k++ ;
+ PRINT2 ((""ID" ", ci)) ;
+ }
+ PRINT1 (("\n")) ;
+ ASSERT (IMPLIES (Head [i] != EMPTY, k == Rlen [i])) ;
+ }
+#endif
+
+ /* count nonzeros in C */
+ for (cj = 0 ; cj < cncol ; cj++)
+ {
+ /* count rows in column cj of C, which is column j of A */
+ j = (nc < 0) ? cj : (cset [cj]) ;
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ /* row i of A becomes multiple rows (ci) of C */
+ i = Ai [p] ;
+ ASSERT (i >= 0 && i < anrow) ;
+ if (Head [i] != EMPTY)
+ {
+ nnz += Rlen [i] ;
+ }
+ }
+ }
+ }
+ PRINT1 (("nnz (C) "ID"\n", nnz)) ;
+
+ /* rset and cset are now valid */
+ DEBUG (CHOLMOD(dump_subset) (rset, rsize, anrow, "rset", Common)) ;
+ DEBUG (CHOLMOD(dump_subset) (cset, csize, ancol, "cset", Common)) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate C */
+ /* ---------------------------------------------------------------------- */
+
+ C = CHOLMOD(allocate_sparse) (cnrow, cncol, nnz, csorted, TRUE, 0,
+ values ? A->xtype : CHOLMOD_PATTERN, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ for (i = 0 ; i < anrow ; i++)
+ {
+ Head [i] = EMPTY ;
+ }
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, 0, Common)) ;
+ return (NULL) ;
+ }
+
+ Cp = C->p ;
+ Ci = C->i ;
+ Cx = C->x ;
+
+ /* ---------------------------------------------------------------------- */
+ /* C = A (rset,cset) */
+ /* ---------------------------------------------------------------------- */
+
+ pdest = 0 ;
+ if (nnz == 0)
+ {
+ /* C has no nonzeros */
+ for (cj = 0 ; cj <= cncol ; cj++)
+ {
+ Cp [cj] = 0 ;
+ }
+ }
+ else if (nr < 0)
+ {
+ /* C = A (:,cset), where cset is not empty */
+ for (cj = 0 ; cj < cncol ; cj++)
+ {
+ /* construct column cj of C, which is column j of A */
+ PRINT1 (("construct cj = j = "ID"\n", cj)) ;
+ j = cset [cj] ;
+ Cp [cj] = pdest ;
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ Ci [pdest] = Ai [p] ;
+ if (values)
+ {
+ Cx [pdest] = Ax [p] ;
+ }
+ pdest++ ;
+ ASSERT (pdest <= nnz) ;
+ }
+ }
+ }
+ else
+ {
+ /* C = A (rset,cset), where rset is not empty but cset might be empty */
+ for (cj = 0 ; cj < cncol ; cj++)
+ {
+ /* construct column cj of C, which is column j of A */
+ PRINT1 (("construct cj = "ID"\n", cj)) ;
+ j = (nc < 0) ? cj : (cset [cj]) ;
+ PRINT1 (("cj = "ID"\n", j)) ;
+ Cp [cj] = pdest ;
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ /* row (Ai [p]) of A becomes multiple rows (ci) of C */
+ PRINT2 (("i: "ID" becomes: ", Ai [p])) ;
+ if (values)
+ {
+ aij = Ax [p] ;
+ }
+ for (ci = Head [Ai [p]] ; ci != EMPTY ; ci = Rnext [ci])
+ {
+ PRINT3 ((""ID" ", ci)) ;
+ Ci [pdest] = ci ;
+ if (values)
+ {
+ Cx [pdest] = aij ;
+ }
+ pdest++ ;
+ ASSERT (pdest <= nnz) ;
+ }
+ PRINT2 (("\n")) ;
+ }
+ }
+ }
+ Cp [cncol] = pdest ;
+ ASSERT (nnz == pdest) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* clear workspace */
+ /* ---------------------------------------------------------------------- */
+
+ for (ci = 0 ; ci < nr ; ci++)
+ {
+ Head [rset [ci]] = EMPTY ;
+ }
+
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, 0, Common)) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* sort C, if requested */
+ /* ---------------------------------------------------------------------- */
+
+ ASSERT (CHOLMOD(dump_sparse) (C , "C before sort", Common) >= 0) ;
+
+ if (sorted && !csorted)
+ {
+ /* workspace: Iwork (max (C->nrow,C->ncol)) */
+ if (!CHOLMOD(sort) (C, Common))
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&C, Common) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, 0, Common)) ;
+ return (NULL) ;
+ }
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* return result */
+ /* ---------------------------------------------------------------------- */
+
+ ASSERT (CHOLMOD(dump_sparse) (C , "Final C", Common) >= 0) ;
+ ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, 0, Common)) ;
+ return (C) ;
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_symmetry.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_symmetry.c
new file mode 100644
index 0000000..a82ab05
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_symmetry.c
@@ -0,0 +1,490 @@
+/* ========================================================================== */
+/* === MatrixOps/cholmod_symmetry =========================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* Determines if a sparse matrix is rectangular, unsymmetric, symmetric,
+ * skew-symmetric, or Hermitian. It does so by looking at its numerical values
+ * of both upper and lower triangular parts of a CHOLMOD "unsymmetric"
+ * matrix, where A->stype == 0. The transpose of A is NOT constructed.
+ *
+ * If not unsymmetric, it also determines if the matrix has a diagonal whose
+ * entries are all real and positive (and thus a candidate for sparse Cholesky
+ * if A->stype is changed to a nonzero value).
+ *
+ * Note that a Matrix Market "general" matrix is either rectangular or
+ * unsymmetric.
+ *
+ * The row indices in the column of each matrix MUST be sorted for this function
+ * to work properly (A->sorted must be TRUE). This routine returns EMPTY if
+ * A->stype is not zero, or if A->sorted is FALSE. The exception to this rule
+ * is if A is rectangular.
+ *
+ * If option == 0, then this routine returns immediately when it finds a
+ * non-positive diagonal entry (or one with nonzero imaginary part). If the
+ * matrix is not a candidate for sparse Cholesky, it returns the value
+ * CHOLMOD_MM_UNSYMMETRIC, even if the matrix might in fact be symmetric or
+ * Hermitian.
+ *
+ * This routine is useful inside the MATLAB backslash, which must look at an
+ * arbitrary matrix (A->stype == 0) and determine if it is a candidate for
+ * sparse Cholesky. In that case, option should be 0.
+ *
+ * This routine is also useful when writing a MATLAB matrix to a file in
+ * Rutherford/Boeing or Matrix Market format. Those formats require a
+ * determination as to the symmetry of the matrix, and thus this routine should
+ * not return upon encountering the first non-positive diagonal. In this case,
+ * option should be 1.
+ *
+ * If option is 2, this function can be used to compute the numerical and
+ * pattern symmetry, where 0 is a completely unsymmetric matrix, and 1 is a
+ * perfectly symmetric matrix. This option is used when computing the following
+ * statistics for the matrices in the UF Sparse Matrix Collection.
+ *
+ * numerical symmetry: number of matched offdiagonal nonzeros over
+ * the total number of offdiagonal entries. A real entry A(i,j), i ~= j,
+ * is matched if A (j,i) == A (i,j), but this is only counted if both
+ * A(j,i) and A(i,j) are nonzero. This does not depend on Z.
+ * (If A is complex, then the above test is modified; A (i,j) is matched
+ * if conj (A (j,i)) == A (i,j)).
+ *
+ * Then numeric symmetry = xmatched / nzoffdiag, or 1 if nzoffdiag = 0.
+ *
+ * pattern symmetry: number of matched offdiagonal entries over the
+ * total number of offdiagonal entries. An entry A(i,j), i ~= j, is
+ * matched if A (j,i) is also an entry.
+ *
+ * Then pattern symmetry = pmatched / nzoffdiag, or 1 if nzoffdiag = 0.
+ *
+ * The symmetry of a matrix with no offdiagonal entries is equal to 1.
+ *
+ * A workspace of size ncol integers is allocated; EMPTY is returned if this
+ * allocation fails.
+ *
+ * Summary of return values:
+ *
+ * EMPTY (-1) out of memory, stype not zero, A not sorted
+ * CHOLMOD_MM_RECTANGULAR 1 A is rectangular
+ * CHOLMOD_MM_UNSYMMETRIC 2 A is unsymmetric
+ * CHOLMOD_MM_SYMMETRIC 3 A is symmetric, but with non-pos. diagonal
+ * CHOLMOD_MM_HERMITIAN 4 A is Hermitian, but with non-pos. diagonal
+ * CHOLMOD_MM_SKEW_SYMMETRIC 5 A is skew symmetric
+ * CHOLMOD_MM_SYMMETRIC_POSDIAG 6 A is symmetric with positive diagonal
+ * CHOLMOD_MM_HERMITIAN_POSDIAG 7 A is Hermitian with positive diagonal
+ *
+ * See also the spsym mexFunction, which is a MATLAB interface for this code.
+ *
+ * If the matrix is a candidate for sparse Cholesky, it will return a result
+ * CHOLMOD_MM_SYMMETRIC_POSDIAG if real, or CHOLMOD_MM_HERMITIAN_POSDIAG if
+ * complex. Otherwise, it will return a value less than this. This is true
+ * regardless of the value of the option parameter.
+ */
+
+#ifndef NGPL
+#ifndef NMATRIXOPS
+
+#include "cholmod_internal.h"
+#include "cholmod_matrixops.h"
+
+
+/* ========================================================================== */
+/* === get_value ============================================================ */
+/* ========================================================================== */
+
+/* Get the pth value in the matrix. */
+
+static void get_value
+(
+ double *Ax, /* real values, or real/imag. for CHOLMOD_COMPLEX type */
+ double *Az, /* imaginary values for CHOLMOD_ZOMPLEX type */
+ Int p, /* get the pth entry */
+ Int xtype, /* A->xtype: pattern, real, complex, or zomplex */
+ double *x, /* the real part */
+ double *z /* the imaginary part */
+)
+{
+ switch (xtype)
+ {
+ case CHOLMOD_PATTERN:
+ *x = 1 ;
+ *z = 0 ;
+ break ;
+
+ case CHOLMOD_REAL:
+ *x = Ax [p] ;
+ *z = 0 ;
+ break ;
+
+ case CHOLMOD_COMPLEX:
+ *x = Ax [2*p] ;
+ *z = Ax [2*p+1] ;
+ break ;
+
+ case CHOLMOD_ZOMPLEX:
+ *x = Ax [p] ;
+ *z = Az [p] ;
+ break ;
+ }
+}
+
+
+/* ========================================================================== */
+/* === cholmod_symmetry ===================================================== */
+/* ========================================================================== */
+
+/* Determine the symmetry of a matrix, and check its diagonal.
+ *
+ * option 0: Do not count # of matched pairs. Quick return if the
+ * the matrix has a zero, negative, or imaginary diagonal entry.
+ *
+ * option 1: Do not count # of matched pairs. Do not return quickly if
+ * the matrix has a zero, negative, or imaginary diagonal entry.
+ * The result 1 to 7 is accurately computed:
+ *
+ * EMPTY (-1) out of memory, stype not zero, A not sorted
+ * CHOLMOD_MM_RECTANGULAR 1 A is rectangular
+ * CHOLMOD_MM_UNSYMMETRIC 2 A is unsymmetric
+ * CHOLMOD_MM_SYMMETRIC 3 A is symmetric, with non-pos. diagonal
+ * CHOLMOD_MM_HERMITIAN 4 A is Hermitian, with non-pos. diagonal
+ * CHOLMOD_MM_SKEW_SYMMETRIC 5 A is skew symmetric
+ * CHOLMOD_MM_SYMMETRIC_POSDIAG 6 is symmetric with positive diagonal
+ * CHOLMOD_MM_HERMITIAN_POSDIAG 7 A is Hermitian with positive diagonal
+ *
+ * The routine returns as soon as the above is determined (that is, it
+ * can return as soon as it determines the matrix is unsymmetric).
+ *
+ * option 2: All of the above, but also compute the number of matched off-
+ * diagonal entries (of two types). xmatched is the number of
+ * nonzero entries for which A(i,j) = conj(A(j,i)). pmatched is
+ * the number of entries (i,j) for which A(i,j) and A(j,i) are both in
+ * the pattern of A (the value doesn't matter). nzoffdiag is the total
+ * number of off-diagonal entries in the pattern. nzdiag is the number of
+ * diagonal entries in the pattern.
+ *
+ * With option 0 or 1, or if the matrix is rectangular, xmatched, pmatched,
+ * nzoffdiag, and nzdiag are not computed.
+ *
+ * Note that a matched pair, A(i,j) and A(j,i) for i != j, is counted twice
+ * (once per entry).
+ */
+
+int CHOLMOD(symmetry)
+(
+ /* ---- input ---- */
+ cholmod_sparse *A,
+ int option, /* option 0, 1, or 2 (see above) */
+ /* ---- output --- */ /* outputs ignored if any are NULL */
+ Int *p_xmatched, /* # of matched numerical entries */
+ Int *p_pmatched, /* # of matched entries in pattern */
+ Int *p_nzoffdiag, /* # of off diagonal entries */
+ Int *p_nzdiag, /* # of diagonal entries */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double aij_real = 0, aij_imag = 0, aji_real = 0, aji_imag = 0 ;
+ double *Ax, *Az ;
+ Int *Ap, *Ai, *Anz, *munch ;
+ Int packed, nrow, ncol, xtype, is_symmetric, is_skew, is_hermitian, posdiag,
+ j, p, pend, i, piend, result, xmatched, pmatched, nzdiag, i2, found ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (EMPTY) ;
+ RETURN_IF_NULL (A, EMPTY) ;
+ RETURN_IF_XTYPE_INVALID (A, CHOLMOD_PATTERN, CHOLMOD_ZOMPLEX, EMPTY) ;
+ Common->status = CHOLMOD_OK ;
+ ASSERT (CHOLMOD(dump_sparse) (A, "cholmod_symmetry", Common) >= 0) ;
+
+ if (p_xmatched == NULL || p_pmatched == NULL
+ || p_nzoffdiag == NULL || p_nzdiag == NULL)
+ {
+ /* option 2 is not performed if any output parameter is NULL */
+ option = MAX (option, 1) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+ Ap = A->p ;
+ Ai = A->i ;
+ Ax = A->x ;
+ Az = A->z ;
+ Anz = A->nz ;
+ packed = A->packed ;
+ ncol = A->ncol ;
+ nrow = A->nrow ;
+ xtype = A->xtype ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check if rectangular, unsorted, or stype is not zero */
+ /* ---------------------------------------------------------------------- */
+
+ if (nrow != ncol)
+ {
+ /* matrix is rectangular */
+ return (CHOLMOD_MM_RECTANGULAR) ;
+ }
+
+ if (!(A->sorted) || A->stype != 0)
+ {
+ /* this function cannot determine the type or symmetry */
+ return (EMPTY) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate workspace */
+ /* ---------------------------------------------------------------------- */
+
+ /* this function requires uninitialized Int workspace of size ncol */
+ CHOLMOD(allocate_work) (0, ncol, 0, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (EMPTY) ;
+ }
+
+ munch = Common->Iwork ; /* the munch array is size ncol */
+
+ /* ---------------------------------------------------------------------- */
+ /* determine symmetry of a square matrix */
+ /* ---------------------------------------------------------------------- */
+
+ /* a complex or zomplex matrix is Hermitian until proven otherwise */
+ is_hermitian = (xtype >= CHOLMOD_COMPLEX) ;
+
+ /* any matrix is symmetric until proven otherwise */
+ is_symmetric = TRUE ;
+
+ /* a non-pattern matrix is skew-symmetric until proven otherwise */
+ is_skew = (xtype != CHOLMOD_PATTERN) ;
+
+ /* a matrix has positive diagonal entries until proven otherwise */
+ posdiag = TRUE ;
+
+ /* munch pointers start at the top of each column */
+ for (j = 0 ; j < ncol ; j++)
+ {
+ munch [j] = Ap [j] ;
+ }
+
+ xmatched = 0 ;
+ pmatched = 0 ;
+ nzdiag = 0 ;
+
+ for (j = 0 ; j < ncol ; j++) /* examine each column of A */
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* look at the entire munch column j */
+ /* ------------------------------------------------------------------ */
+
+ /* start at the munch point of column j, and go to end of the column */
+ p = munch [j] ;
+ pend = (packed) ? (Ap [j+1]) : (Ap [j] + Anz [j]) ;
+
+ for ( ; p < pend ; p++)
+ {
+ /* get the row index of A(i,j) */
+ i = Ai [p] ;
+
+ if (i < j)
+ {
+
+ /* ---------------------------------------------------------- */
+ /* A(i,j) in triu(A), but matching A(j,i) not in tril(A) */
+ /* ---------------------------------------------------------- */
+
+ /* entry A(i,j) is unmatched; it appears in the upper triangular
+ * part, but not the lower triangular part. The matrix is
+ * unsymmetric. */
+ is_hermitian = FALSE ;
+ is_symmetric = FALSE ;
+ is_skew = FALSE ;
+
+ }
+ else if (i == j)
+ {
+
+ /* ---------------------------------------------------------- */
+ /* the diagonal A(j,j) is present; check its value */
+ /* ---------------------------------------------------------- */
+
+ get_value (Ax, Az, p, xtype, &aij_real, &aij_imag) ;
+ if (aij_real != 0. || aij_imag != 0.)
+ {
+ /* diagonal is nonzero; matrix is not skew-symmetric */
+ nzdiag++ ;
+ is_skew = FALSE ;
+ }
+ if (aij_real <= 0. || aij_imag != 0.)
+ {
+ /* diagonal negative or imaginary; not chol candidate */
+ posdiag = FALSE ;
+ }
+ if (aij_imag != 0.)
+ {
+ /* imaginary part is present; not Hermitian */
+ is_hermitian = FALSE ;
+ }
+
+ }
+ else /* i > j */
+ {
+
+ /* ---------------------------------------------------------- */
+ /* consider column i, up to and including row j */
+ /* ---------------------------------------------------------- */
+
+ /* munch the entry at top of column i up to and incl row j */
+ piend = (packed) ? (Ap [i+1]) : (Ap [i] + Anz [i]) ;
+
+ found = FALSE ;
+
+ for ( ; munch [i] < piend ; munch [i]++)
+ {
+
+ i2 = Ai [munch [i]] ;
+
+ if (i2 < j)
+ {
+
+ /* -------------------------------------------------- */
+ /* A(i2,i) in triu(A) but A(i,i2) not in tril(A) */
+ /* -------------------------------------------------- */
+
+ /* The matrix is unsymmetric. */
+ is_hermitian = FALSE ;
+ is_symmetric = FALSE ;
+ is_skew = FALSE ;
+
+ }
+ else if (i2 == j)
+ {
+
+ /* -------------------------------------------------- */
+ /* both A(i,j) and A(j,i) exist in the matrix */
+ /* -------------------------------------------------- */
+
+ /* this is one more matching entry in the pattern */
+ pmatched += 2 ;
+ found = TRUE ;
+
+ /* get the value of A(i,j) */
+ get_value (Ax, Az, p, xtype, &aij_real, &aij_imag) ;
+
+ /* get the value of A(j,i) */
+ get_value (Ax, Az, munch [i],
+ xtype, &aji_real, &aji_imag) ;
+
+ /* compare A(i,j) with A(j,i) */
+ if (aij_real != aji_real || aij_imag != aji_imag)
+ {
+ /* the matrix cannot be symmetric */
+ is_symmetric = FALSE ;
+ }
+ if (aij_real != -aji_real || aij_imag != aji_imag)
+ {
+ /* the matrix cannot be skew-symmetric */
+ is_skew = FALSE ;
+ }
+ if (aij_real != aji_real || aij_imag != -aji_imag)
+ {
+ /* the matrix cannot be Hermitian */
+ is_hermitian = FALSE ;
+ }
+ else
+ {
+ /* A(i,j) and A(j,i) are numerically matched */
+ xmatched += 2 ;
+ }
+
+ }
+ else /* i2 > j */
+ {
+
+ /* -------------------------------------------------- */
+ /* entry A(i2,i) is not munched; consider it later */
+ /* -------------------------------------------------- */
+
+ break ;
+ }
+ }
+
+ if (!found)
+ {
+ /* A(i,j) in tril(A) but A(j,i) not in triu(A).
+ * The matrix is unsymmetric. */
+ is_hermitian = FALSE ;
+ is_symmetric = FALSE ;
+ is_skew = FALSE ;
+ }
+ }
+
+ if (option < 2 && !(is_symmetric || is_skew || is_hermitian))
+ {
+ /* matrix is unsymmetric; terminate the test */
+ return (CHOLMOD_MM_UNSYMMETRIC) ;
+ }
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* quick return if not Cholesky candidate */
+ /* ------------------------------------------------------------------ */
+
+ if (option < 1 && (!posdiag || nzdiag <= j))
+ {
+ /* Diagonal entry not present, or present but negative or with
+ * nonzero imaginary part. Quick return for option 0. */
+ return (CHOLMOD_MM_UNSYMMETRIC) ;
+ }
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* return the results */
+ /* ---------------------------------------------------------------------- */
+
+ if (nzdiag < ncol)
+ {
+ /* not all diagonal entries are present */
+ posdiag = FALSE ;
+ }
+
+ if (option >= 2)
+ {
+ *p_xmatched = xmatched ;
+ *p_pmatched = pmatched ;
+ *p_nzoffdiag = CHOLMOD(nnz) (A, Common) - nzdiag ;
+ *p_nzdiag = nzdiag ;
+ }
+
+ result = CHOLMOD_MM_UNSYMMETRIC ;
+ if (is_hermitian)
+ {
+ /* complex Hermitian matrix, with either pos. or non-pos. diagonal */
+ result = posdiag ? CHOLMOD_MM_HERMITIAN_POSDIAG : CHOLMOD_MM_HERMITIAN ;
+ }
+ else if (is_symmetric)
+ {
+ /* real or complex symmetric matrix, with pos. or non-pos. diagonal */
+ result = posdiag ? CHOLMOD_MM_SYMMETRIC_POSDIAG : CHOLMOD_MM_SYMMETRIC ;
+ }
+ else if (is_skew)
+ {
+ /* real or complex skew-symmetric matrix */
+ result = CHOLMOD_MM_SKEW_SYMMETRIC ;
+ }
+ return (result) ;
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_vertcat.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_vertcat.c
new file mode 100644
index 0000000..5641ae3
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/cholmod_vertcat.c
@@ -0,0 +1,203 @@
+/* ========================================================================== */
+/* === MatrixOps/cholmod_vertcat ============================================ */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* Vertical concatenation, C = [A ; B] in MATLAB notation.
+ *
+ * A and B can be up/lo/unsym; C is unsymmetric and packed.
+ * A and B must have the same number of columns.
+ * C is sorted if both A and B are sorted.
+ *
+ * workspace: Iwork (max (A->nrow, A->ncol, B->nrow, B->ncol)).
+ * allocates temporary copies of A and B if they are symmetric.
+ *
+ * Only pattern and real matrices are supported. Complex and zomplex matrices
+ * are supported only if "values" is FALSE.
+ */
+
+#ifndef NGPL
+#ifndef NMATRIXOPS
+
+#include "cholmod_internal.h"
+#include "cholmod_matrixops.h"
+
+
+/* ========================================================================== */
+/* === cholmod_vertcat ====================================================== */
+/* ========================================================================== */
+
+cholmod_sparse *CHOLMOD(vertcat)
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* left matrix to concatenate */
+ cholmod_sparse *B, /* right matrix to concatenate */
+ int values, /* if TRUE compute the numerical values of C */
+ /* --------------- */
+ cholmod_common *Common
+)
+{
+ double *Ax, *Bx, *Cx ;
+ Int *Ap, *Ai, *Anz, *Bp, *Bi, *Bnz, *Cp, *Ci ;
+ cholmod_sparse *C, *A2, *B2 ;
+ Int apacked, bpacked, anrow, bnrow, ncol, nrow, anz, bnz, nz, j, p, pend,
+ pdest ;
+
+ /* ---------------------------------------------------------------------- */
+ /* check inputs */
+ /* ---------------------------------------------------------------------- */
+
+ RETURN_IF_NULL_COMMON (NULL) ;
+ RETURN_IF_NULL (A, NULL) ;
+ RETURN_IF_NULL (B, NULL) ;
+ values = values &&
+ (A->xtype != CHOLMOD_PATTERN) && (B->xtype != CHOLMOD_PATTERN) ;
+ RETURN_IF_XTYPE_INVALID (A, CHOLMOD_PATTERN,
+ values ? CHOLMOD_REAL : CHOLMOD_ZOMPLEX, NULL) ;
+ RETURN_IF_XTYPE_INVALID (B, CHOLMOD_PATTERN,
+ values ? CHOLMOD_REAL : CHOLMOD_ZOMPLEX, NULL) ;
+ if (A->ncol != B->ncol)
+ {
+ /* A and B must have the same number of columns */
+ ERROR (CHOLMOD_INVALID, "A and B must have same # of columns") ;
+ return (NULL) ;
+ }
+ /* A and B must have the same numerical type if values is TRUE (both must
+ * be CHOLMOD_REAL, this is implicitly checked above) */
+ Common->status = CHOLMOD_OK ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate workspace */
+ /* ---------------------------------------------------------------------- */
+
+ anrow = A->nrow ;
+ bnrow = B->nrow ;
+ ncol = A->ncol ;
+ CHOLMOD(allocate_work) (0, MAX3 (anrow, bnrow, ncol), 0, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (NULL) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+ /* convert A to unsymmetric, if necessary */
+ A2 = NULL ;
+ if (A->stype != 0)
+ {
+ /* workspace: Iwork (max (A->nrow,A->ncol)) */
+ A2 = CHOLMOD(copy) (A, 0, values, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ return (NULL) ;
+ }
+ A = A2 ;
+ }
+
+ /* convert B to unsymmetric, if necessary */
+ B2 = NULL ;
+ if (B->stype != 0)
+ {
+ /* workspace: Iwork (max (B->nrow,B->ncol)) */
+ B2 = CHOLMOD(copy) (B, 0, values, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ return (NULL) ;
+ }
+ B = B2 ;
+ }
+
+ Ap = A->p ;
+ Anz = A->nz ;
+ Ai = A->i ;
+ Ax = A->x ;
+ apacked = A->packed ;
+
+ Bp = B->p ;
+ Bnz = B->nz ;
+ Bi = B->i ;
+ Bx = B->x ;
+ bpacked = B->packed ;
+
+ /* ---------------------------------------------------------------------- */
+ /* allocate C */
+ /* ---------------------------------------------------------------------- */
+
+ anz = CHOLMOD(nnz) (A, Common) ;
+ bnz = CHOLMOD(nnz) (B, Common) ;
+ nrow = anrow + bnrow ;
+ nz = anz + bnz ;
+
+ C = CHOLMOD(allocate_sparse) (nrow, ncol, nz, A->sorted && B->sorted, TRUE,
+ 0, values ? A->xtype : CHOLMOD_PATTERN, Common) ;
+ if (Common->status < CHOLMOD_OK)
+ {
+ /* out of memory */
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ return (NULL) ;
+ }
+ Cp = C->p ;
+ Ci = C->i ;
+ Cx = C->x ;
+
+ /* ---------------------------------------------------------------------- */
+ /* C = [A ; B] */
+ /* ---------------------------------------------------------------------- */
+
+ pdest = 0 ;
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* attach A(:,j) as the first part of C(:,j) */
+ p = Ap [j] ;
+ pend = (apacked) ? (Ap [j+1]) : (p + Anz [j]) ;
+ Cp [j] = pdest ;
+ for ( ; p < pend ; p++)
+ {
+ Ci [pdest] = Ai [p] ;
+ if (values)
+ {
+ Cx [pdest] = Ax [p] ;
+ }
+ pdest++ ;
+ }
+
+ /* attach B(:,j) as the second part of C(:,j) */
+ p = Bp [j] ;
+ pend = (bpacked) ? (Bp [j+1]) : (p + Bnz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ Ci [pdest] = Bi [p] + anrow ;
+ if (values)
+ {
+ Cx [pdest] = Bx [p] ;
+ }
+ pdest++ ;
+ }
+ }
+ Cp [ncol] = pdest ;
+ ASSERT (pdest == nz) ;
+
+ /* ---------------------------------------------------------------------- */
+ /* free the unsymmetric copies of A and B, and return C */
+ /* ---------------------------------------------------------------------- */
+
+ CHOLMOD(free_sparse) (&A2, Common) ;
+ CHOLMOD(free_sparse) (&B2, Common) ;
+ return (C) ;
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/gpl.txt b/src/C/SuiteSparse/CHOLMOD/MatrixOps/gpl.txt
new file mode 100644
index 0000000..3912109
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/gpl.txt
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/src/C/SuiteSparse/CHOLMOD/MatrixOps/t_cholmod_sdmult.c b/src/C/SuiteSparse/CHOLMOD/MatrixOps/t_cholmod_sdmult.c
new file mode 100644
index 0000000..7ddd3b6
--- /dev/null
+++ b/src/C/SuiteSparse/CHOLMOD/MatrixOps/t_cholmod_sdmult.c
@@ -0,0 +1,726 @@
+/* ========================================================================== */
+/* === MatrixOps/t_cholmod_sdmult =========================================== */
+/* ========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * CHOLMOD/MatrixOps Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * The CHOLMOD/MatrixOps Module is licensed under Version 2.0 of the GNU
+ * General Public License. See gpl.txt for a text of the license.
+ * CHOLMOD is also available under other licenses; contact authors for details.
+ * http://www.suitesparse.com
+ * -------------------------------------------------------------------------- */
+
+/* Template routine for cholmod_sdmult */
+
+#include "cholmod_template.h"
+
+#undef ADVANCE
+
+#ifdef REAL
+#define ADVANCE(x,z,d) x += d
+#elif defined (COMPLEX)
+#define ADVANCE(x,z,d) x += 2*d
+#else
+#define ADVANCE(x,z,d) x += d ; z += d
+#endif
+
+/* ========================================================================== */
+/* === t_cholmod_sdmult ===================================================== */
+/* ========================================================================== */
+
+static void TEMPLATE (cholmod_sdmult)
+(
+ /* ---- input ---- */
+ cholmod_sparse *A, /* sparse matrix to multiply */
+ int transpose, /* use A if 0, or A' otherwise */
+ double alpha [2], /* scale factor for A */
+ double beta [2], /* scale factor for Y */
+ cholmod_dense *X, /* dense matrix to multiply */
+ /* ---- in/out --- */
+ cholmod_dense *Y, /* resulting dense matrix */
+ /* -- workspace -- */
+ double *W /* size 4*nx if needed, twice that for c/zomplex case */
+)
+{
+
+ double yx [8], xx [8], ax [2] ;
+#ifdef ZOMPLEX
+ double yz [4], xz [4], az [1] ;
+ double betaz [1], alphaz [1] ;
+#endif
+
+ double *Ax, *Az, *Xx, *Xz, *Yx, *Yz, *w, *Wz ;
+ Int *Ap, *Ai, *Anz ;
+ size_t nx, ny, dx, dy ;
+ Int packed, nrow, ncol, j, k, p, pend, kcol, i ;
+
+ /* ---------------------------------------------------------------------- */
+ /* get inputs */
+ /* ---------------------------------------------------------------------- */
+
+#ifdef ZOMPLEX
+ betaz [0] = beta [1] ;
+ alphaz [0] = alpha [1] ;
+#endif
+
+ ny = transpose ? A->ncol : A->nrow ; /* required length of Y */
+ nx = transpose ? A->nrow : A->ncol ; /* required length of X */
+
+ nrow = A->nrow ;
+ ncol = A->ncol ;
+
+ Ap = A->p ;
+ Anz = A->nz ;
+ Ai = A->i ;
+ Ax = A->x ;
+ Az = A->z ;
+ packed = A->packed ;
+ Xx = X->x ;
+ Xz = X->z ;
+ Yx = Y->x ;
+ Yz = Y->z ;
+ kcol = X->ncol ;
+ dy = Y->d ;
+ dx = X->d ;
+ w = W ;
+ Wz = W + 4*nx ;
+
+ /* ---------------------------------------------------------------------- */
+ /* Y = beta * Y */
+ /* ---------------------------------------------------------------------- */
+
+ if (ENTRY_IS_ZERO (beta, betaz, 0))
+ {
+ for (k = 0 ; k < kcol ; k++)
+ {
+ for (i = 0 ; i < ((Int) ny) ; i++)
+ {
+ /* y [i] = 0. ; */
+ CLEAR (Yx, Yz, i) ;
+ }
+ /* y += dy ; */
+ ADVANCE (Yx,Yz,dy) ;
+ }
+ }
+ else if (!ENTRY_IS_ONE (beta, betaz, 0))
+ {
+ for (k = 0 ; k < kcol ; k++)
+ {
+ for (i = 0 ; i < ((Int) ny) ; i++)
+ {
+ /* y [i] *= beta [0] ; */
+ MULT (Yx,Yz,i, Yx,Yz,i, beta,betaz, 0) ;
+ }
+ /* y += dy ; */
+ ADVANCE (Yx,Yz,dy) ;
+ }
+ }
+
+ if (ENTRY_IS_ZERO (alpha, alphaz, 0))
+ {
+ /* nothing else to do */
+ return ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* Y += alpha * op(A) * X, where op(A)=A or A' */
+ /* ---------------------------------------------------------------------- */
+
+ Yx = Y->x ;
+ Yz = Y->z ;
+
+ k = 0 ;
+
+ if (A->stype == 0)
+ {
+
+ if (transpose)
+ {
+
+ /* -------------------------------------------------------------- */
+ /* Y += alpha * A' * x, unsymmetric case */
+ /* -------------------------------------------------------------- */
+
+ if (kcol % 4 == 1)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* yj = 0. ; */
+ CLEAR (yx, yz, 0) ;
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ /* yj += conj(Ax [p]) * x [Ai [p]] ; */
+ i = Ai [p] ;
+ ASSIGN_CONJ (ax,az,0, Ax,Az,p) ;
+ MULTADD (yx,yz,0, ax,az,0, Xx,Xz,i) ;
+ }
+ /* y [j] += alpha [0] * yj ; */
+ MULTADD (Yx,Yz,j, alpha,alphaz,0, yx,yz,0) ;
+ }
+ /* y += dy ; */
+ /* x += dx ; */
+ ADVANCE (Yx,Yz,dy) ;
+ ADVANCE (Xx,Xz,dx) ;
+ k++ ;
+
+ }
+ else if (kcol % 4 == 2)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* yj0 = 0. ; */
+ /* yj1 = 0. ; */
+ CLEAR (yx,yz,0) ;
+ CLEAR (yx,yz,1) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ /* aij = conj (Ax [p]) ; */
+ ASSIGN_CONJ (ax,az,0, Ax,Az,p) ;
+
+ /* yj0 += aij * x [i ] ; */
+ /* yj1 += aij * x [i+dx] ; */
+ MULTADD (yx,yz,0, ax,az,0, Xx,Xz,i) ;
+ MULTADD (yx,yz,1, ax,az,0, Xx,Xz,i+dx) ;
+ }
+ /* y [j ] += alpha [0] * yj0 ; */
+ /* y [j+dy] += alpha [0] * yj1 ; */
+ MULTADD (Yx,Yz,j, alpha,alphaz,0, yx,yz,0) ;
+ MULTADD (Yx,Yz,j+dy, alpha,alphaz,0, yx,yz,1) ;
+ }
+ /* y += 2*dy ; */
+ /* x += 2*dx ; */
+ ADVANCE (Yx,Yz,2*dy) ;
+ ADVANCE (Xx,Xz,2*dx) ;
+ k += 2 ;
+
+ }
+ else if (kcol % 4 == 3)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* yj0 = 0. ; */
+ /* yj1 = 0. ; */
+ /* yj2 = 0. ; */
+ CLEAR (yx,yz,0) ;
+ CLEAR (yx,yz,1) ;
+ CLEAR (yx,yz,2) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ /* aij = conj (Ax [p]) ; */
+ ASSIGN_CONJ (ax,az,0, Ax,Az,p) ;
+
+ /* yj0 += aij * x [i ] ; */
+ /* yj1 += aij * x [i+ dx] ; */
+ /* yj2 += aij * x [i+2*dx] ; */
+ MULTADD (yx,yz,0, ax,az,0, Xx,Xz,i) ;
+ MULTADD (yx,yz,1, ax,az,0, Xx,Xz,i+dx) ;
+ MULTADD (yx,yz,2, ax,az,0, Xx,Xz,i+2*dx) ;
+ }
+ /* y [j ] += alpha [0] * yj0 ; */
+ /* y [j+ dy] += alpha [0] * yj1 ; */
+ /* y [j+2*dy] += alpha [0] * yj2 ; */
+ MULTADD (Yx,Yz,j, alpha,alphaz,0, yx,yz,0) ;
+ MULTADD (Yx,Yz,j+dy, alpha,alphaz,0, yx,yz,1) ;
+ MULTADD (Yx,Yz,j+2*dy, alpha,alphaz,0, yx,yz,2) ;
+ }
+ /* y += 3*dy ; */
+ /* x += 3*dx ; */
+ ADVANCE (Yx,Yz,3*dy) ;
+ ADVANCE (Xx,Xz,3*dx) ;
+ k += 3 ;
+ }
+
+ for ( ; k < kcol ; k += 4)
+ {
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* yj0 = 0. ; */
+ /* yj1 = 0. ; */
+ /* yj2 = 0. ; */
+ /* yj3 = 0. ; */
+ CLEAR (yx,yz,0) ;
+ CLEAR (yx,yz,1) ;
+ CLEAR (yx,yz,2) ;
+ CLEAR (yx,yz,3) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ /* aij = conj(Ax [p]) ; */
+ ASSIGN_CONJ (ax,az,0, Ax,Az,p) ;
+
+ /* yj0 += aij * x [i ] ; */
+ /* yj1 += aij * x [i+ dx] ; */
+ /* yj2 += aij * x [i+2*dx] ; */
+ /* yj3 += aij * x [i+3*dx] ; */
+ MULTADD (yx,yz,0, ax,az,0, Xx,Xz,i) ;
+ MULTADD (yx,yz,1, ax,az,0, Xx,Xz,i+dx) ;
+ MULTADD (yx,yz,2, ax,az,0, Xx,Xz,i+2*dx) ;
+ MULTADD (yx,yz,3, ax,az,0, Xx,Xz,i+3*dx) ;
+
+ }
+ /* y [j ] += alpha [0] * yj0 ; */
+ /* y [j+ dy] += alpha [0] * yj1 ; */
+ /* y [j+2*dy] += alpha [0] * yj2 ; */
+ /* y [j+3*dy] += alpha [0] * yj3 ; */
+ MULTADD (Yx,Yz,j, alpha,alphaz,0, yx,yz,0) ;
+ MULTADD (Yx,Yz,j+dy, alpha,alphaz,0, yx,yz,1) ;
+ MULTADD (Yx,Yz,j+2*dy, alpha,alphaz,0, yx,yz,2) ;
+ MULTADD (Yx,Yz,j+3*dy, alpha,alphaz,0, yx,yz,3) ;
+ }
+ /* y += 4*dy ; */
+ /* x += 4*dx ; */
+ ADVANCE (Yx,Yz,4*dy) ;
+ ADVANCE (Xx,Xz,4*dx) ;
+ }
+
+ }
+ else
+ {
+
+ /* -------------------------------------------------------------- */
+ /* Y += alpha * A * x, unsymmetric case */
+ /* -------------------------------------------------------------- */
+
+ if (kcol % 4 == 1)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* xj = alpha [0] * x [j] ; */
+ MULT (xx,xz,0, alpha,alphaz,0, Xx,Xz,j) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ /* y [Ai [p]] += Ax [p] * xj ; */
+ i = Ai [p] ;
+ MULTADD (Yx,Yz,i, Ax,Az,p, xx,xz,0) ;
+ }
+ }
+ /* y += dy ; */
+ /* x += dx ; */
+ ADVANCE (Yx,Yz,dy) ;
+ ADVANCE (Xx,Xz,dx) ;
+ k++ ;
+
+ }
+ else if (kcol % 4 == 2)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* xj0 = alpha [0] * x [j ] ; */
+ /* xj1 = alpha [0] * x [j+dx] ; */
+ MULT (xx,xz,0, alpha,alphaz,0, Xx,Xz,j) ;
+ MULT (xx,xz,1, alpha,alphaz,0, Xx,Xz,j+dx) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i ] += aij * xj0 ; */
+ /* y [i+dy] += aij * xj1 ; */
+ MULTADD (Yx,Yz,i, ax,az,0, xx,xz,0) ;
+ MULTADD (Yx,Yz,i+dy, ax,az,0, xx,xz,1) ;
+ }
+ }
+ /* y += 2*dy ; */
+ /* x += 2*dx ; */
+ ADVANCE (Yx,Yz,2*dy) ;
+ ADVANCE (Xx,Xz,2*dx) ;
+ k += 2 ;
+
+ }
+ else if (kcol % 4 == 3)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* xj0 = alpha [0] * x [j ] ; */
+ /* xj1 = alpha [0] * x [j+ dx] ; */
+ /* xj2 = alpha [0] * x [j+2*dx] ; */
+ MULT (xx,xz,0, alpha,alphaz,0, Xx,Xz,j) ;
+ MULT (xx,xz,1, alpha,alphaz,0, Xx,Xz,j+dx) ;
+ MULT (xx,xz,2, alpha,alphaz,0, Xx,Xz,j+2*dx) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i ] += aij * xj0 ; */
+ /* y [i+ dy] += aij * xj1 ; */
+ /* y [i+2*dy] += aij * xj2 ; */
+ MULTADD (Yx,Yz,i, ax,az,0, xx,xz,0) ;
+ MULTADD (Yx,Yz,i+dy, ax,az,0, xx,xz,1) ;
+ MULTADD (Yx,Yz,i+2*dy, ax,az,0, xx,xz,2) ;
+ }
+ }
+ /* y += 3*dy ; */
+ /* x += 3*dx ; */
+ ADVANCE (Yx,Yz,3*dy) ;
+ ADVANCE (Xx,Xz,3*dx) ;
+ k += 3 ;
+ }
+
+ for ( ; k < kcol ; k += 4)
+ {
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* xj0 = alpha [0] * x [j ] ; */
+ /* xj1 = alpha [0] * x [j+ dx] ; */
+ /* xj2 = alpha [0] * x [j+2*dx] ; */
+ /* xj3 = alpha [0] * x [j+3*dx] ; */
+ MULT (xx,xz,0, alpha,alphaz,0, Xx,Xz,j) ;
+ MULT (xx,xz,1, alpha,alphaz,0, Xx,Xz,j+dx) ;
+ MULT (xx,xz,2, alpha,alphaz,0, Xx,Xz,j+2*dx) ;
+ MULT (xx,xz,3, alpha,alphaz,0, Xx,Xz,j+3*dx) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i ] += aij * xj0 ; */
+ /* y [i+ dy] += aij * xj1 ; */
+ /* y [i+2*dy] += aij * xj2 ; */
+ /* y [i+3*dy] += aij * xj3 ; */
+ MULTADD (Yx,Yz,i, ax,az,0, xx,xz,0) ;
+ MULTADD (Yx,Yz,i+dy, ax,az,0, xx,xz,1) ;
+ MULTADD (Yx,Yz,i+2*dy, ax,az,0, xx,xz,2) ;
+ MULTADD (Yx,Yz,i+3*dy, ax,az,0, xx,xz,3) ;
+ }
+ }
+ /* y += 4*dy ; */
+ /* x += 4*dx ; */
+ ADVANCE (Yx,Yz,4*dy) ;
+ ADVANCE (Xx,Xz,4*dx) ;
+ }
+ }
+
+ }
+ else
+ {
+
+ /* ------------------------------------------------------------------ */
+ /* Y += alpha * (A or A') * x, symmetric case (upper/lower) */
+ /* ------------------------------------------------------------------ */
+
+ /* Only the upper/lower triangular part and the diagonal of A is used.
+ * Since both x and y are written to in the innermost loop, this
+ * code can experience cache bank conflicts if x is used directly.
+ * Thus, a copy is made of x, four columns at a time, if x has
+ * four or more columns.
+ */
+
+ if (kcol % 4 == 1)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* yj = 0. ; */
+ CLEAR (yx,yz,0) ;
+
+ /* xj = alpha [0] * x [j] ; */
+ MULT (xx,xz,0, alpha,alphaz,0, Xx,Xz,j) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ if (i == j)
+ {
+ /* y [i] += Ax [p] * xj ; */
+ MULTADD (Yx,Yz,i, Ax,Az,p, xx,xz,0) ;
+ }
+ else if ((A->stype > 0 && i < j) || (A->stype < 0 && i > j))
+ {
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i] += aij * xj ; */
+ /* yj += aij * x [i] ; */
+ MULTADD (Yx,Yz,i, ax,az,0, xx,xz,0) ;
+ MULTADDCONJ (yx,yz,0, ax,az,0, Xx,Xz,i) ;
+
+
+ }
+ }
+ /* y [j] += alpha [0] * yj ; */
+ MULTADD (Yx,Yz,j, alpha,alphaz,0, yx,yz,0) ;
+
+ }
+ /* y += dy ; */
+ /* x += dx ; */
+ ADVANCE (Yx,Yz,dy) ;
+ ADVANCE (Xx,Xz,dx) ;
+ k++ ;
+
+ }
+ else if (kcol % 4 == 2)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* yj0 = 0. ; */
+ /* yj1 = 0. ; */
+ CLEAR (yx,yz,0) ;
+ CLEAR (yx,yz,1) ;
+
+ /* xj0 = alpha [0] * x [j ] ; */
+ /* xj1 = alpha [0] * x [j+dx] ; */
+ MULT (xx,xz,0, alpha,alphaz,0, Xx,Xz,j) ;
+ MULT (xx,xz,1, alpha,alphaz,0, Xx,Xz,j+dx) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ if (i == j)
+ {
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i ] += aij * xj0 ; */
+ /* y [i+dy] += aij * xj1 ; */
+ MULTADD (Yx,Yz,i, ax,az,0, xx,xz,0) ;
+ MULTADD (Yx,Yz,i+dy, ax,az,0, xx,xz,1) ;
+
+ }
+ else if ((A->stype > 0 && i < j) || (A->stype < 0 && i > j))
+ {
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i ] += aij * xj0 ; */
+ /* y [i+dy] += aij * xj1 ; */
+ /* yj0 += aij * x [i ] ; */
+ /* yj1 += aij * x [i+dx] ; */
+ MULTADD (Yx,Yz,i, ax,az,0, xx,xz,0) ;
+ MULTADD (Yx,Yz,i+dy, ax,az,0, xx,xz,1) ;
+ MULTADDCONJ (yx,yz,0, ax,az,0, Xx,Xz,i) ;
+ MULTADDCONJ (yx,yz,1, ax,az,0, Xx,Xz,i+dx) ;
+
+ }
+ }
+ /* y [j ] += alpha [0] * yj0 ; */
+ /* y [j+dy] += alpha [0] * yj1 ; */
+ MULTADD (Yx,Yz,j, alpha,alphaz,0, yx,yz,0) ;
+ MULTADD (Yx,Yz,j+dy, alpha,alphaz,0, yx,yz,1) ;
+
+ }
+ /* y += 2*dy ; */
+ /* x += 2*dx ; */
+ ADVANCE (Yx,Yz,2*dy) ;
+ ADVANCE (Xx,Xz,2*dx) ;
+ k += 2 ;
+
+ }
+ else if (kcol % 4 == 3)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* yj0 = 0. ; */
+ /* yj1 = 0. ; */
+ /* yj2 = 0. ; */
+ CLEAR (yx,yz,0) ;
+ CLEAR (yx,yz,1) ;
+ CLEAR (yx,yz,2) ;
+
+ /* xj0 = alpha [0] * x [j ] ; */
+ /* xj1 = alpha [0] * x [j+ dx] ; */
+ /* xj2 = alpha [0] * x [j+2*dx] ; */
+ MULT (xx,xz,0, alpha,alphaz,0, Xx,Xz,j) ;
+ MULT (xx,xz,1, alpha,alphaz,0, Xx,Xz,j+dx) ;
+ MULT (xx,xz,2, alpha,alphaz,0, Xx,Xz,j+2*dx) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ if (i == j)
+ {
+
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i ] += aij * xj0 ; */
+ /* y [i+ dy] += aij * xj1 ; */
+ /* y [i+2*dy] += aij * xj2 ; */
+ MULTADD (Yx,Yz,i, ax,az,0, xx,xz,0) ;
+ MULTADD (Yx,Yz,i+dy, ax,az,0, xx,xz,1) ;
+ MULTADD (Yx,Yz,i+2*dy, ax,az,0, xx,xz,2) ;
+
+ }
+ else if ((A->stype > 0 && i < j) || (A->stype < 0 && i > j))
+ {
+
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i ] += aij * xj0 ; */
+ /* y [i+ dy] += aij * xj1 ; */
+ /* y [i+2*dy] += aij * xj2 ; */
+ /* yj0 += aij * x [i ] ; */
+ /* yj1 += aij * x [i+ dx] ; */
+ /* yj2 += aij * x [i+2*dx] ; */
+ MULTADD (Yx,Yz,i, ax,az,0, xx,xz,0) ;
+ MULTADD (Yx,Yz,i+dy, ax,az,0, xx,xz,1) ;
+ MULTADD (Yx,Yz,i+2*dy, ax,az,0, xx,xz,2) ;
+ MULTADDCONJ (yx,yz,0, ax,az,0, Xx,Xz,i) ;
+ MULTADDCONJ (yx,yz,1, ax,az,0, Xx,Xz,i+dx) ;
+ MULTADDCONJ (yx,yz,2, ax,az,0, Xx,Xz,i+2*dx) ;
+
+ }
+ }
+ /* y [j ] += alpha [0] * yj0 ; */
+ /* y [j+ dy] += alpha [0] * yj1 ; */
+ /* y [j+2*dy] += alpha [0] * yj2 ; */
+ MULTADD (Yx,Yz,j, alpha,alphaz,0, yx,yz,0) ;
+ MULTADD (Yx,Yz,j+dy, alpha,alphaz,0, yx,yz,1) ;
+ MULTADD (Yx,Yz,j+2*dy, alpha,alphaz,0, yx,yz,2) ;
+
+ }
+ /* y += 3*dy ; */
+ /* x += 3*dx ; */
+ ADVANCE (Yx,Yz,3*dy) ;
+ ADVANCE (Xx,Xz,3*dx) ;
+
+ k += 3 ;
+ }
+
+ /* copy four columns of X into W, and put in row form */
+ for ( ; k < kcol ; k += 4)
+ {
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* w [4*j ] = x [j ] ; */
+ /* w [4*j+1] = x [j+ dx] ; */
+ /* w [4*j+2] = x [j+2*dx] ; */
+ /* w [4*j+3] = x [j+3*dx] ; */
+ ASSIGN (w,Wz,4*j , Xx,Xz,j ) ;
+ ASSIGN (w,Wz,4*j+1, Xx,Xz,j+dx ) ;
+ ASSIGN (w,Wz,4*j+2, Xx,Xz,j+2*dx) ;
+ ASSIGN (w,Wz,4*j+3, Xx,Xz,j+3*dx) ;
+ }
+
+ for (j = 0 ; j < ncol ; j++)
+ {
+ /* yj0 = 0. ; */
+ /* yj1 = 0. ; */
+ /* yj2 = 0. ; */
+ /* yj3 = 0. ; */
+ CLEAR (yx,yz,0) ;
+ CLEAR (yx,yz,1) ;
+ CLEAR (yx,yz,2) ;
+ CLEAR (yx,yz,3) ;
+
+ /* xj0 = alpha [0] * w [4*j ] ; */
+ /* xj1 = alpha [0] * w [4*j+1] ; */
+ /* xj2 = alpha [0] * w [4*j+2] ; */
+ /* xj3 = alpha [0] * w [4*j+3] ; */
+ MULT (xx,xz,0, alpha,alphaz,0, w,Wz,4*j) ;
+ MULT (xx,xz,1, alpha,alphaz,0, w,Wz,4*j+1) ;
+ MULT (xx,xz,2, alpha,alphaz,0, w,Wz,4*j+2) ;
+ MULT (xx,xz,3, alpha,alphaz,0, w,Wz,4*j+3) ;
+
+ p = Ap [j] ;
+ pend = (packed) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ if (i == j)
+ {
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i ] += aij * xj0 ; */
+ /* y [i+ dy] += aij * xj1 ; */
+ /* y [i+2*dy] += aij * xj2 ; */
+ /* y [i+3*dy] += aij * xj3 ; */
+ MULTADD (Yx,Yz,i , ax,az,0, xx,xz,0) ;
+ MULTADD (Yx,Yz,i+dy , ax,az,0, xx,xz,1) ;
+ MULTADD (Yx,Yz,i+2*dy, ax,az,0, xx,xz,2) ;
+ MULTADD (Yx,Yz,i+3*dy, ax,az,0, xx,xz,3) ;
+
+ }
+ else if ((A->stype > 0 && i < j) || (A->stype < 0 && i > j))
+ {
+ /* aij = Ax [p] ; */
+ ASSIGN (ax,az,0, Ax,Az,p) ;
+
+ /* y [i ] += aij * xj0 ; */
+ /* y [i+ dy] += aij * xj1 ; */
+ /* y [i+2*dy] += aij * xj2 ; */
+ /* y [i+3*dy] += aij * xj3 ; */
+ /* yj0 += aij * w [4*i ] ; */
+ /* yj1 += aij * w [4*i+1] ; */
+ /* yj2 += aij * w [4*i+2] ; */
+ /* yj3 += aij * w [4*i+3] ; */
+ MULTADD (Yx,Yz,i, ax,az,0, xx,xz,0) ;
+ MULTADD (Yx,Yz,i+dy, ax,az,0, xx,xz,1) ;
+ MULTADD (Yx,Yz,i+2*dy, ax,az,0, xx,xz,2) ;
+ MULTADD (Yx,Yz,i+3*dy, ax,az,0, xx,xz,3) ;
+ MULTADDCONJ (yx,yz,0, ax,az,0, w,Wz,4*i) ;
+ MULTADDCONJ (yx,yz,1, ax,az,0, w,Wz,4*i+1) ;
+ MULTADDCONJ (yx,yz,2, ax,az,0, w,Wz,4*i+2) ;
+ MULTADDCONJ (yx,yz,3, ax,az,0, w,Wz,4*i+3) ;
+
+ }
+ }
+ /* y [j ] += alpha [0] * yj0 ; */
+ /* y [j+ dy] += alpha [0] * yj1 ; */
+ /* y [j+2*dy] += alpha [0] * yj2 ; */
+ /* y [j+3*dy] += alpha [0] * yj3 ; */
+ MULTADD (Yx,Yz,j , alpha,alphaz,0, yx,yz,0) ;
+ MULTADD (Yx,Yz,j+dy , alpha,alphaz,0, yx,yz,1) ;
+ MULTADD (Yx,Yz,j+2*dy, alpha,alphaz,0, yx,yz,2) ;
+ MULTADD (Yx,Yz,j+3*dy, alpha,alphaz,0, yx,yz,3) ;
+
+ }
+ /* y += 4*dy ; */
+ /* x += 4*dx ; */
+ ADVANCE (Yx,Yz,4*dy) ;
+ ADVANCE (Xx,Xz,4*dx) ;
+
+ }
+ }
+}
+
+
+#undef PATTERN
+#undef REAL
+#undef COMPLEX
+#undef ZOMPLEX
diff --git a/src/C/SuiteSparse/CHOLMOD/README.txt b/src/C/SuiteSparse/CHOLMOD/README.txt
index 84fb2bd..212b0dd 100644
--- a/src/C/SuiteSparse/CHOLMOD/README.txt
+++ b/src/C/SuiteSparse/CHOLMOD/README.txt
@@ -1,5 +1,5 @@
-CHOLMOD: a sparse CHOLesky MODification package
-Version 1.7.1, March 24, 2009. Copyright (c) 2005-2009.
+CHOLMOD: a sparse CHOLesky MODification package, Copyright (c) 2005-2014.
+http://www.suitesparse.com
-----------------------------------------------
CHOLMOD is a set of routines for factorizing sparse symmetric positive
@@ -18,9 +18,9 @@ Some Modules of CHOLMOD are copyrighted by the University of Florida (the
Core and Partition Modules). The rest are copyrighted by the authors:
Timothy A. Davis (all of them), and William W. Hager (the Modify Module).
-CHOLMOD relies on several other packages: AMD, CAMD, COLAMD, CCOLAMD, UFconfig,
-METIS, the BLAS, and LAPACK. All but METIS, the BLAS, and LAPACK are part of
-SuiteSparse.
+CHOLMOD relies on several other packages: AMD, CAMD, COLAMD, CCOLAMD,
+SuiteSparse_config, METIS, the BLAS, and LAPACK. All but METIS, the BLAS, and
+LAPACK are part of SuiteSparse.
AMD is authored by T. Davis, Iain Duff, and Patrick Amestoy.
COLAMD is authored by T. Davis and Stefan Larimore, with algorithmic design
@@ -37,7 +37,8 @@ Place a copy of the metis-4.0 directory in the same directory that
contains the CHOLMOD, AMD, COLAMD, and CCOLAMD directories prior to compiling
with "make".
-If you do not wish to use METIS, you must edit UFconfig and change the line:
+If you do not wish to use METIS, you must edit SuiteSparse_config and change
+the line:
CHOLMOD_CONFIG =
@@ -45,12 +46,12 @@ to
CHOLMOD_CONFIG = -DNPARTITION
-The CHOLMOD, AMD, COLAMD, CCOLAMD, and UFconfig directories must all reside
-in a common parent directory. To compile all these libraries,
-edit UFconfig/UFconfig.mk to reflect your environment (C compiler, location
-of the BLAS, and so on) and then type "make" in either the CHOLMOD directory
-or in the parent directory of CHOLMOD. See each package for more details on
-how to compile them.
+The CHOLMOD, AMD, COLAMD, CCOLAMD, and SuiteSparse)config directories must all
+reside in a common parent directory. To compile all these libraries, edit
+SuiteSparse)config/SuiteSparse)config.mk to reflect your environment (C
+compiler, location of the BLAS, and so on) and then type "make" in either the
+CHOLMOD directory or in the parent directory of CHOLMOD. See each package for
+more details on how to compile them.
For use in MATLAB (on any system, including Windows): start MATLAB,
cd to the CHOLMOD/MATLAB directory, and type cholmod_make in the MATLAB
@@ -61,10 +62,6 @@ also ensures your mexFunctions are compiled with -fexceptions, so that
exceptions are handled properly (when hitting control-C in the MATLAB command
window, for example).
-If you have MATLAB 7.2 or earlier and use "make mex", you must first edit
-UFconfig/UFconfig.h to remove the "-largeArrayDims" option from the MEX command
-(or just use cholmod_make.m inside MATLAB).
-
On the Pentium, do NOT use the Intel MKL BLAS prior to MKL Version 8.0 with
CHOLMOD. Older versions (prior to 8.0) have a bug in dgemm when computing
A*B'. The bug generates a NaN result, when the inputs are well-defined. Use
diff --git a/src/C/SuiteSparse/CHOLMOD/Supernodal/License.txt b/src/C/SuiteSparse/CHOLMOD/Supernodal/License.txt
index 668c929..d6b6abf 100644
--- a/src/C/SuiteSparse/CHOLMOD/Supernodal/License.txt
+++ b/src/C/SuiteSparse/CHOLMOD/Supernodal/License.txt
@@ -1,7 +1,7 @@
CHOLMOD/Supernodal Module.
Copyright (C) 2005-2006, Timothy A. Davis
CHOLMOD is also available under other licenses; contact authors for details.
-http://www.cise.ufl.edu/research/sparse
+http://www.suitesparse.com
Note that this license is for the CHOLMOD/Supernodal module only.
All CHOLMOD modules are licensed separately.
diff --git a/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_numeric.c b/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_numeric.c
index 93d33a2..7cfee27 100644
--- a/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_numeric.c
+++ b/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_numeric.c
@@ -7,7 +7,7 @@
* The CHOLMOD/Supernodal Module is licensed under Version 2.0 of the GNU
* General Public License. See gpl.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* Computes the Cholesky factorization of A+beta*I or A*F+beta*I. Only the
@@ -45,7 +45,7 @@
* diagonal entry is set to zero (this includes columns to the left of L->minor
* in the same supernode), as are all subsequent supernodes.
*
- * workspace: Flag (nrow), Head (nrow+1), Iwork (2*nrow + 4*nsuper).
+ * workspace: Flag (nrow), Head (nrow+1), Iwork (2*nrow + 5*nsuper).
* Allocates temporary space of size L->maxcsize * sizeof(double)
* (twice that for the complex/zomplex case).
*
@@ -56,15 +56,31 @@
* must match.
*/
+#ifndef NGPL
#ifndef NSUPERNODAL
#include "cholmod_internal.h"
#include "cholmod_supernodal.h"
+#ifdef GPU_BLAS
+#include "cholmod_gpu.h"
+#endif
+
/* ========================================================================== */
-/* === TEMPLATE ============================================================= */
+/* === TEMPLATE codes for GPU and regular numeric factorization ============= */
/* ========================================================================== */
+#ifdef DLONG
+#ifdef GPU_BLAS
+#define REAL
+#include "../GPU/t_cholmod_gpu.c"
+#define COMPLEX
+#include "../GPU/t_cholmod_gpu.c"
+#define ZOMPLEX
+/* no #include of "../GPU/t_cholmod_gpu.c". Zomplex case relies on complex */
+#endif
+#endif
+
#define REAL
#include "t_cholmod_super_numeric.c"
#define COMPLEX
@@ -173,9 +189,9 @@ int CHOLMOD(super_numeric)
PRINT1 (("nsuper "ID" maxcsize %g\n", nsuper, (double) maxcsize)) ;
ASSERT (nsuper >= 0 && maxcsize > 0) ;
- /* w = 2*n + 4*nsuper */
+ /* w = 2*n + 5*nsuper */
w = CHOLMOD(mult_size_t) (n, 2, &ok) ;
- t = CHOLMOD(mult_size_t) (nsuper, 4, &ok) ;
+ t = CHOLMOD(mult_size_t) (nsuper, 5, &ok) ;
w = CHOLMOD(add_size_t) (w, t, &ok) ;
if (!ok)
{
@@ -294,3 +310,4 @@ int CHOLMOD(super_numeric)
return (ok) ;
}
#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_solve.c b/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_solve.c
index 52a870c..ff5bf00 100644
--- a/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_solve.c
+++ b/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_solve.c
@@ -7,7 +7,7 @@
* The CHOLMOD/Supernodal Module is licensed under Version 2.0 of the GNU
* General Public License. See gpl.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* Solve Lx=b or L'x=b for a supernodal factorization. These routines do not
@@ -15,6 +15,7 @@
* interface that performs that operation.
*/
+#ifndef NGPL
#ifndef NSUPERNODAL
#include "cholmod_internal.h"
@@ -214,3 +215,4 @@ int CHOLMOD(super_ltsolve) /* TRUE if OK, FALSE if BLAS overflow occured */
return (Common->blas_ok) ;
}
#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_symbolic.c b/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_symbolic.c
index e8f1b5d..72491b8 100644
--- a/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_symbolic.c
+++ b/src/C/SuiteSparse/CHOLMOD/Supernodal/cholmod_super_symbolic.c
@@ -7,7 +7,7 @@
* The CHOLMOD/Supernodal Module is licensed under Version 2.0 of the GNU
* General Public License. See gpl.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* Supernodal symbolic analysis of the LL' factorization of A, A*A',
@@ -40,11 +40,15 @@
* Supports any xtype (pattern, real, complex, or zomplex).
*/
+#ifndef NGPL
#ifndef NSUPERNODAL
#include "cholmod_internal.h"
#include "cholmod_supernodal.h"
+#ifdef GPU_BLAS
+#include "cholmod_gpu.h"
+#endif
/* ========================================================================== */
/* === subtree ============================================================== */
@@ -149,14 +153,14 @@ static void subtree
/* === cholmod_super_symbolic2 ============================================== */
/* ========================================================================== */
-/* Analyze for supernodal Cholesky or multifrontal QR. CHOLMOD itself always
- * analyzes for supernodal Cholesky, of course. The "for_cholesky = TRUE"
- * option is used by SuiteSparseQR only. */
+/* Analyze for supernodal Cholesky or multifrontal QR. */
int CHOLMOD(super_symbolic2)
(
/* ---- input ---- */
- int for_cholesky, /* Cholesky if TRUE, QR if FALSE */
+ int for_whom, /* FOR_SPQR (0): for SPQR but not GPU-accelerated
+ FOR_CHOLESKY (1): for Cholesky (GPU or not)
+ FOR_SPQRGPU (2): for SPQR with GPU acceleration */
cholmod_sparse *A, /* matrix to analyze */
cholmod_sparse *F, /* F = A' or A(:,f)' */
Int *Parent, /* elimination tree */
@@ -176,7 +180,12 @@ int CHOLMOD(super_symbolic2)
csize, maxcsize, ss, nscol0, nscol1, ns, nfsuper, newzeros, totzeros,
merge, snext, esize, maxesize, nrelax0, nrelax1, nrelax2, Asorted ;
size_t w ;
- int ok = TRUE ;
+ int ok = TRUE, find_xsize ;
+ const char* env_use_gpu;
+ const char* env_max_bytes;
+ size_t max_bytes;
+ const char* env_max_fraction;
+ double max_fraction;
/* ---------------------------------------------------------------------- */
/* check inputs */
@@ -231,6 +240,96 @@ int CHOLMOD(super_symbolic2)
ASSERT (CHOLMOD(dump_work) (TRUE, TRUE, 0, Common)) ;
/* ---------------------------------------------------------------------- */
+ /* allocate GPU workspace */
+ /* ---------------------------------------------------------------------- */
+
+ L->useGPU = 0 ; /* only used for Cholesky factorization, not QR */
+
+#ifdef GPU_BLAS
+
+ /* GPU module is installed */
+ if ( for_whom == CHOLMOD_ANALYZE_FOR_CHOLESKY )
+ {
+ /* only allocate GPU workspace for supernodal Cholesky, and only when
+ the GPU is requested and available. */
+
+ max_bytes = 0;
+ max_fraction = 0;
+
+#ifdef DLONG
+ if ( Common->useGPU == EMPTY )
+ {
+ /* useGPU not explicity requested by the user, but not explicitly
+ * prohibited either. Query OS environment variables for request.*/
+ env_use_gpu = getenv("CHOLMOD_USE_GPU");
+
+ if ( env_use_gpu )
+ {
+ /* CHOLMOD_USE_GPU environment variable is set to something */
+ if ( atoi ( env_use_gpu ) == 0 )
+ {
+ Common->useGPU = 0; /* don't use the gpu */
+ }
+ else
+ {
+ Common->useGPU = 1; /* use the gpu */
+ env_max_bytes = getenv("CHOLMOD_GPU_MEM_BYTES");
+ env_max_fraction = getenv("CHOLMOD_GPU_MEM_FRACTION");
+ if ( env_max_bytes )
+ {
+ max_bytes = atol(env_max_bytes);
+ Common->maxGpuMemBytes = max_bytes;
+ }
+ if ( env_max_fraction )
+ {
+ max_fraction = atof (env_max_fraction);
+ if ( max_fraction < 0 ) max_fraction = 0;
+ if ( max_fraction > 1 ) max_fraction = 1;
+ Common->maxGpuMemFraction = max_fraction;
+ }
+ }
+ }
+ else
+ {
+ /* CHOLMOD_USE_GPU environment variable not set, so no GPU
+ * acceleration will be used */
+ Common->useGPU = 0;
+ }
+ /* fprintf (stderr, "useGPU queried: %d\n", Common->useGPU) ; */
+ }
+
+ /* Ensure that a GPU is present */
+ if ( Common->useGPU == 1 )
+ {
+ /* fprintf (stderr, "\nprobe GPU:\n") ; */
+ Common->useGPU = CHOLMOD(gpu_probe) (Common);
+ /* fprintf (stderr, "\nprobe GPU: result %d\n", Common->useGPU) ; */
+ }
+
+ if ( Common->useGPU == 1 )
+ {
+ /* Cholesky + GPU, so allocate space */
+ /* fprintf (stderr, "allocate GPU:\n") ; */
+ CHOLMOD(gpu_allocate) ( Common );
+ /* fprintf (stderr, "allocate GPU done\n") ; */
+ }
+#else
+ /* GPU acceleration is only supported for long int version */
+ Common->useGPU = 0;
+#endif
+
+ /* Cache the fact that the symbolic factorization supports
+ * GPU acceleration */
+ L->useGPU = Common->useGPU;
+
+ }
+
+#else
+ /* GPU module is not installed */
+ Common->useGPU = 0 ;
+#endif
+
+ /* ---------------------------------------------------------------------- */
/* get inputs */
/* ---------------------------------------------------------------------- */
@@ -322,7 +421,16 @@ int CHOLMOD(super_symbolic2)
/* check if j starts new supernode, or in the same supernode as j-1 */
if (Parent [j-1] != j /* parent of j-1 is not j */
|| (ColCount [j-1] != ColCount [j] + 1) /* j-1 not subset of j*/
- || Wi [j] > 1) /* j has more than one child */
+ || Wi [j] > 1 /* j has more than one child */
+#ifdef GPU_BLAS
+ /* Ensure that the supernode will fit in the GPU buffers */
+ /* Data size of 16 bytes must be assumed for case of PATTERN */
+ || (for_whom == CHOLMOD_ANALYZE_FOR_CHOLESKY && L->useGPU &&
+ (j-Super[nfsuper-1]+1) *
+ ColCount[Super[nfsuper-1]] * sizeof(double) * 2 >=
+ Common->devBuffSize)
+#endif
+ )
{
/* j is the leading node of a supernode */
Super [nfsuper++] = j ;
@@ -382,6 +490,8 @@ int CHOLMOD(super_symbolic2)
for (s = nfsuper-2 ; s >= 0 ; s--)
{
+ double lnz1 ;
+
/* should supernodes s and s+1 merge into a new node s? */
PRINT1 (("\n========= Check relax of s "ID" and s+1 "ID"\n", s, s+1)) ;
@@ -417,6 +527,7 @@ int CHOLMOD(super_symbolic2)
PRINT2 (("ns "ID" nscol0 "ID" nscol1 "ID"\n", ns, nscol0, nscol1)) ;
totzeros = Zeros [s+1] ; /* current # of zeros in s+1 */
+ lnz1 = (double) (Snz [s+1]) ; /* # entries in leading column of s+1 */
/* determine if supernodes s and s+1 should merge */
if (ns <= nrelax0)
@@ -428,7 +539,6 @@ int CHOLMOD(super_symbolic2)
{
/* use double to avoid integer overflow */
double lnz0 = Snz [s] ; /* # entries in leading column of s */
- double lnz1 = Snz [s+1] ; /* # entries in leading column of s+1 */
double xnewzeros = nscol0 * (lnz1 + nscol0 - lnz0) ;
/* use Int for the final update of Zeros [s] below */
@@ -472,6 +582,18 @@ int CHOLMOD(super_symbolic2)
}
}
+#ifdef GPU_BLAS
+ if ( for_whom == CHOLMOD_ANALYZE_FOR_CHOLESKY && L->useGPU ) {
+ /* Ensure that the aggregated supernode fits in the device
+ supernode buffers */
+ double xns = (double) ns;
+ if ( ((xns * xns) + xns * (lnz1 - nscol1))*sizeof(double)*2 >=
+ Common->devBuffSize ) {
+ merge = FALSE;
+ }
+ }
+#endif
+
if (merge)
{
PRINT1 (("Merge node s ("ID") and s+1 ("ID")\n", s, s+1)) ;
@@ -540,19 +662,21 @@ int CHOLMOD(super_symbolic2)
ssize = 0 ;
xsize = 0 ;
xxsize = 0 ;
+ find_xsize = for_whom == CHOLMOD_ANALYZE_FOR_CHOLESKY ||
+ for_whom == CHOLMOD_ANALYZE_FOR_SPQRGPU ;
for (s = 0 ; s < nsuper ; s++)
{
nscol = Super [s+1] - Super [s] ;
nsrow = Snz [s] ;
ASSERT (nscol > 0) ;
ssize += nsrow ;
- if (for_cholesky)
+ if (find_xsize)
{
xsize += nscol * nsrow ;
/* also compute xsize in double to guard against Int overflow */
xxsize += ((double) nscol) * ((double) nsrow) ;
}
- if (ssize < 0 || (for_cholesky && xxsize > Int_max))
+ if (ssize < 0 ||(find_xsize && xxsize > Int_max))
{
/* Int overflow, clear workspace and return.
QR factorization will not use xxsize, so that error is ignored.
@@ -564,7 +688,7 @@ int CHOLMOD(super_symbolic2)
return (FALSE) ;
}
ASSERT (ssize > 0) ;
- ASSERT (IMPLIES (for_cholesky, xsize > 0)) ;
+ ASSERT (IMPLIES (find_xsize, xsize > 0)) ;
}
xsize = MAX (1, xsize) ;
ssize = MAX (1, ssize) ;
@@ -594,7 +718,6 @@ int CHOLMOD(super_symbolic2)
Lpx = L->px ;
Ls = L->s ;
Ls [0] = 0 ; /* flag for cholmod_check_factor; supernodes are defined */
- Lpx [0] = for_cholesky ? 0 : 123456 ; /* magic number for sparse QR */
Lsuper = L->super ;
/* copy the list of relaxed supernodes into the final list in L */
@@ -626,10 +749,10 @@ int CHOLMOD(super_symbolic2)
/* construct pointers for supernodal values (L->px) */
/* ---------------------------------------------------------------------- */
- if (for_cholesky)
+ if (for_whom == CHOLMOD_ANALYZE_FOR_CHOLESKY ||
+ for_whom == CHOLMOD_ANALYZE_FOR_SPQRGPU)
{
- /* L->px is not needed for QR factorization (it may lead to Int
- overflow, anyway, if xsize caused Int overflow above) */
+ Lpx [0] = 0 ;
p = 0 ;
for (s = 0 ; s < nsuper ; s++)
{
@@ -641,6 +764,13 @@ int CHOLMOD(super_symbolic2)
Lpx [s] = p ;
ASSERT ((Int) (L->xsize) == MAX (1,p)) ;
}
+ else
+ {
+ /* L->px is not needed for non-GPU accelerated QR factorization (it may
+ * lead to Int overflow, anyway, if xsize caused Int overflow above).
+ * Use a magic number to tell cholmod_check_factor to ignore Lpx. */
+ Lpx [0] = 123456 ;
+ }
/* Snz no longer needed ] */
@@ -782,9 +912,10 @@ int CHOLMOD(super_symbolic2)
/* Do not need to guard csize against Int overflow since xsize is OK. */
- if (for_cholesky)
+ if (for_whom == CHOLMOD_ANALYZE_FOR_CHOLESKY ||
+ for_whom == CHOLMOD_ANALYZE_FOR_SPQRGPU)
{
- /* this is not needed for QR factorization */
+ /* this is not needed for non-GPU accelerated QR factorization */
for (d = 0 ; d < nsuper ; d++)
{
nscol = Super [d+1] - Super [d] ;
@@ -860,3 +991,4 @@ int CHOLMOD(super_symbolic)
return (CHOLMOD(super_symbolic2) (TRUE, A, F, Parent, L, Common)) ;
}
#endif
+#endif
diff --git a/src/C/SuiteSparse/CHOLMOD/Supernodal/t_cholmod_super_numeric.c b/src/C/SuiteSparse/CHOLMOD/Supernodal/t_cholmod_super_numeric.c
index 50313a4..0b50242 100644
--- a/src/C/SuiteSparse/CHOLMOD/Supernodal/t_cholmod_super_numeric.c
+++ b/src/C/SuiteSparse/CHOLMOD/Supernodal/t_cholmod_super_numeric.c
@@ -3,11 +3,11 @@
/* ========================================================================== */
/* -----------------------------------------------------------------------------
- * CHOLMOD/Supernodal Module. Copyright (C) 2005-2006, Timothy A. Davis
+ * CHOLMOD/Supernodal Module. Copyright (C) 2005-2012, Timothy A. Davis
* The CHOLMOD/Supernodal Module is licensed under Version 2.0 of the GNU
* General Public License. See gpl.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* Template routine for cholmod_super_numeric. All xtypes supported, except
@@ -35,11 +35,11 @@
/* -------------------------------------------------------------------------- */
#define L_ENTRY 1
-#define L_CLEAR(Lx,p) Lx [p] = 0
-#define L_ASSIGN(Lx,q, Ax,Az,p) Lx [q] = Ax [p]
+#define L_CLEAR(Lx,p) Lx [p] = 0
+#define L_ASSIGN(Lx,q, Ax,Az,p) Lx [q] = Ax [p]
#define L_MULTADD(Lx,q, Ax,Az,p, f) Lx [q] += Ax [p] * f [0]
-#define L_ASSEMBLE(Lx,q,b) Lx [q] += b [0]
-#define L_ASSEMBLESUB(Lx,q,C,p) Lx [q] -= C [p]
+#define L_ASSEMBLE(Lx,q,b) Lx [q] += b [0]
+#define L_ASSEMBLESUB(Lx,q,C,p) Lx [q] -= C [p]
#else
@@ -48,10 +48,10 @@
/* -------------------------------------------------------------------------- */
#define L_ENTRY 2
-#define L_CLEAR(Lx,p) Lx [2*(p)] = 0 ; Lx [2*(p)+1] = 0
-#define L_ASSEMBLE(Lx,q,b) Lx [2*(q)] += b [0] ;
-#define L_ASSEMBLESUB(Lx,q,C,p) \
- Lx [2*(q) ] -= C [2*(p) ] ; \
+#define L_CLEAR(Lx,p) Lx [2*(p)] = 0 ; Lx [2*(p)+1] = 0
+#define L_ASSEMBLE(Lx,q,b) Lx [2*(q)] += b [0] ;
+#define L_ASSEMBLESUB(Lx,q,C,p) \
+ Lx [2*(q) ] -= C [2*(p) ] ; \
Lx [2*(q)+1] -= C [2*(p)+1] ;
#ifdef COMPLEX
@@ -60,12 +60,12 @@
/* A, F, L, and C are all complex */
/* -------------------------------------------------------------------------- */
-#define L_ASSIGN(Lx,q, Ax,Az,p) \
- Lx [2*(q) ] = Ax [2*(p) ] ; \
+#define L_ASSIGN(Lx,q, Ax,Az,p) \
+ Lx [2*(q) ] = Ax [2*(p) ] ; \
Lx [2*(q)+1] = Ax [2*(p)+1]
-#define L_MULTADD(Lx,q, Ax,Az,p, f) \
- Lx [2*(q) ] += Ax [2*(p) ] * f [0] - Ax [2*(p)+1] * f [1] ; \
+#define L_MULTADD(Lx,q, Ax,Az,p, f) \
+ Lx [2*(q) ] += Ax [2*(p) ] * f [0] - Ax [2*(p)+1] * f [1] ; \
Lx [2*(q)+1] += Ax [2*(p)+1] * f [0] + Ax [2*(p) ] * f [1]
#else
@@ -74,12 +74,12 @@
/* A and F are zomplex, L and C is complex */
/* -------------------------------------------------------------------------- */
-#define L_ASSIGN(Lx,q, Ax,Az,p) \
- Lx [2*(q) ] = Ax [p] ; \
+#define L_ASSIGN(Lx,q, Ax,Az,p) \
+ Lx [2*(q) ] = Ax [p] ; \
Lx [2*(q)+1] = Az [p] ;
-#define L_MULTADD(Lx,q, Ax,Az,p, f) \
- Lx [2*(q) ] += Ax [p] * f [0] - Az [p] * f [1] ; \
+#define L_MULTADD(Lx,q, Ax,Az,p, f) \
+ Lx [2*(q) ] += Ax [p] * f [0] - Az [p] * f [1] ; \
Lx [2*(q)+1] += Az [p] * f [0] + Ax [p] * f [1]
#endif
@@ -96,26 +96,45 @@
static int TEMPLATE (cholmod_super_numeric)
(
/* ---- input ---- */
- cholmod_sparse *A, /* matrix to factorize */
- cholmod_sparse *F, /* F = A' or A(:,f)' */
- double beta [2], /* beta*I is added to diagonal of matrix to factorize */
+ cholmod_sparse *A, /* matrix to factorize */
+ cholmod_sparse *F, /* F = A' or A(:,f)' */
+ double beta [2], /* beta*I is added to diagonal of matrix to factorize */
/* ---- in/out --- */
- cholmod_factor *L, /* factorization */
+ cholmod_factor *L, /* factorization */
/* -- workspace -- */
- cholmod_dense *Cwork, /* size (L->maxcsize)-by-1 */
+ cholmod_dense *Cwork, /* size (L->maxcsize)-by-1 */
/* --------------- */
cholmod_common *Common
-)
+ )
{
- double one [2], zero [2], fjk [2] ;
+ double one [2], zero [2], tstart ;
double *Lx, *Ax, *Fx, *Az, *Fz, *C ;
Int *Super, *Head, *Ls, *Lpi, *Lpx, *Map, *SuperMap, *RelativeMap, *Next,
- *Lpos, *Fp, *Fi, *Fnz, *Ap, *Ai, *Anz, *Iwork, *Next_save, *Lpos_save ;
+ *Lpos, *Fp, *Fi, *Fnz, *Ap, *Ai, *Anz, *Iwork, *Next_save, *Lpos_save,
+ *Previous;
Int nsuper, n, j, i, k, s, p, pend, k1, k2, nscol, psi, psx, psend, nsrow,
- pj, d, kd1, kd2, info, ndcol, ndrow, pdi, pdx, pdend, pdi1, pdi2, pdx1,
- ndrow1, ndrow2, px, dancestor, sparent, dnext, nsrow2, ndrow3, pk, pf,
- pfend, stype, Apacked, Fpacked, q, imap, repeat_supernode, nscol2, ss,
- nscol_new = 0 ;
+ pj, d, kd1, kd2, info, ndcol, ndrow, pdi, pdx, pdend, pdi1, pdi2, pdx1,
+ ndrow1, ndrow2, px, dancestor, sparent, dnext, nsrow2, ndrow3, pk, pf,
+ pfend, stype, Apacked, Fpacked, q, imap, repeat_supernode, nscol2, ss,
+ tail, nscol_new = 0;
+
+ /* ---------------------------------------------------------------------- */
+ /* declarations for the GPU */
+ /* ---------------------------------------------------------------------- */
+
+ /* these variables are not used if the GPU module is not installed */
+
+#ifdef GPU_BLAS
+ Int ndescendants, mapCreatedOnGpu, supernodeUsedGPU,
+ idescendant, dlarge, dsmall, skips ;
+ int iHostBuff, iDevBuff, useGPU, GPUavailable ;
+ cholmod_gpu_pointers *gpu_p, gpu_pointer_struct ;
+ gpu_p = &gpu_pointer_struct ;
+#endif
+
+ /* ---------------------------------------------------------------------- */
+ /* guard against integer overflow in the BLAS */
+ /* ---------------------------------------------------------------------- */
/* If integer overflow occurs in the BLAS, Common->status is set to
* CHOLMOD_TOO_LARGE, and the contents of Lx are undefined. */
@@ -128,21 +147,28 @@ static int TEMPLATE (cholmod_super_numeric)
nsuper = L->nsuper ;
n = L->n ;
- C = Cwork->x ; /* workspace of size L->maxcsize */
-
- one [0] = 1.0 ; /* ALPHA for *syrk, *herk, *gemm, and *trsm */
- one [1] = 0. ;
+ C = Cwork->x ; /* workspace of size L->maxcsize */
- zero [0] = 0. ; /* BETA for *syrk, *herk, and *gemm */
+ one [0] = 1.0 ; /* ALPHA for *syrk, *herk, *gemm, and *trsm */
+ one [1] = 0. ;
+ zero [0] = 0. ; /* BETA for *syrk, *herk, and *gemm */
zero [1] = 0. ;
+ /* Iwork must be of size 2n + 5*nsuper, allocated in the caller,
+ * cholmod_super_numeric. The memory cannot be allocated here because the
+ * cholmod_super_numeric initializes SuperMap, and cholmod_allocate_work
+ * does not preserve existing workspace if the space needs to be increase
+ * in size. */
+
+ /* allocate integer workspace */
Iwork = Common->Iwork ;
- SuperMap = Iwork ; /* size n (i/i/l) */
- RelativeMap = Iwork + n ; /* size n (i/i/l) */
- Next = Iwork + 2*((size_t) n) ; /* size nsuper*/
- Lpos = Iwork + 2*((size_t) n) + nsuper ; /* size nsuper*/
+ SuperMap = Iwork ; /* size n (i/i/l) */
+ RelativeMap = Iwork + n ; /* size n (i/i/l) */
+ Next = Iwork + 2*((size_t) n) ; /* size nsuper*/
+ Lpos = Iwork + 2*((size_t) n) + nsuper ; /* size nsuper*/
Next_save = Iwork + 2*((size_t) n) + 2*((size_t) nsuper) ;/* size nsuper*/
Lpos_save = Iwork + 2*((size_t) n) + 3*((size_t) nsuper) ;/* size nsuper*/
+ Previous = Iwork + 2*((size_t) n) + 4*((size_t) nsuper) ;/* size nsuper*/
Map = Common->Flag ; /* size n, use Flag as workspace for Map array */
Head = Common->Head ; /* size n+1, only Head [0..nsuper-1] used */
@@ -155,26 +181,63 @@ static int TEMPLATE (cholmod_super_numeric)
Lx = L->x ;
+#ifdef GPU_BLAS
+ /* local copy of useGPU */
+ if ( (Common->useGPU == 1) && L->useGPU)
+ {
+ /* Initialize the GPU. If not found, don't use it. */
+ useGPU = TEMPLATE2 (CHOLMOD (gpu_init))
+ (C, L, Common, nsuper, n, Lpi[nsuper]-Lpi[0], gpu_p) ;
+ }
+ else
+ {
+ useGPU = 0;
+ }
+ /* fprintf (stderr, "local useGPU %d\n", useGPU) ; */
+#endif
+
+#ifndef NTIMER
+ /* clear GPU / CPU statistics */
+ Common->CHOLMOD_CPU_GEMM_CALLS = 0 ;
+ Common->CHOLMOD_CPU_SYRK_CALLS = 0 ;
+ Common->CHOLMOD_CPU_TRSM_CALLS = 0 ;
+ Common->CHOLMOD_CPU_POTRF_CALLS = 0 ;
+ Common->CHOLMOD_GPU_GEMM_CALLS = 0 ;
+ Common->CHOLMOD_GPU_SYRK_CALLS = 0 ;
+ Common->CHOLMOD_GPU_TRSM_CALLS = 0 ;
+ Common->CHOLMOD_GPU_POTRF_CALLS = 0 ;
+ Common->CHOLMOD_CPU_GEMM_TIME = 0 ;
+ Common->CHOLMOD_CPU_SYRK_TIME = 0 ;
+ Common->CHOLMOD_CPU_TRSM_TIME = 0 ;
+ Common->CHOLMOD_CPU_POTRF_TIME = 0 ;
+ Common->CHOLMOD_GPU_GEMM_TIME = 0 ;
+ Common->CHOLMOD_GPU_SYRK_TIME = 0 ;
+ Common->CHOLMOD_GPU_TRSM_TIME = 0 ;
+ Common->CHOLMOD_GPU_POTRF_TIME = 0 ;
+ Common->CHOLMOD_ASSEMBLE_TIME = 0 ;
+ Common->CHOLMOD_ASSEMBLE_TIME2 = 0 ;
+#endif
+
stype = A->stype ;
if (stype != 0)
{
- /* F not accessed */
- Fp = NULL ;
- Fi = NULL ;
- Fx = NULL ;
- Fz = NULL ;
- Fnz = NULL ;
- Fpacked = TRUE ;
+ /* F not accessed */
+ Fp = NULL ;
+ Fi = NULL ;
+ Fx = NULL ;
+ Fz = NULL ;
+ Fnz = NULL ;
+ Fpacked = TRUE ;
}
else
{
- Fp = F->p ;
- Fi = F->i ;
- Fx = F->x ;
- Fz = F->z ;
- Fnz = F->nz ;
- Fpacked = F->packed ;
+ Fp = F->p ;
+ Fi = F->i ;
+ Fx = F->x ;
+ Fz = F->z ;
+ Fnz = F->nz ;
+ Fpacked = F->packed ;
}
Ap = A->p ;
@@ -185,20 +248,33 @@ static int TEMPLATE (cholmod_super_numeric)
Apacked = A->packed ;
/* clear the Map so that changes in the pattern of A can be detected */
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ if ( n > 128 ) schedule (static)
+
for (i = 0 ; i < n ; i++)
{
- Map [i] = EMPTY ;
+ Map [i] = EMPTY ;
}
/* If the matrix is not positive definite, the supernode s containing the
* first zero or negative diagonal entry of L is repeated (but factorized
* only up to just before the problematic diagonal entry). The purpose is
* to provide MATLAB with [R,p]=chol(A); columns 1 to p-1 of L=R' are
- * required, where L(p,p) is the problematic diagonal entry. The
+ * required, where L(p,p) is the problematic diagonal entry. The
* repeat_supernode flag tells us whether this is the repeated supernode.
* Once supernode s is repeated, the factorization is terminated. */
repeat_supernode = FALSE ;
+#ifdef GPU_BLAS
+ if ( useGPU )
+ {
+ /* Case of GPU, zero all supernodes at one time for better performance*/
+ TEMPLATE2 (CHOLMOD (gpu_clear_memory))(Lx, L->xsize,
+ CHOLMOD_OMP_NUM_THREADS);
+ }
+#endif
+
/* ---------------------------------------------------------------------- */
/* supernodal numerical factorization */
/* ---------------------------------------------------------------------- */
@@ -206,535 +282,805 @@ static int TEMPLATE (cholmod_super_numeric)
for (s = 0 ; s < nsuper ; s++)
{
- /* ------------------------------------------------------------------ */
- /* get the size of supernode s */
- /* ------------------------------------------------------------------ */
-
- k1 = Super [s] ; /* s contains columns k1 to k2-1 of L */
- k2 = Super [s+1] ;
- nscol = k2 - k1 ; /* # of columns in all of s */
- psi = Lpi [s] ; /* pointer to first row of s in Ls */
- psx = Lpx [s] ; /* pointer to first row of s in Lx */
- psend = Lpi [s+1] ; /* pointer just past last row of s in Ls */
- nsrow = psend - psi ; /* # of rows in all of s */
-
- PRINT1 (("====================================================\n"
- "S "ID" k1 "ID" k2 "ID" nsrow "ID" nscol "ID" psi "ID" psend "
- ""ID" psx "ID"\n", s, k1, k2, nsrow, nscol, psi, psend, psx)) ;
-
- /* ------------------------------------------------------------------ */
- /* zero the supernode s */
- /* ------------------------------------------------------------------ */
-
- ASSERT ((size_t) (psx + nsrow*nscol) <= L->xsize) ;
-
- pend = psx + nsrow * nscol ; /* s is nsrow-by-nscol */
- for (p = psx ; p < pend ; p++)
- {
- /* Lx [p] = 0 ; */
- L_CLEAR (Lx,p) ;
- }
-
- /* ------------------------------------------------------------------ */
- /* construct the scattered Map for supernode s */
- /* ------------------------------------------------------------------ */
-
- /* If row i is the kth row in s, then Map [i] = k. Similarly, if
- * column j is the kth column in s, then Map [j] = k. */
-
- for (k = 0 ; k < nsrow ; k++)
- {
- PRINT1 ((" "ID" map "ID"\n", Ls [psi+k], k)) ;
- Map [Ls [psi + k]] = k ;
- }
-
- /* ------------------------------------------------------------------ */
- /* copy matrix into supernode s (lower triangular part only) */
- /* ------------------------------------------------------------------ */
-
- pk = psx ;
- for (k = k1 ; k < k2 ; k++)
- {
- if (stype != 0)
- {
- /* copy the kth column of A into the supernode */
- p = Ap [k] ;
- pend = (Apacked) ? (Ap [k+1]) : (p + Anz [k]) ;
- for ( ; p < pend ; p++)
- {
- /* row i of L is located in row Map [i] of s */
- i = Ai [p] ;
- if (i >= k)
- {
- /* This test is here simply to avoid a segfault. If
- * the test is false, the numeric factorization of A
- * is undefined. It does not detect all invalid
- * entries, only some of them (when debugging is
- * enabled, and Map is cleared after each step, then
- * all entries not in the pattern of L are detected). */
- imap = Map [i] ;
- if (imap >= 0 && imap < nsrow)
- {
- /* Lx [Map [i] + pk] = Ax [p] ; */
- L_ASSIGN (Lx,(imap+pk), Ax,Az,p) ;
- }
- }
- }
- }
- else
- {
- /* copy the kth column of A*F into the supernode */
- pf = Fp [k] ;
- pfend = (Fpacked) ? (Fp [k+1]) : (p + Fnz [k]) ;
- for ( ; pf < pfend ; pf++)
- {
- j = Fi [pf] ;
-
- /* fjk = Fx [pf] ; */
- L_ASSIGN (fjk,0, Fx,Fz,pf) ;
-
- p = Ap [j] ;
- pend = (Apacked) ? (Ap [j+1]) : (p + Anz [j]) ;
- for ( ; p < pend ; p++)
- {
- i = Ai [p] ;
- if (i >= k)
- {
- /* See the discussion of imap above. */
- imap = Map [i] ;
- if (imap >= 0 && imap < nsrow)
- {
- /* Lx [Map [i] + pk] += Ax [p] * fjk ; */
- L_MULTADD (Lx,(imap+pk), Ax,Az,p, fjk) ;
- }
- }
- }
- }
- }
- pk += nsrow ; /* advance to the next column of the supernode */
- }
-
- /* add beta to the diagonal of the supernode, if nonzero */
- if (beta [0] != 0.0)
- {
- /* note that only the real part of beta is used */
- pk = psx ;
- for (k = k1 ; k < k2 ; k++)
- {
- /* Lx [pk] += beta [0] ; */
- L_ASSEMBLE (Lx,pk, beta) ;
- pk += nsrow + 1 ; /* advance to the next diagonal entry */
- }
- }
-
- PRINT1 (("Supernode with just A: repeat: "ID"\n", repeat_supernode)) ;
- DEBUG (CHOLMOD(dump_super) (s, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
- Common)) ;
- PRINT1 (("\n\n")) ;
-
- /* ------------------------------------------------------------------ */
- /* save/restore the list of supernodes */
- /* ------------------------------------------------------------------ */
-
- if (!repeat_supernode)
- {
- /* Save the list of pending descendants in case s is not positive
- * definite. Also save Lpos for each descendant d, so that we can
- * find which part of d is used to update s. */
- for (d = Head [s] ; d != EMPTY ; d = Next [d])
- {
- Lpos_save [d] = Lpos [d] ;
- Next_save [d] = Next [d] ;
- }
- }
- else
- {
- /* s is not positive definite, and is being repeated. Restore
- * the list of supernodes. This can be done with pointer assignment
- * because all 4 arrays are held within Common->Iwork. */
- Lpos = Lpos_save ;
- Next = Next_save ;
- }
-
- /* ------------------------------------------------------------------ */
- /* update supernode s with each pending descendant d */
- /* ------------------------------------------------------------------ */
+ /* ------------------------------------------------------------------ */
+ /* get the size of supernode s */
+ /* ------------------------------------------------------------------ */
+
+ k1 = Super [s] ; /* s contains columns k1 to k2-1 of L */
+ k2 = Super [s+1] ;
+ nscol = k2 - k1 ; /* # of columns in all of s */
+ psi = Lpi [s] ; /* pointer to first row of s in Ls */
+ psx = Lpx [s] ; /* pointer to first row of s in Lx */
+ psend = Lpi [s+1] ; /* pointer just past last row of s in Ls */
+ nsrow = psend - psi ; /* # of rows in all of s */
+
+ PRINT1 (("====================================================\n"
+ "S "ID" k1 "ID" k2 "ID" nsrow "ID" nscol "ID" psi "ID" psend "
+ ""ID" psx "ID"\n", s, k1, k2, nsrow, nscol, psi, psend, psx)) ;
+ /* ------------------------------------------------------------------ */
+ /* zero the supernode s */
+ /* ------------------------------------------------------------------ */
+
+ ASSERT ((size_t) (psx + nsrow*nscol) <= L->xsize) ;
+
+ pend = psx + nsrow * nscol ; /* s is nsrow-by-nscol */
+
+#ifdef GPU_BLAS
+ if ( !useGPU )
+#endif
+ {
+ /* Case of no GPU, zero individual supernodes */
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ schedule (static) if ( pend - psx > 1024 )
+
+ for (p = psx ; p < pend ; p++) {
+ L_CLEAR (Lx,p);
+ }
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* construct the scattered Map for supernode s */
+ /* ------------------------------------------------------------------ */
+
+ /* If row i is the kth row in s, then Map [i] = k. Similarly, if
+ * column j is the kth column in s, then Map [j] = k. */
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ if ( nsrow > 128 )
+
+ for (k = 0 ; k < nsrow ; k++)
+ {
+ PRINT1 ((" "ID" map "ID"\n", Ls [psi+k], k)) ;
+ Map [Ls [psi + k]] = k ;
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* when using GPU, reorder supernodes by levels.*/
+ /* (all supernodes in a level are independent) */
+ /* ------------------------------------------------------------------ */
+
+#ifdef GPU_BLAS
+ if ( useGPU )
+ {
+ TEMPLATE2 (CHOLMOD (gpu_reorder_descendants))
+ ( Common, Super, &s, Lpi, Lpos, Head, Next, Previous,
+ &ndescendants, &tail, &mapCreatedOnGpu, gpu_p ) ;
+ }
+#endif
+
+ /* ------------------------------------------------------------------ */
+ /* copy matrix into supernode s (lower triangular part only) */
+ /* ------------------------------------------------------------------ */
+
+ pk = psx ;
+
+#pragma omp parallel for private ( p, pend, pfend, pf, i, j, imap, q ) \
+ num_threads(CHOLMOD_OMP_NUM_THREADS) if ( k2-k1 > 64 )
+
+ for (k = k1 ; k < k2 ; k++)
+ {
+ if (stype != 0)
+ {
+ /* copy the kth column of A into the supernode */
+ p = Ap [k] ;
+ pend = (Apacked) ? (Ap [k+1]) : (p + Anz [k]) ;
+ for ( ; p < pend ; p++)
+ {
+ /* row i of L is located in row Map [i] of s */
+ i = Ai [p] ;
+ if (i >= k)
+ {
+ /* This test is here simply to avoid a segfault. If
+ * the test is false, the numeric factorization of A
+ * is undefined. It does not detect all invalid
+ * entries, only some of them (when debugging is
+ * enabled, and Map is cleared after each step, then
+ * all entries not in the pattern of L are detected). */
+ imap = Map [i] ;
+ if (imap >= 0 && imap < nsrow)
+ {
+ /* Lx [Map [i] + pk] = Ax [p] ; */
+ L_ASSIGN (Lx,(imap+(psx+(k-k1)*nsrow)), Ax,Az,p) ;
+ }
+ }
+ }
+ }
+ else
+ {
+ double fjk[2];
+ /* copy the kth column of A*F into the supernode */
+ pf = Fp [k] ;
+ pfend = (Fpacked) ? (Fp [k+1]) : (p + Fnz [k]) ;
+ for ( ; pf < pfend ; pf++)
+ {
+ j = Fi [pf] ;
+
+ /* fjk = Fx [pf] ; */
+ L_ASSIGN (fjk,0, Fx,Fz,pf) ;
+
+ p = Ap [j] ;
+ pend = (Apacked) ? (Ap [j+1]) : (p + Anz [j]) ;
+ for ( ; p < pend ; p++)
+ {
+ i = Ai [p] ;
+ if (i >= k)
+ {
+ /* See the discussion of imap above. */
+ imap = Map [i] ;
+ if (imap >= 0 && imap < nsrow)
+ {
+ /* Lx [Map [i] + pk] += Ax [p] * fjk ; */
+ L_MULTADD (Lx,(imap+(psx+(k-k1)*nsrow)),
+ Ax,Az,p, fjk) ;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /* add beta to the diagonal of the supernode, if nonzero */
+ if (beta [0] != 0.0)
+ {
+ /* note that only the real part of beta is used */
+ pk = psx ;
+ for (k = k1 ; k < k2 ; k++)
+ {
+ /* Lx [pk] += beta [0] ; */
+ L_ASSEMBLE (Lx,pk, beta) ;
+ pk += nsrow + 1 ; /* advance to the next diagonal entry */
+ }
+ }
+
+ PRINT1 (("Supernode with just A: repeat: "ID"\n", repeat_supernode)) ;
+ DEBUG (CHOLMOD(dump_super) (s, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
+ Common)) ;
+ PRINT1 (("\n\n")) ;
+
+ /* ------------------------------------------------------------------ */
+ /* save/restore the list of supernodes */
+ /* ------------------------------------------------------------------ */
+
+ if (!repeat_supernode)
+ {
+ /* Save the list of pending descendants in case s is not positive
+ * definite. Also save Lpos for each descendant d, so that we can
+ * find which part of d is used to update s. */
+ for (d = Head [s] ; d != EMPTY ; d = Next [d])
+ {
+ Lpos_save [d] = Lpos [d] ;
+ Next_save [d] = Next [d] ;
+ }
+ }
+ else
+ {
+ for (d = Head [s] ; d != EMPTY ; d = Next [d])
+ {
+ Lpos [d] = Lpos_save [d] ;
+ Next [d] = Next_save [d] ;
+ }
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* update supernode s with each pending descendant d */
+ /* ------------------------------------------------------------------ */
#ifndef NDEBUG
- for (d = Head [s] ; d != EMPTY ; d = Next [d])
- {
- PRINT1 (("\nWill update "ID" with Child: "ID"\n", s, d)) ;
- DEBUG (CHOLMOD(dump_super) (d, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
- Common)) ;
- }
- PRINT1 (("\nNow factorizing supernode "ID":\n", s)) ;
-#endif
-
- for (d = Head [s] ; d != EMPTY ; d = dnext)
- {
-
- /* -------------------------------------------------------------- */
- /* get the size of supernode d */
- /* -------------------------------------------------------------- */
-
- kd1 = Super [d] ; /* d contains cols kd1 to kd2-1 of L */
- kd2 = Super [d+1] ;
- ndcol = kd2 - kd1 ; /* # of columns in all of d */
- pdi = Lpi [d] ; /* pointer to first row of d in Ls */
- pdx = Lpx [d] ; /* pointer to first row of d in Lx */
- pdend = Lpi [d+1] ; /* pointer just past last row of d in Ls */
- ndrow = pdend - pdi ; /* # rows in all of d */
-
- PRINT1 (("Child: ")) ;
- DEBUG (CHOLMOD(dump_super) (d, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
- Common)) ;
-
- /* -------------------------------------------------------------- */
- /* find the range of rows of d that affect rows k1 to k2-1 of s */
- /* -------------------------------------------------------------- */
-
- p = Lpos [d] ; /* offset of 1st row of d affecting s */
- pdi1 = pdi + p ; /* ptr to 1st row of d affecting s in Ls */
- pdx1 = pdx + p ; /* ptr to 1st row of d affecting s in Lx */
-
- /* there must be at least one row remaining in d to update s */
- ASSERT (pdi1 < pdend) ;
- PRINT1 (("Lpos[d] "ID" pdi1 "ID" Ls[pdi1] "ID"\n",
- Lpos[d], pdi1, Ls [pdi1])) ;
- ASSERT (Ls [pdi1] >= k1 && Ls [pdi1] < k2) ;
-
- for (pdi2 = pdi1 ; pdi2 < pdend && Ls [pdi2] < k2 ; pdi2++) ;
- ndrow1 = pdi2 - pdi1 ; /* # rows in first part of d */
- ndrow2 = pdend - pdi1 ; /* # rows in remaining d */
-
- /* rows Ls [pdi1 ... pdi2-1] are in the range k1 to k2-1. Since d
- * affects s, this set cannot be empty. */
- ASSERT (pdi1 < pdi2 && pdi2 <= pdend) ;
- PRINT1 (("ndrow1 "ID" ndrow2 "ID"\n", ndrow1, ndrow2)) ;
- DEBUG (for (p = pdi1 ; p < pdi2 ; p++)
- PRINT1 (("Ls["ID"] "ID"\n", p, Ls[p]))) ;
-
- /* -------------------------------------------------------------- */
- /* construct the update matrix C for this supernode d */
- /* -------------------------------------------------------------- */
-
- /* C = L (k1:n-1, kd1:kd2-1) * L (k1:k2-1, kd1:kd2-1)', except
- * that k1:n-1 refers to all of the rows in L, but many of the
- * rows are all zero. Supernode d holds columns kd1 to kd2-1 of L.
- * Nonzero rows in the range k1:k2-1 are in the list
- * Ls [pdi1 ... pdi2-1], of size ndrow1. Nonzero rows in the range
- * k2:n-1 are in the list Ls [pdi2 ... pdend], of size ndrow2. Let
- * L1 = L (Ls [pdi1 ... pdi2-1], kd1:kd2-1), and let
- * L2 = L (Ls [pdi2 ... pdend], kd1:kd2-1). C is ndrow2-by-ndcol.
- * Let C1 be the first ndrow1 rows of C and let C2 be the last
- * ndrow2-ndrow1 rows of C. Only the lower triangular part of C1
- * needs to be computed since C1 is symmetric.
- */
-
- /* maxcsize is the largest size of C for all pairs (d,s) */
- ASSERT (ndrow2 * ndrow1 <= ((Int) L->maxcsize)) ;
-
- /* compute leading ndrow1-by-ndrow1 lower triangular block of C,
- * C1 = L1*L1' */
+ for (d = Head [s] ; d != EMPTY ; d = Next [d])
+ {
+ PRINT1 (("\nWill update "ID" with Child: "ID"\n", s, d)) ;
+ DEBUG (CHOLMOD(dump_super) (d, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
+ Common)) ;
+ }
+ PRINT1 (("\nNow factorizing supernode "ID":\n", s)) ;
+#endif
-#ifdef REAL
- BLAS_dsyrk ("L", "N",
- ndrow1, ndcol, /* N, K: L1 is ndrow1-by-ndcol*/
- one, /* ALPHA: 1 */
- Lx + L_ENTRY*pdx1, ndrow, /* A, LDA: L1, ndrow */
- zero, /* BETA: 0 */
- C, ndrow2) ; /* C, LDC: C1 */
+#ifdef GPU_BLAS
+ /* initialize the buffer counter */
+ if ( useGPU ) {
+ Common->ibuffer = 0;
+ supernodeUsedGPU = 0;
+ idescendant = 0;
+ d = Head[s];
+ dnext = d;
+ dlarge = Next[d];
+ dsmall = tail;
+ GPUavailable = 1;
+ skips = 0;
+ }
+ else
+ {
+ dnext = Head[s];
+ }
#else
- BLAS_zherk ("L", "N",
- ndrow1, ndcol, /* N, K: L1 is ndrow1-by-ndcol*/
- one, /* ALPHA: 1 */
- Lx + L_ENTRY*pdx1, ndrow, /* A, LDA: L1, ndrow */
- zero, /* BETA: 0 */
- C, ndrow2) ; /* C, LDC: C1 */
+ /* GPU module not installed */
+ dnext = Head[s];
#endif
- /* compute remaining (ndrow3-ndrow1)-by-ndrow1 block of C,
- * C2 = L2*L1' */
- ndrow3 = ndrow2 - ndrow1 ;
- if (ndrow3 > 0)
- {
+ while
-#ifdef REAL
- BLAS_dgemm ("N", "C",
- ndrow3, ndrow1, ndcol, /* M, N, K */
- one, /* ALPHA: 1 */
- Lx + L_ENTRY*(pdx1 + ndrow1),/* A, LDA: L2, ndrow */
- ndrow,
- Lx + L_ENTRY*pdx1, /* B, LDB: L1, ndrow */
- ndrow,
- zero, /* BETA: 0 */
- C + L_ENTRY*ndrow1, /* C, LDC: C2 */
- ndrow2) ;
+#ifdef GPU_BLAS
+ ( (!useGPU && (dnext != EMPTY))
+ || (useGPU && (idescendant < ndescendants)))
+#else
+
+ ( dnext != EMPTY )
+#endif
+ {
+
+#ifdef GPU_BLAS
+
+ if ( useGPU ) {
+
+ /* Conditionally select the next descendant supernode to
+ * assemble.
+ * + first, select the largest descendant
+ * + subsequently, if gpu host buffers are available, select
+ * the largest remaining descendant for assembly on the GPU
+ * + otherwise select the smallest remaining descendant for
+ * assembly on the CPU
+ *
+ * The objective is to keep the GPU busy assembling the largest
+ * descendants, and simultaneously keep the CPU busy assembling
+ * the smallest descendants.
+ *
+ * As this is called for every descendent supernode, moving
+ * this code to t_cholmod_gpu incurs substantial overhead -
+ * ~20 GF/s on audikw_1 - so it is being left here.
+ */
+
+ iHostBuff =
+ (Common->ibuffer) % CHOLMOD_HOST_SUPERNODE_BUFFERS;
+ cudaError_t cuErr;
+
+ if ( idescendant > 0 ) {
+ if ( GPUavailable == -1 || skips > 0) {
+ d = dsmall;
+ dsmall = Previous[dsmall];
+ skips--;
+ }
+ else {
+ cuErr = cudaEventQuery
+ ( Common->updateCBuffersFree[iHostBuff] );
+ if ( cuErr == cudaSuccess ) {
+ /* buffers are available, so assemble a large
+ * descendant (anticipating that this will be
+ * assembled on the GPU) */
+ d = dlarge;
+ dlarge = Next[dlarge];
+ GPUavailable = 1;
+ skips = 0;
+ }
+ else {
+ /* buffers are not available, so the GPU is busy,
+ * so assemble a small descendant (anticipating
+ * that it will be assembled on the host) */
+ d = dsmall;
+ dsmall = Previous[dsmall];
+ GPUavailable = 0;
+
+ /* if the GPUs are busy, then do this many
+ * supernodes on the CPU before querying GPUs
+ * again. */
+ skips = CHOLMOD_GPU_SKIP;
+ }
+ }
+ }
+
+ idescendant++;
+
+ }
+ else
+ {
+ d = dnext;
+ }
#else
- BLAS_zgemm ("N", "C",
- ndrow3, ndrow1, ndcol, /* M, N, K */
- one, /* ALPHA: 1 */
- Lx + L_ENTRY*(pdx1 + ndrow1),/* A, LDA: L2, ndrow */
- ndrow,
- Lx + L_ENTRY*pdx1, /* B, LDB: L1, ndrow */
- ndrow,
- zero, /* BETA: 0 */
- C + L_ENTRY*ndrow1, /* C, LDC: C2 */
- ndrow2) ;
-#endif
-
- }
-
- DEBUG (CHOLMOD(dump_real) ("C", C, ndrow2, ndrow1, TRUE, L_ENTRY,
- Common)) ;
-
- /* -------------------------------------------------------------- */
- /* construct relative map to assemble d into s */
- /* -------------------------------------------------------------- */
-
- for (i = 0 ; i < ndrow2 ; i++)
- {
- RelativeMap [i] = Map [Ls [pdi1 + i]] ;
- ASSERT (RelativeMap [i] >= 0 && RelativeMap [i] < nsrow) ;
- }
-
- /* -------------------------------------------------------------- */
- /* assemble C into supernode s using the relative map */
- /* -------------------------------------------------------------- */
-
- pj = 0 ;
- for (j = 0 ; j < ndrow1 ; j++) /* cols k1:k2-1 */
- {
- ASSERT (RelativeMap [j] == Map [Ls [pdi1 + j]]) ;
- ASSERT (RelativeMap [j] >= 0 && RelativeMap [j] < nscol) ;
- px = psx + RelativeMap [j] * nsrow ;
- for (i = j ; i < ndrow2 ; i++) /* rows k1:n-1 */
- {
- ASSERT (RelativeMap [i] == Map [Ls [pdi1 + i]]) ;
- ASSERT (RelativeMap [i] >= j && RelativeMap [i] < nsrow) ;
- /* Lx [px + RelativeMap [i]] -= C [i + pj] ; */
- q = px + RelativeMap [i] ;
- L_ASSEMBLESUB (Lx,q, C, i+pj) ;
- }
- pj += ndrow2 ;
- }
-
- /* -------------------------------------------------------------- */
- /* prepare this supernode d for its next ancestor */
- /* -------------------------------------------------------------- */
-
- dnext = Next [d] ;
-
- if (!repeat_supernode)
- {
- /* If node s is being repeated, Head [dancestor] has already
- * been cleared (set to EMPTY). It must remain EMPTY. The
- * dancestor will not be factorized since the factorization
- * terminates at node s. */
- Lpos [d] = pdi2 - pdi ;
- if (Lpos [d] < ndrow)
- {
- dancestor = SuperMap [Ls [pdi2]] ;
- ASSERT (dancestor > s && dancestor < nsuper) ;
- /* place d in the link list of its next ancestor */
- Next [d] = Head [dancestor] ;
- Head [dancestor] = d ;
- }
- }
- }
-
- PRINT1 (("\nSupernode with contributions A: repeat: "ID"\n",
- repeat_supernode)) ;
- DEBUG (CHOLMOD(dump_super) (s, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
- Common)) ;
- PRINT1 (("\n\n")) ;
-
- /* ------------------------------------------------------------------ */
- /* factorize diagonal block of supernode s in LL' */
- /* ------------------------------------------------------------------ */
-
- /* The current supernode s is ready to factorize. It has been updated
- * by all descendant supernodes. Let S = the current supernode, which
- * holds rows k1:n-1 and columns k1:k2-1 of the updated matrix. It
- * splits into two parts: the square diagonal block S1, and the
- * rectangular part S2. Here, S1 is factorized into L1*L1' and
- * overwritten by S1.
- *
- * If supernode s is being repeated, only factorize it up to but not
- * including the column containing the problematic entry.
- */
-
- nscol2 = (repeat_supernode) ? (nscol_new) : (nscol) ;
+ /* GPU module not installed at compile time */
+ d = dnext ;
+#endif
+ /* -------------------------------------------------------------- */
+ /* get the size of supernode d */
+ /* -------------------------------------------------------------- */
+
+ kd1 = Super [d] ; /* d contains cols kd1 to kd2-1 of L */
+ kd2 = Super [d+1] ;
+ ndcol = kd2 - kd1 ; /* # of columns in all of d */
+ pdi = Lpi [d] ; /* pointer to first row of d in Ls */
+ pdx = Lpx [d] ; /* pointer to first row of d in Lx */
+ pdend = Lpi [d+1] ; /* pointer just past last row of d in Ls */
+ ndrow = pdend - pdi ; /* # rows in all of d */
+
+ PRINT1 (("Child: ")) ;
+ DEBUG (CHOLMOD(dump_super) (d, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
+ Common)) ;
+
+ /* -------------------------------------------------------------- */
+ /* find the range of rows of d that affect rows k1 to k2-1 of s */
+ /* -------------------------------------------------------------- */
+
+ p = Lpos [d] ; /* offset of 1st row of d affecting s */
+ pdi1 = pdi + p ; /* ptr to 1st row of d affecting s in Ls */
+ pdx1 = pdx + p ; /* ptr to 1st row of d affecting s in Lx */
+
+ /* there must be at least one row remaining in d to update s */
+ ASSERT (pdi1 < pdend) ;
+ PRINT1 (("Lpos[d] "ID" pdi1 "ID" Ls[pdi1] "ID"\n",
+ Lpos[d], pdi1, Ls [pdi1])) ;
+ ASSERT (Ls [pdi1] >= k1 && Ls [pdi1] < k2) ;
+
+ for (pdi2 = pdi1 ; pdi2 < pdend && Ls [pdi2] < k2 ; pdi2++) ;
+ ndrow1 = pdi2 - pdi1 ; /* # rows in first part of d */
+ ndrow2 = pdend - pdi1 ; /* # rows in remaining d */
+
+ /* rows Ls [pdi1 ... pdi2-1] are in the range k1 to k2-1. Since d
+ * affects s, this set cannot be empty. */
+ ASSERT (pdi1 < pdi2 && pdi2 <= pdend) ;
+ PRINT1 (("ndrow1 "ID" ndrow2 "ID"\n", ndrow1, ndrow2)) ;
+ DEBUG (for (p = pdi1 ; p < pdi2 ; p++)
+ PRINT1 (("Ls["ID"] "ID"\n", p, Ls[p]))) ;
+
+ /* -------------------------------------------------------------- */
+ /* construct the update matrix C for this supernode d */
+ /* -------------------------------------------------------------- */
+
+ /* C = L (k1:n-1, kd1:kd2-1) * L (k1:k2-1, kd1:kd2-1)', except
+ * that k1:n-1 refers to all of the rows in L, but many of the
+ * rows are all zero. Supernode d holds columns kd1 to kd2-1 of L.
+ * Nonzero rows in the range k1:k2-1 are in the list
+ * Ls [pdi1 ... pdi2-1], of size ndrow1. Nonzero rows in the range
+ * k2:n-1 are in the list Ls [pdi2 ... pdend], of size ndrow2. Let
+ * L1 = L (Ls [pdi1 ... pdi2-1], kd1:kd2-1), and let
+ * L2 = L (Ls [pdi2 ... pdend], kd1:kd2-1). C is ndrow2-by-ndrow1.
+ * Let C1 be the first ndrow1 rows of C and let C2 be the last
+ * ndrow2-ndrow1 rows of C. Only the lower triangular part of C1
+ * needs to be computed since C1 is symmetric.
+ */
+
+ /* maxcsize is the largest size of C for all pairs (d,s) */
+ ASSERT (ndrow2 * ndrow1 <= ((Int) L->maxcsize)) ;
+
+ /* compute leading ndrow1-by-ndrow1 lower triangular block of C,
+ * C1 = L1*L1' */
+
+ ndrow3 = ndrow2 - ndrow1 ; /* number of rows of C2 */
+ ASSERT (ndrow3 >= 0) ;
+
+
+#ifdef GPU_BLAS
+ if ( useGPU ) {
+ /* set up GPU to assemble new supernode */
+ if ( GPUavailable == 1) {
+ if ( ndrow2 * L_ENTRY >= CHOLMOD_ND_ROW_LIMIT &&
+ ndcol * L_ENTRY >= CHOLMOD_ND_COL_LIMIT ) {
+ if ( ! mapCreatedOnGpu ) {
+ TEMPLATE2 ( CHOLMOD (gpu_initialize_supernode))
+ ( Common, nscol, nsrow, psi, gpu_p );
+ mapCreatedOnGpu = 1;
+ }
+ }
+ else {
+ /* we've reached the limit of GPU-eligible descendants
+ * flag to stop stop performing cudaEventQueries */
+ GPUavailable = -1;
+ }
+ }
+ }
+#endif
+#ifdef GPU_BLAS
+ if ( !useGPU
+ || GPUavailable!=1
+ || !TEMPLATE2 (CHOLMOD (gpu_updateC)) (ndrow1, ndrow2, ndrow,
+ ndcol, nsrow, pdx1, pdi1, Lx, C, Common, gpu_p))
+#endif
+ {
+ /* GPU not installed, or not used */
+#ifndef NTIMER
+
+ Common->CHOLMOD_CPU_SYRK_CALLS++ ;
+ tstart = SuiteSparse_time () ;
+#endif
+#ifdef REAL
+ BLAS_dsyrk ("L", "N",
+ ndrow1, ndcol, /* N, K: L1 is ndrow1-by-ndcol*/
+ one, /* ALPHA: 1 */
+ Lx + L_ENTRY*pdx1, ndrow, /* A, LDA: L1, ndrow */
+ zero, /* BETA: 0 */
+ C, ndrow2) ; /* C, LDC: C1 */
+#else
+ BLAS_zherk ("L", "N",
+ ndrow1, ndcol, /* N, K: L1 is ndrow1-by-ndcol*/
+ one, /* ALPHA: 1 */
+ Lx + L_ENTRY*pdx1, ndrow, /* A, LDA: L1, ndrow */
+ zero, /* BETA: 0 */
+ C, ndrow2) ; /* C, LDC: C1 */
+#endif
+#ifndef NTIMER
+ Common->CHOLMOD_CPU_SYRK_TIME += SuiteSparse_time () - tstart ;
+#endif
+ /* compute remaining (ndrow2-ndrow1)-by-ndrow1 block of C,
+ * C2 = L2*L1' */
+ if (ndrow3 > 0)
+ {
+#ifndef NTIMER
+ Common->CHOLMOD_CPU_GEMM_CALLS++ ;
+ tstart = SuiteSparse_time () ;
+#endif
#ifdef REAL
- LAPACK_dpotrf ("L",
- nscol2, /* N: nscol2 */
- Lx + L_ENTRY*psx, nsrow, /* A, LDA: S1, nsrow */
- info) ; /* INFO */
+ BLAS_dgemm ("N", "C",
+ ndrow3, ndrow1, ndcol, /* M, N, K */
+ one, /* ALPHA: 1 */
+ Lx + L_ENTRY*(pdx1 + ndrow1), /* A, LDA: L2 */
+ ndrow, /* ndrow */
+ Lx + L_ENTRY*pdx1, /* B, LDB: L1 */
+ ndrow, /* ndrow */
+ zero, /* BETA: 0 */
+ C + L_ENTRY*ndrow1, /* C, LDC: C2 */
+ ndrow2) ;
#else
- LAPACK_zpotrf ("L",
- nscol2, /* N: nscol2 */
- Lx + L_ENTRY*psx, nsrow, /* A, LDA: S1, nsrow */
- info) ; /* INFO */
-#endif
-
- /* ------------------------------------------------------------------ */
- /* check if the matrix is not positive definite */
- /* ------------------------------------------------------------------ */
-
- if (repeat_supernode)
- {
- /* the leading part has been refactorized; it must have succeeded */
- info = 0 ;
-
- /* zero out the rest of this supernode */
- p = psx + nsrow * nscol_new ;
- pend = psx + nsrow * nscol ; /* s is nsrow-by-nscol */
- for ( ; p < pend ; p++)
- {
- /* Lx [p] = 0 ; */
- L_CLEAR (Lx,p) ;
- }
- }
-
- /* info is set to one in LAPACK_*potrf if blas_ok is FALSE. It is
- * set to zero in dpotrf/zpotrf if the factorization was successful. */
- if (CHECK_BLAS_INT && !Common->blas_ok)
- {
- ERROR (CHOLMOD_TOO_LARGE, "problem too large for the BLAS") ;
- }
-
- if (info != 0)
- {
- /* Matrix is not positive definite. dpotrf/zpotrf do NOT report an
- * error if the diagonal of L has NaN's, only if it has a zero. */
- if (Common->status == CHOLMOD_OK)
- {
- ERROR (CHOLMOD_NOT_POSDEF, "matrix not positive definite") ;
- }
-
- /* L->minor is the column of L that contains a zero or negative
- * diagonal term. */
- L->minor = k1 + info - 1 ;
-
- /* clear the link lists of all subsequent supernodes */
- for (ss = s+1 ; ss < nsuper ; ss++)
- {
- Head [ss] = EMPTY ;
- }
-
- /* zero this supernode, and all remaining supernodes */
- pend = L->xsize ;
- for (p = psx ; p < pend ; p++)
- {
- /* Lx [p] = 0. ; */
- L_CLEAR (Lx,p) ;
- }
-
- /* If L is indefinite, it still contains useful information.
- * Supernodes 0 to s-1 are valid, similar to MATLAB [R,p]=chol(A),
- * where the 1-based p is identical to the 0-based L->minor. Since
- * L->minor is in the current supernode s, it and any columns to the
- * left of it in supernode s are also all zero. This differs from
- * [R,p]=chol(A), which contains nonzero rows 1 to p-1. Fix this
- * by setting repeat_supernode to TRUE, and repeating supernode s.
- *
- * If Common->quick_return_if_not_posdef is true, then the entire
- * supernode s is not factorized; it is left as all zero.
- */
-
- if (info == 1 || Common->quick_return_if_not_posdef)
- {
- /* If the first column of supernode s contains a zero or
- * negative diagonal entry, then it is already properly set to
- * zero. Also, info will be 1 if integer overflow occured in
- * the BLAS. */
- Head [s] = EMPTY ;
- return (Common->status >= CHOLMOD_OK) ;
- }
- else
- {
- /* Repeat supernode s, but only factorize it up to but not
- * including the column containing the problematic diagonal
- * entry. */
- repeat_supernode = TRUE ;
- s-- ;
- nscol_new = info - 1 ;
- continue ;
- }
- }
-
- /* ------------------------------------------------------------------ */
- /* compute the subdiagonal block and prepare supernode for its parent */
- /* ------------------------------------------------------------------ */
-
- nsrow2 = nsrow - nscol2 ;
- if (nsrow2 > 0)
- {
- /* The current supernode is columns k1 to k2-1 of L. Let L1 be the
- * diagonal block (factorized by dpotrf/zpotrf above; rows/cols
- * k1:k2-1), and L2 be rows k2:n-1 and columns k1:k2-1 of L. The
- * triangular system to solve is L2*L1' = S2, where S2 is
- * overwritten with L2. More precisely, L2 = S2 / L1' in MATLAB
- * notation.
- */
+ BLAS_zgemm ("N", "C",
+ ndrow3, ndrow1, ndcol, /* M, N, K */
+ one, /* ALPHA: 1 */
+ Lx + L_ENTRY*(pdx1 + ndrow1), /* A, LDA: L2 */
+ ndrow, /* ndrow */
+ Lx + L_ENTRY*pdx1, /* B, LDB: L1, ndrow */
+ ndrow,
+ zero, /* BETA: 0 */
+ C + L_ENTRY*ndrow1, /* C, LDC: C2 */
+ ndrow2) ;
+#endif
+#ifndef NTIMER
+ Common->CHOLMOD_CPU_GEMM_TIME +=
+ SuiteSparse_time () - tstart ;
+#endif
+ }
+
+ /* ---------------------------------------------------------- */
+ /* construct relative map to assemble d into s */
+ /* ---------------------------------------------------------- */
+
+ DEBUG (CHOLMOD(dump_real) ("C", C, ndrow2, ndrow1, TRUE,
+ L_ENTRY, Common)) ;
+
+#pragma omp parallel for num_threads(CHOLMOD_OMP_NUM_THREADS) \
+ if ( ndrow2 > 64 )
+
+ for (i = 0 ; i < ndrow2 ; i++)
+ {
+ RelativeMap [i] = Map [Ls [pdi1 + i]] ;
+ ASSERT (RelativeMap [i] >= 0 && RelativeMap [i] < nsrow) ;
+ }
+
+ /* ---------------------------------------------------------- */
+ /* assemble C into supernode s using the relative map */
+ /* ---------------------------------------------------------- */
+
+#pragma omp parallel for private ( j, i, px, q ) \
+ num_threads(CHOLMOD_OMP_NUM_THREADS) if (ndrow1 > 64 )
+
+ for (j = 0 ; j < ndrow1 ; j++) /* cols k1:k2-1 */
+ {
+ ASSERT (RelativeMap [j] == Map [Ls [pdi1 + j]]) ;
+ ASSERT (RelativeMap [j] >= 0 && RelativeMap [j] < nscol) ;
+ px = psx + RelativeMap [j] * nsrow ;
+ for (i = j ; i < ndrow2 ; i++) /* rows k1:n-1 */
+ {
+ ASSERT (RelativeMap [i] == Map [Ls [pdi1 + i]]) ;
+ ASSERT (RelativeMap [i] >= j && RelativeMap[i] < nsrow);
+ /* Lx [px + RelativeMap [i]] -= C [i + pj] ; */
+ q = px + RelativeMap [i] ;
+ L_ASSEMBLESUB (Lx,q, C, i+ndrow2*j) ;
+ }
+ }
+
+ }
+#ifdef GPU_BLAS
+ else
+ {
+ supernodeUsedGPU = 1; /* GPU was used for this supernode*/
+ Common->ibuffer++; /* gpu_updateC is asynchronous, so use
+ * the next host buffer for the next
+ * supernode */
+ Common->ibuffer = Common->ibuffer%
+ (CHOLMOD_HOST_SUPERNODE_BUFFERS*CHOLMOD_DEVICE_STREAMS);
+ }
+#endif
+
+ /* -------------------------------------------------------------- */
+ /* prepare this supernode d for its next ancestor */
+ /* -------------------------------------------------------------- */
+
+ dnext = Next [d] ;
+
+ if (!repeat_supernode)
+ {
+ /* If node s is being repeated, Head [dancestor] has already
+ * been cleared (set to EMPTY). It must remain EMPTY. The
+ * dancestor will not be factorized since the factorization
+ * terminates at node s. */
+ Lpos [d] = pdi2 - pdi ;
+ if (Lpos [d] < ndrow)
+ {
+ dancestor = SuperMap [Ls [pdi2]] ;
+ ASSERT (dancestor > s && dancestor < nsuper) ;
+ /* place d in the link list of its next ancestor */
+ Next [d] = Head [dancestor] ;
+ Head [dancestor] = d ;
+ }
+ }
+
+ } /* end of descendant supernode loop */
+
+#ifdef GPU_BLAS
+ if ( useGPU ) {
+ iHostBuff = (Common->ibuffer)%CHOLMOD_HOST_SUPERNODE_BUFFERS;
+ iDevBuff = (Common->ibuffer)%CHOLMOD_DEVICE_STREAMS;
+
+ /* combine updates assembled on the GPU with updates
+ * assembled on the CPU */
+ TEMPLATE2 ( CHOLMOD (gpu_final_assembly ))
+ ( Common, Lx, psx, nscol, nsrow, supernodeUsedGPU,
+ &iHostBuff, &iDevBuff, gpu_p );
+ }
+#endif
+ PRINT1 (("\nSupernode with contributions A: repeat: "ID"\n",
+ repeat_supernode)) ;
+ DEBUG (CHOLMOD(dump_super) (s, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
+ Common)) ;
+ PRINT1 (("\n\n")) ;
+
+ /* ------------------------------------------------------------------ */
+ /* factorize diagonal block of supernode s in LL' */
+ /* ------------------------------------------------------------------ */
+
+ /* The current supernode s is ready to factorize. It has been updated
+ * by all descendant supernodes. Let S = the current supernode, which
+ * holds rows k1:n-1 and columns k1:k2-1 of the updated matrix. It
+ * splits into two parts: the square diagonal block S1, and the
+ * rectangular part S2. Here, S1 is factorized into L1*L1' and
+ * overwritten by L1.
+ *
+ * If supernode s is being repeated, only factorize it up to but not
+ * including the column containing the problematic entry.
+ */
+
+ nscol2 = (repeat_supernode) ? (nscol_new) : (nscol) ;
+
+#ifdef GPU_BLAS
+ if ( !useGPU
+ || !supernodeUsedGPU
+ || !TEMPLATE2 (CHOLMOD (gpu_lower_potrf))(nscol2, nsrow, psx, Lx,
+ &info, Common, gpu_p))
+#endif
+ {
+ /* Note that the GPU will not be used for the triangular solve */
+#ifdef GPU_BLAS
+ supernodeUsedGPU = 0;
+#endif
+#ifndef NTIMER
+ Common->CHOLMOD_CPU_POTRF_CALLS++ ;
+ tstart = SuiteSparse_time () ;
+#endif
+#ifdef REAL
+ LAPACK_dpotrf ("L",
+ nscol2, /* N: nscol2 */
+ Lx + L_ENTRY*psx, nsrow, /* A, LDA: S1, nsrow */
+ info) ; /* INFO */
+#else
+ LAPACK_zpotrf ("L",
+ nscol2, /* N: nscol2 */
+ Lx + L_ENTRY*psx, nsrow, /* A, LDA: S1, nsrow */
+ info) ; /* INFO */
+#endif
+#ifndef NTIMER
+ Common->CHOLMOD_CPU_POTRF_TIME += SuiteSparse_time ()- tstart ;
+#endif
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* check if the matrix is not positive definite */
+ /* ------------------------------------------------------------------ */
+
+ if (repeat_supernode)
+ {
+ /* the leading part has been refactorized; it must have succeeded */
+ info = 0 ;
+
+ /* zero out the rest of this supernode */
+ p = psx + nsrow * nscol_new ;
+ pend = psx + nsrow * nscol ; /* s is nsrow-by-nscol */
+ for ( ; p < pend ; p++)
+ {
+ /* Lx [p] = 0 ; */
+ L_CLEAR (Lx,p) ;
+ }
+ }
+
+ /* info is set to one in LAPACK_*potrf if blas_ok is FALSE. It is
+ * set to zero in dpotrf/zpotrf if the factorization was successful. */
+ if (CHECK_BLAS_INT && !Common->blas_ok)
+ {
+ ERROR (CHOLMOD_TOO_LARGE, "problem too large for the BLAS") ;
+ }
+
+ if (info != 0)
+ {
+ /* Matrix is not positive definite. dpotrf/zpotrf do NOT report an
+ * error if the diagonal of L has NaN's, only if it has a zero. */
+ if (Common->status == CHOLMOD_OK)
+ {
+ ERROR (CHOLMOD_NOT_POSDEF, "matrix not positive definite") ;
+ }
+
+ /* L->minor is the column of L that contains a zero or negative
+ * diagonal term. */
+ L->minor = k1 + info - 1 ;
+
+ /* clear the link lists of all subsequent supernodes */
+ for (ss = s+1 ; ss < nsuper ; ss++)
+ {
+ Head [ss] = EMPTY ;
+ }
+
+ /* zero this supernode, and all remaining supernodes */
+ pend = L->xsize ;
+ for (p = psx ; p < pend ; p++)
+ {
+ /* Lx [p] = 0. ; */
+ L_CLEAR (Lx,p) ;
+ }
+
+ /* If L is indefinite, it still contains useful information.
+ * Supernodes 0 to s-1 are valid, similar to MATLAB [R,p]=chol(A),
+ * where the 1-based p is identical to the 0-based L->minor. Since
+ * L->minor is in the current supernode s, it and any columns to the
+ * left of it in supernode s are also all zero. This differs from
+ * [R,p]=chol(A), which contains nonzero rows 1 to p-1. Fix this
+ * by setting repeat_supernode to TRUE, and repeating supernode s.
+ *
+ * If Common->quick_return_if_not_posdef is true, then the entire
+ * supernode s is not factorized; it is left as all zero.
+ */
+
+ if (info == 1 || Common->quick_return_if_not_posdef)
+ {
+ /* If the first column of supernode s contains a zero or
+ * negative diagonal entry, then it is already properly set to
+ * zero. Also, info will be 1 if integer overflow occured in
+ * the BLAS. */
+ Head [s] = EMPTY ;
+#ifdef GPU_BLAS
+ if ( useGPU ) {
+ CHOLMOD (gpu_end) (Common) ;
+ }
+#endif
+ return (Common->status >= CHOLMOD_OK) ;
+ }
+ else
+ {
+ /* Repeat supernode s, but only factorize it up to but not
+ * including the column containing the problematic diagonal
+ * entry. */
+ repeat_supernode = TRUE ;
+ s-- ;
+ nscol_new = info - 1 ;
+ continue ;
+ }
+ }
+
+ /* ------------------------------------------------------------------ */
+ /* compute the subdiagonal block and prepare supernode for its parent */
+ /* ------------------------------------------------------------------ */
+
+ nsrow2 = nsrow - nscol2 ;
+ if (nsrow2 > 0)
+ {
+ /* The current supernode is columns k1 to k2-1 of L. Let L1 be the
+ * diagonal block (factorized by dpotrf/zpotrf above; rows/cols
+ * k1:k2-1), and L2 be rows k2:n-1 and columns k1:k2-1 of L. The
+ * triangular system to solve is L2*L1' = S2, where S2 is
+ * overwritten with L2. More precisely, L2 = S2 / L1' in MATLAB
+ * notation.
+ */
+
+#ifdef GPU_BLAS
+ if ( !useGPU
+ || !supernodeUsedGPU
+ || !TEMPLATE2 (CHOLMOD(gpu_triangular_solve))
+ (nsrow2, nscol2, nsrow, psx, Lx, Common, gpu_p))
+#endif
+ {
+#ifndef NTIMER
+ Common->CHOLMOD_CPU_TRSM_CALLS++ ;
+ tstart = SuiteSparse_time () ;
+#endif
#ifdef REAL
- BLAS_dtrsm ("R", "L", "C", "N",
- nsrow2, nscol2, /* M, N */
- one, /* ALPHA: 1 */
- Lx + L_ENTRY*psx, nsrow, /* A, LDA: L1, nsrow */
- Lx + L_ENTRY*(psx + nscol2), /* B, LDB, L2, nsrow */
- nsrow) ;
+ BLAS_dtrsm ("R", "L", "C", "N",
+ nsrow2, nscol2, /* M, N */
+ one, /* ALPHA: 1 */
+ Lx + L_ENTRY*psx, nsrow, /* A, LDA: L1, nsrow */
+ Lx + L_ENTRY*(psx + nscol2), /* B, LDB, L2, nsrow */
+ nsrow) ;
#else
- BLAS_ztrsm ("R", "L", "C", "N",
- nsrow2, nscol2, /* M, N */
- one, /* ALPHA: 1 */
- Lx + L_ENTRY*psx, nsrow, /* A, LDA: L1, nsrow */
- Lx + L_ENTRY*(psx + nscol2), /* B, LDB, L2, nsrow */
- nsrow) ;
-#endif
-
- if (CHECK_BLAS_INT && !Common->blas_ok)
- {
- ERROR (CHOLMOD_TOO_LARGE, "problem too large for the BLAS") ;
- }
-
- if (!repeat_supernode)
- {
- /* Lpos [s] is offset of first row of s affecting its parent */
- Lpos [s] = nscol ;
- sparent = SuperMap [Ls [psi + nscol]] ;
- ASSERT (sparent != EMPTY) ;
- ASSERT (Ls [psi + nscol] >= Super [sparent]) ;
- ASSERT (Ls [psi + nscol] < Super [sparent+1]) ;
- ASSERT (SuperMap [Ls [psi + nscol]] == sparent) ;
- ASSERT (sparent > s && sparent < nsuper) ;
- /* place s in link list of its parent */
- Next [s] = Head [sparent] ;
- Head [sparent] = s ;
- }
- }
-
- Head [s] = EMPTY ; /* link list for supernode s no longer needed */
-
- /* clear the Map (debugging only, to detect changes in pattern of A) */
- DEBUG (for (k = 0 ; k < nsrow ; k++) Map [Ls [psi + k]] = EMPTY) ;
- DEBUG (CHOLMOD(dump_super) (s, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
- Common)) ;
-
- if (repeat_supernode)
- {
- /* matrix is not positive definite; finished clean-up for supernode
- * containing negative diagonal */
- return (Common->status >= CHOLMOD_OK) ;
- }
+ BLAS_ztrsm ("R", "L", "C", "N",
+ nsrow2, nscol2, /* M, N */
+ one, /* ALPHA: 1 */
+ Lx + L_ENTRY*psx, nsrow, /* A, LDA: L1, nsrow */
+ Lx + L_ENTRY*(psx + nscol2), /* B, LDB, L2, nsrow */
+ nsrow) ;
+#endif
+#ifndef NTIMER
+ Common->CHOLMOD_CPU_TRSM_TIME += SuiteSparse_time () - tstart ;
+#endif
+ }
+
+ if (CHECK_BLAS_INT && !Common->blas_ok)
+ {
+ ERROR (CHOLMOD_TOO_LARGE, "problem too large for the BLAS") ;
+ }
+
+ if (!repeat_supernode)
+ {
+ /* Lpos [s] is offset of first row of s affecting its parent */
+ Lpos [s] = nscol ;
+ sparent = SuperMap [Ls [psi + nscol]] ;
+ ASSERT (sparent != EMPTY) ;
+ ASSERT (Ls [psi + nscol] >= Super [sparent]) ;
+ ASSERT (Ls [psi + nscol] < Super [sparent+1]) ;
+ ASSERT (SuperMap [Ls [psi + nscol]] == sparent) ;
+ ASSERT (sparent > s && sparent < nsuper) ;
+ /* place s in link list of its parent */
+ Next [s] = Head [sparent] ;
+ Head [sparent] = s ;
+ }
+ }
+ else
+ {
+#ifdef GPU_BLAS
+ TEMPLATE2 ( CHOLMOD (gpu_copy_supernode) )
+ ( Common, Lx, psx, nscol, nscol2, nsrow,
+ supernodeUsedGPU, iHostBuff, gpu_p);
+#endif
+ }
+
+ Head [s] = EMPTY ; /* link list for supernode s no longer needed */
+
+ /* clear the Map (debugging only, to detect changes in pattern of A) */
+ DEBUG (for (k = 0 ; k < nsrow ; k++) Map [Ls [psi + k]] = EMPTY) ;
+ DEBUG (CHOLMOD(dump_super) (s, Super, Lpi, Ls, Lpx, Lx, L_ENTRY,
+ Common)) ;
+
+ if (repeat_supernode)
+ {
+ /* matrix is not positive definite; finished clean-up for supernode
+ * containing negative diagonal */
+
+#ifdef GPU_BLAS
+ if ( useGPU )
+ {
+ CHOLMOD (gpu_end) (Common) ;
+ }
+#endif
+ return (Common->status >= CHOLMOD_OK) ;
+ }
}
/* success; matrix is positive definite */
L->minor = n ;
+
+#ifdef GPU_BLAS
+ if ( useGPU )
+ {
+ CHOLMOD (gpu_end) (Common) ;
+ }
+#endif
+
return (Common->status >= CHOLMOD_OK) ;
+
}
+
#undef PATTERN
#undef REAL
#undef COMPLEX
diff --git a/src/C/SuiteSparse/CHOLMOD/Supernodal/t_cholmod_super_solve.c b/src/C/SuiteSparse/CHOLMOD/Supernodal/t_cholmod_super_solve.c
index 6509381..3706d89 100644
--- a/src/C/SuiteSparse/CHOLMOD/Supernodal/t_cholmod_super_solve.c
+++ b/src/C/SuiteSparse/CHOLMOD/Supernodal/t_cholmod_super_solve.c
@@ -7,7 +7,7 @@
* The CHOLMOD/Supernodal Module is licensed under Version 2.0 of the GNU
* General Public License. See gpl.txt for a text of the license.
* CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
/* Template routine for cholmod_super_solve. Supports real or complex L. */
diff --git a/src/C/SuiteSparse/COLAMD/Demo/Makefile b/src/C/SuiteSparse/COLAMD/Demo/Makefile
index f08df2a..a4ddbc0 100644
--- a/src/C/SuiteSparse/COLAMD/Demo/Makefile
+++ b/src/C/SuiteSparse/COLAMD/Demo/Makefile
@@ -4,13 +4,16 @@
default: colamd_example colamd_l_example
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
-I = -I../Include -I../../UFconfig
+I = -I../Include -I../../SuiteSparse_config
-C = $(CC) $(CFLAGS) $(I)
+C = $(CC) $(CF) $(I)
+
+LIB2 = ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB)
library:
+ ( cd ../../SuiteSparse_config ; $(MAKE) )
( cd ../Lib ; $(MAKE) )
#------------------------------------------------------------------------------
@@ -20,14 +23,14 @@ library:
dist:
colamd_example: colamd_example.c library
- $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a -lm
+ $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a $(LIB2)
- ./colamd_example > my_colamd_example.out
- diff colamd_example.out my_colamd_example.out
colamd_l_example: colamd_l_example.c library
- $(C) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.a -lm
+ $(C) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.a $(LIB2)
- ./colamd_l_example > my_colamd_l_example.out
- - diff colamd_example.out my_colamd_example.out
+ - diff colamd_l_example.out my_colamd_l_example.out
#------------------------------------------------------------------------------
# Remove all but the files in the original distribution
@@ -41,3 +44,4 @@ purge: distclean
distclean: clean
- $(RM) colamd_example colamd_l_example
- $(RM) my_colamd_example.out my_colamd_l_example.out
+ - $(RM) -r *.dSYM
diff --git a/src/C/SuiteSparse/COLAMD/Demo/colamd_example.c b/src/C/SuiteSparse/COLAMD/Demo/colamd_example.c
index fe824d8..3295186 100644
--- a/src/C/SuiteSparse/COLAMD/Demo/colamd_example.c
+++ b/src/C/SuiteSparse/COLAMD/Demo/colamd_example.c
@@ -25,8 +25,7 @@
(where x denotes a nonzero value).
- See http://www.cise.ufl.edu/research/sparse/colamd/ (the colamd.c file)
- for the routines this program calls, and for the License.
+ See the colamd.c for the routines this program calls, and for the License.
*/
/* ========================================================================== */
diff --git a/src/C/SuiteSparse/COLAMD/Demo/colamd_example.out b/src/C/SuiteSparse/COLAMD/Demo/colamd_example.out
index 93d121d..305164c 100644
--- a/src/C/SuiteSparse/COLAMD/Demo/colamd_example.out
+++ b/src/C/SuiteSparse/COLAMD/Demo/colamd_example.out
@@ -15,7 +15,7 @@ Column 3, with 2 entries:
row 1
row 3
-colamd version 2.7, Nov 1, 2007: OK.
+colamd version 2.9, Oct 10, 2014: OK.
colamd: number of dense or empty rows ignored: 0
colamd: number of dense or empty columns ignored: 0
colamd: number of garbage collections performed: 0
@@ -38,7 +38,7 @@ Column 3, with 1 entries:
row 4
Column 4, with 0 entries:
-symamd version 2.7, Nov 1, 2007: OK.
+symamd version 2.9, Oct 10, 2014: OK.
symamd: number of dense or empty rows ignored: 0
symamd: number of dense or empty columns ignored: 0
symamd: number of garbage collections performed: 0
diff --git a/src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.c b/src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.c
index 9ff9aeb..e1345e9 100644
--- a/src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.c
+++ b/src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.c
@@ -26,14 +26,14 @@
(where x denotes a nonzero value).
- See http://www.cise.ufl.edu/research/sparse/colamd/ (the colamd.c file)
- for the routines this program calls, and for the License.
+ See the colamd.c for the routines this program calls, and for the License.
*/
/* ========================================================================== */
#include <stdio.h>
#include "colamd.h"
+#define Long SuiteSparse_long
#define A_NNZ 11
#define A_NROW 5
@@ -43,9 +43,6 @@
#define B_NNZ 4
#define B_N 5
-/* define UF_long */
-#include "UFconfig.h"
-
int main (void)
{
@@ -53,14 +50,14 @@ int main (void)
/* input matrix A definition */
/* ====================================================================== */
- UF_long A [ALEN] = {
+ Long A [ALEN] = {
0, 1, 4, /* row indices of nonzeros in column 0 */
2, 4, /* row indices of nonzeros in column 1 */
0, 1, 2, 3, /* row indices of nonzeros in column 2 */
1, 3} ; /* row indices of nonzeros in column 3 */
- UF_long p [ ] = {
+ Long p [ ] = {
0, /* column 0 is in A [0..2] */
3, /* column 1 is in A [3..4] */
@@ -72,7 +69,7 @@ int main (void)
/* input matrix B definition */
/* ====================================================================== */
- UF_long B [ ] = { /* Note: only strictly lower triangular part */
+ Long B [ ] = { /* Note: only strictly lower triangular part */
/* is included, since symamd ignores the */
/* diagonal and upper triangular part of B. */
@@ -82,7 +79,7 @@ int main (void)
4 /* row indices of nonzeros in column 3 */
} ; /* row indices of nonzeros in column 4 (none) */
- UF_long q [ ] = {
+ Long q [ ] = {
0, /* column 0 is in B [0] */
1, /* column 1 is in B [1..2] */
@@ -95,10 +92,10 @@ int main (void)
/* other variable definitions */
/* ====================================================================== */
- UF_long perm [B_N+1] ; /* note the size is N+1 */
- UF_long stats [COLAMD_STATS] ;/* for colamd and symamd output statistics */
+ Long perm [B_N+1] ; /* note the size is N+1 */
+ Long stats [COLAMD_STATS] ; /* for colamd and symamd output statistics */
- UF_long row, col, pp, length, ok ;
+ Long row, col, pp, length, ok ;
/* ====================================================================== */
/* dump the input matrix A */
diff --git a/src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.out b/src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.out
index 3605229..2520a5f 100644
--- a/src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.out
+++ b/src/C/SuiteSparse/COLAMD/Demo/colamd_l_example.out
@@ -15,7 +15,7 @@ Column 3, with 2 entries:
row 1
row 3
-colamd version 2.7, Nov 1, 2007: OK.
+colamd version 2.9, Oct 10, 2014: OK.
colamd: number of dense or empty rows ignored: 0
colamd: number of dense or empty columns ignored: 0
colamd: number of garbage collections performed: 0
@@ -38,7 +38,7 @@ Column 3, with 1 entries:
row 4
Column 4, with 0 entries:
-symamd version 2.7, Nov 1, 2007: OK.
+symamd version 2.9, Oct 10, 2014: OK.
symamd: number of dense or empty rows ignored: 0
symamd: number of dense or empty columns ignored: 0
symamd: number of garbage collections performed: 0
diff --git a/src/C/SuiteSparse/COLAMD/Doc/ChangeLog b/src/C/SuiteSparse/COLAMD/Doc/ChangeLog
index 29308e9..e95f157 100644
--- a/src/C/SuiteSparse/COLAMD/Doc/ChangeLog
+++ b/src/C/SuiteSparse/COLAMD/Doc/ChangeLog
@@ -1,3 +1,27 @@
+Oct 10, 2014: version 2.9.1
+
+ modified MATLAB/colamd_make.m. No change to C code except version number.
+
+July 31, 2013: version 2.9.0
+
+ * changed malloc and printf pointers to use SuiteSparse_config
+
+Jun 1, 2012: version 2.8.0
+
+ * UFconfig replaced with SuiteSparse_config
+
+Dec 7, 2011: version 2.7.4
+
+ * fixed the Makefile to better align with CFLAGS and other standards
+
+Jan 25, 2011: version 2.7.3
+
+ * minor fix to "make install"
+
+Nov 30, 2009: version 2.7.2
+
+ * added "make install" and "make uninstall"
+
May 31, 2007: version 2.7.0
* ported to 64-bit MATLAB
diff --git a/src/C/SuiteSparse/COLAMD/Include/colamd.h b/src/C/SuiteSparse/COLAMD/Include/colamd.h
index 26372d8..ee4f644 100644
--- a/src/C/SuiteSparse/COLAMD/Include/colamd.h
+++ b/src/C/SuiteSparse/COLAMD/Include/colamd.h
@@ -10,7 +10,7 @@
Authors:
The authors of the code itself are Stefan I. Larimore and Timothy A.
- Davis (davis at cise.ufl.edu), University of Florida. The algorithm was
+ Davis (DrTimothyAldenDavis at gmail.com). The algorithm was
developed in collaboration with John Gilbert, Xerox PARC, and Esmond
Ng, Oak Ridge National Laboratory.
@@ -34,12 +34,8 @@
Availability:
- The colamd/symamd library is available at
-
- http://www.cise.ufl.edu/research/sparse/colamd/
-
- This is the http://www.cise.ufl.edu/research/sparse/colamd/colamd.h
- file. It is required by the colamd.c, colamdmex.c, and symamdmex.c
+ The colamd/symamd library is available at http://www.suitesparse.com
+ This file is required by the colamd.c, colamdmex.c, and symamdmex.c
files, and by any C code that calls the routines whose prototypes are
listed below, or that uses the colamd/symamd definitions listed below.
@@ -81,10 +77,10 @@ extern "C" {
* Versions 2.3 and earlier of COLAMD do not include a #define'd version number.
*/
-#define COLAMD_DATE "Nov 1, 2007"
+#define COLAMD_DATE "Oct 10, 2014"
#define COLAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
#define COLAMD_MAIN_VERSION 2
-#define COLAMD_SUB_VERSION 7
+#define COLAMD_SUB_VERSION 9
#define COLAMD_SUBSUB_VERSION 1
#define COLAMD_VERSION \
COLAMD_VERSION_CODE(COLAMD_MAIN_VERSION,COLAMD_SUB_VERSION)
@@ -139,8 +135,7 @@ extern "C" {
/* === Prototypes of user-callable routines ================================= */
/* ========================================================================== */
-/* define UF_long */
-#include "UFconfig.h"
+#include "SuiteSparse_config.h"
size_t colamd_recommended /* returns recommended value of Alen, */
/* or 0 if input arguments are erroneous */
@@ -153,9 +148,9 @@ size_t colamd_recommended /* returns recommended value of Alen, */
size_t colamd_l_recommended /* returns recommended value of Alen, */
/* or 0 if input arguments are erroneous */
(
- UF_long nnz, /* nonzeros in A */
- UF_long n_row, /* number of rows in A */
- UF_long n_col /* number of columns in A */
+ SuiteSparse_long nnz, /* nonzeros in A */
+ SuiteSparse_long n_row, /* number of rows in A */
+ SuiteSparse_long n_col /* number of columns in A */
) ;
void colamd_set_defaults /* sets default parameters */
@@ -179,15 +174,16 @@ int colamd /* returns (1) if successful, (0) otherwise*/
int stats [COLAMD_STATS] /* colamd output statistics and error codes */
) ;
-UF_long colamd_l /* returns (1) if successful, (0) otherwise*/
+SuiteSparse_long colamd_l /* returns (1) if successful, (0) otherwise*/
( /* A and p arguments are modified on output */
- UF_long n_row, /* number of rows in A */
- UF_long n_col, /* number of columns in A */
- UF_long Alen, /* size of the array A */
- UF_long A [], /* row indices of A, of size Alen */
- UF_long p [], /* column pointers of A, of size n_col+1 */
+ SuiteSparse_long n_row, /* number of rows in A */
+ SuiteSparse_long n_col, /* number of columns in A */
+ SuiteSparse_long Alen, /* size of the array A */
+ SuiteSparse_long A [], /* row indices of A, of size Alen */
+ SuiteSparse_long p [], /* column pointers of A, of size n_col+1 */
double knobs [COLAMD_KNOBS],/* parameter settings for colamd */
- UF_long stats [COLAMD_STATS]/* colamd output statistics and error codes */
+ SuiteSparse_long stats [COLAMD_STATS] /* colamd output statistics
+ * and error codes */
) ;
int symamd /* return (1) if OK, (0) otherwise */
@@ -206,14 +202,14 @@ int symamd /* return (1) if OK, (0) otherwise */
/* mxFree (for MATLAB mexFunction) */
) ;
-UF_long symamd_l /* return (1) if OK, (0) otherwise */
+SuiteSparse_long symamd_l /* return (1) if OK, (0) otherwise */
(
- UF_long n, /* number of rows and columns of A */
- UF_long A [], /* row indices of A */
- UF_long p [], /* column pointers of A */
- UF_long perm [], /* output permutation, size n_col+1 */
+ SuiteSparse_long n, /* number of rows and columns of A */
+ SuiteSparse_long A [], /* row indices of A */
+ SuiteSparse_long p [], /* column pointers of A */
+ SuiteSparse_long perm [], /* output permutation, size n_col+1 */
double knobs [COLAMD_KNOBS], /* parameters (uses defaults if NULL) */
- UF_long stats [COLAMD_STATS], /* output statistics and error codes */
+ SuiteSparse_long stats [COLAMD_STATS], /* output stats and error codes */
void * (*allocate) (size_t, size_t),
/* pointer to calloc (ANSI C) or */
/* mxCalloc (for MATLAB mexFunction) */
@@ -229,7 +225,7 @@ void colamd_report
void colamd_l_report
(
- UF_long stats [COLAMD_STATS]
+ SuiteSparse_long stats [COLAMD_STATS]
) ;
void symamd_report
@@ -239,15 +235,9 @@ void symamd_report
void symamd_l_report
(
- UF_long stats [COLAMD_STATS]
+ SuiteSparse_long stats [COLAMD_STATS]
) ;
-#ifndef EXTERN
-#define EXTERN extern
-#endif
-
-EXTERN int (*colamd_printf) (const char *, ...) ;
-
#ifdef __cplusplus
}
#endif
diff --git a/src/C/SuiteSparse/COLAMD/Lib/Makefile b/src/C/SuiteSparse/COLAMD/Lib/Makefile
index b1571ef..ea49720 100644
--- a/src/C/SuiteSparse/COLAMD/Lib/Makefile
+++ b/src/C/SuiteSparse/COLAMD/Lib/Makefile
@@ -4,20 +4,20 @@
default: libcolamd.a
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
-I = -I../Include -I../../UFconfig
+I = -I../Include -I../../SuiteSparse_config
-INC = ../Include/colamd.h ../../UFconfig/UFconfig.h
+INC = ../Include/colamd.h ../../SuiteSparse_config/SuiteSparse_config.h
-SRC = ../Source/colamd.c ../Source/colamd_global.c
+SRC = ../Source/colamd.c
# creates libcolamd.a, a C-callable COLAMD library
libcolamd.a: $(SRC) $(INC)
- $(CC) $(CFLAGS) $(I) -c ../Source/colamd_global.c
- $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c
- $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o
- $(AR) libcolamd.a colamd.o colamd_l.o colamd_global.o
+ $(CC) $(CF) $(I) -c ../Source/colamd.c
+ $(CC) $(CF) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o
+ $(ARCHIVE) libcolamd.a colamd.o colamd_l.o
+ - $(RANLIB) libcolamd.a
ccode: libcolamd.a
diff --git a/src/C/SuiteSparse/COLAMD/Makefile b/src/C/SuiteSparse/COLAMD/Makefile
index fd1397b..d253e56 100644
--- a/src/C/SuiteSparse/COLAMD/Makefile
+++ b/src/C/SuiteSparse/COLAMD/Makefile
@@ -2,23 +2,20 @@
# COLAMD Makefile
#------------------------------------------------------------------------------
-default: demo
+VERSION = 2.9.1
-include ../UFconfig/UFconfig.mk
+default: all
-# Compile all C code, including the C-callable routine and the mexFunctions.
-# Do not the MATLAB interface.
-demo:
- ( cd Lib ; $(MAKE) )
- ( cd Demo ; $(MAKE) )
+include ../SuiteSparse_config/SuiteSparse_config.mk
+
+demos: all
-# Compile all C code, including the C-callable routine and the mexFunctions.
+# Compile all C code
all:
( cd Lib ; $(MAKE) )
( cd Demo ; $(MAKE) )
- ( cd MATLAB ; $(MAKE) )
-# compile just the C-callable libraries (not mexFunctions or Demos)
+# compile just the C-callable libraries (not Demos)
library:
( cd Lib ; $(MAKE) )
@@ -26,13 +23,13 @@ library:
clean:
( cd Lib ; $(MAKE) clean )
( cd Demo ; $(MAKE) clean )
- ( cd MATLAB ; $(MAKE) clean )
+ ( cd MATLAB ; $(RM) $(CLEAN) )
# clean, and then remove compiled programs and library archives
purge:
( cd Lib ; $(MAKE) purge )
( cd Demo ; $(MAKE) purge )
- ( cd MATLAB ; $(MAKE) purge )
+ ( cd MATLAB ; $(RM) $(CLEAN) ; $(RM) *.mex* )
distclean: purge
@@ -44,6 +41,16 @@ ccode: library
lib: library
-# compile the MATLAB mexFunction
-mex:
- ( cd MATLAB ; $(MAKE) )
+# install COLAMD
+install:
+ $(CP) Lib/libcolamd.a $(INSTALL_LIB)/libcolamd.$(VERSION).a
+ ( cd $(INSTALL_LIB) ; ln -sf libcolamd.$(VERSION).a libcolamd.a )
+ $(CP) Include/colamd.h $(INSTALL_INCLUDE)
+ chmod 644 $(INSTALL_LIB)/libcolamd*.a
+ chmod 644 $(INSTALL_INCLUDE)/colamd.h
+
+# uninstall COLAMD
+uninstall:
+ $(RM) $(INSTALL_LIB)/libcolamd*.a
+ $(RM) $(INSTALL_INCLUDE)/colamd.h
+
diff --git a/src/C/SuiteSparse/COLAMD/README.txt b/src/C/SuiteSparse/COLAMD/README.txt
index 5ed81c7..e22ebd5 100644
--- a/src/C/SuiteSparse/COLAMD/README.txt
+++ b/src/C/SuiteSparse/COLAMD/README.txt
@@ -1,4 +1,4 @@
-The COLAMD ordering method - Version 2.7
+COLAMD, Copyright 1998-2013, Timothy A. Davis. http://www.suitesparse.com
-------------------------------------------------------------------------------
The COLAMD column approximate minimum degree ordering algorithm computes
@@ -24,10 +24,6 @@ A short demo will run. Optionally, type colamd_test to run an extensive tests.
Type "make" in Unix in the COLAMD directory to compile the C-callable
library and to run a short demo.
-If you have MATLAB 7.2 or earlier, you must first edit UFconfig/UFconfig.h to
-remove the "-largeArrayDims" option from the MEX command (or just use
-colamd_make.m inside MATLAB).
-
Colamd is a built-in routine in MATLAB, available from The
Mathworks, Inc. Under most cases, the compiled COLAMD from Versions 2.0 to the
current version do not differ. Colamd Versions 2.2 and 2.3 differ only in their
@@ -42,13 +38,10 @@ colamd.c, colamd_global.c, and colamd.h, which are the C-callable
colamd/symamd codes. See colamd.c for more information on how to call
colamd from a C program.
-Requires UFconfig, in the ../UFconfig directory relative to this directory.
-
- Copyright (c) 1998-2007, Timothy A. Davis, All Rights Reserved.
-
- See http://www.cise.ufl.edu/research/sparse/colamd (the colamd.c
- file) for the License.
+Requires SuiteSparse_config, in the ../SuiteSparse_config directory relative to
+this directory.
+See the colamd.c file or http://www.suitesparse.com for the license to COLAMD.
Related papers:
@@ -64,17 +57,15 @@ Related papers:
"An approximate minimum degree column ordering algorithm",
S. I. Larimore, MS Thesis, Dept. of Computer and Information
Science and Engineering, University of Florida, Gainesville, FL,
- 1998. CISE Tech Report TR-98-016. Available at
- ftp://ftp.cise.ufl.edu/cis/tech-reports/tr98/tr98-016.ps
- via anonymous ftp.
+ 1998. CISE Tech Report TR-98-016.
Approximate Deficiency for Ordering the Columns of a Matrix,
J. L. Kern, Senior Thesis, Dept. of Computer and Information
Science and Engineering, University of Florida, Gainesville, FL,
- 1999. Available at http://www.cise.ufl.edu/~davis/Kern/kern.ps
+ 1999.
-Authors: Stefan I. Larimore and Timothy A. Davis, University of Florida,
+Authors: Stefan I. Larimore and Timothy A. Davis,
in collaboration with John Gilbert, Xerox PARC (now at UC Santa Barbara),
and Esmong Ng, Lawrence Berkeley National Laboratory (much of this work
he did while at Oak Ridge National Laboratory).
diff --git a/src/C/SuiteSparse/COLAMD/Source/colamd.c b/src/C/SuiteSparse/COLAMD/Source/colamd.c
index 5fe20d6..eb306a0 100644
--- a/src/C/SuiteSparse/COLAMD/Source/colamd.c
+++ b/src/C/SuiteSparse/COLAMD/Source/colamd.c
@@ -35,7 +35,7 @@
Authors:
The authors of the code itself are Stefan I. Larimore and Timothy A.
- Davis (davis at cise.ufl.edu), University of Florida. The algorithm was
+ Davis (DrTimothyAldenDavis at gmail.com). The algorithm was
developed in collaboration with John Gilbert, Xerox PARC, and Esmond
Ng, Oak Ridge National Laboratory.
@@ -77,13 +77,7 @@
Availability:
- The colamd/symamd library is available at
-
- http://www.cise.ufl.edu/research/sparse/colamd/
-
- This is the http://www.cise.ufl.edu/research/sparse/colamd/colamd.c
- file. It requires the colamd.h file. It is required by the colamdmex.c
- and symamdmex.c files, for the MATLAB interface to colamd and symamd.
+ The colamd/symamd library is available at http://www.suitesparse.com
Appears as ACM Algorithm 836.
See the ChangeLog file for changes since Version 1.0.
@@ -105,9 +99,10 @@
/* === Description of user-callable routines ================================ */
/* ========================================================================== */
-/* COLAMD includes both int and UF_long versions of all its routines. The
- * description below is for the int version. For UF_long, all int arguments
- * become UF_long. UF_long is normally defined as long, except for WIN64.
+/* COLAMD includes both int and SuiteSparse_long versions of all its routines.
+ The description below is for the int version. For SuiteSparse_long, all
+ int arguments become SuiteSparse_long. SuiteSparse_long is normally
+ defined as long, except for WIN64.
----------------------------------------------------------------------------
colamd_recommended:
@@ -117,8 +112,8 @@
#include "colamd.h"
size_t colamd_recommended (int nnz, int n_row, int n_col) ;
- size_t colamd_l_recommended (UF_long nnz, UF_long n_row,
- UF_long n_col) ;
+ size_t colamd_l_recommended (SuiteSparse_long nnz,
+ SuiteSparse_long n_row, SuiteSparse_long n_col) ;
Purpose:
@@ -201,9 +196,10 @@
#include "colamd.h"
int colamd (int n_row, int n_col, int Alen, int *A, int *p,
double knobs [COLAMD_KNOBS], int stats [COLAMD_STATS]) ;
- UF_long colamd_l (UF_long n_row, UF_long n_col, UF_long Alen,
- UF_long *A, UF_long *p, double knobs [COLAMD_KNOBS],
- UF_long stats [COLAMD_STATS]) ;
+ SuiteSparse_long colamd_l (SuiteSparse_long n_row,
+ SuiteSparse_long n_col, SuiteSparse_long Alen,
+ SuiteSparse_long *A, SuiteSparse_long *p, double knobs
+ [COLAMD_KNOBS], SuiteSparse_long stats [COLAMD_STATS]) ;
Purpose:
@@ -379,8 +375,7 @@
Example:
- See http://www.cise.ufl.edu/research/sparse/colamd/example.c
- for a complete example.
+ See colamd_example.c for a complete example.
To order the columns of a 5-by-4 matrix with 11 nonzero entries in
the following nonzero pattern
@@ -412,9 +407,10 @@
int symamd (int n, int *A, int *p, int *perm,
double knobs [COLAMD_KNOBS], int stats [COLAMD_STATS],
void (*allocate) (size_t, size_t), void (*release) (void *)) ;
- UF_long symamd_l (UF_long n, UF_long *A, UF_long *p, UF_long *perm,
- double knobs [COLAMD_KNOBS], UF_long stats [COLAMD_STATS],
- void (*allocate) (size_t, size_t), void (*release) (void *)) ;
+ SuiteSparse_long symamd_l (SuiteSparse_long n, SuiteSparse_long *A,
+ SuiteSparse_long *p, SuiteSparse_long *perm, double knobs
+ [COLAMD_KNOBS], SuiteSparse_long stats [COLAMD_STATS], void
+ (*allocate) (size_t, size_t), void (*release) (void *)) ;
Purpose:
@@ -581,7 +577,7 @@
#include "colamd.h"
colamd_report (int stats [COLAMD_STATS]) ;
- colamd_l_report (UF_long stats [COLAMD_STATS]) ;
+ colamd_l_report (SuiteSparse_long stats [COLAMD_STATS]) ;
Purpose:
@@ -602,7 +598,7 @@
#include "colamd.h"
symamd_report (int stats [COLAMD_STATS]) ;
- symamd_l_report (UF_long stats [COLAMD_STATS]) ;
+ symamd_l_report (SuiteSparse_long stats [COLAMD_STATS]) ;
Purpose:
@@ -681,17 +677,14 @@
#endif
/* ========================================================================== */
-/* === int or UF_long ======================================================= */
+/* === int or SuiteSparse_long ============================================== */
/* ========================================================================== */
-/* define UF_long */
-#include "UFconfig.h"
-
#ifdef DLONG
-#define Int UF_long
-#define ID UF_long_id
-#define Int_MAX UF_long_max
+#define Int SuiteSparse_long
+#define ID SuiteSparse_long_id
+#define Int_MAX SuiteSparse_long_max
#define COLAMD_recommended colamd_l_recommended
#define COLAMD_set_defaults colamd_l_set_defaults
@@ -835,9 +828,6 @@ typedef struct Colamd_Row_struct
#define INDEX(i) (i)
#endif
-/* All output goes through the PRINTF macro. */
-#define PRINTF(params) { if (colamd_printf != NULL) (void) colamd_printf params ; }
-
/* ========================================================================== */
/* === Prototypes of PRIVATE routines ======================================= */
/* ========================================================================== */
@@ -941,11 +931,11 @@ PRIVATE void print_report
PRIVATE Int colamd_debug = 0 ; /* debug print level */
-#define DEBUG0(params) { PRINTF (params) ; }
-#define DEBUG1(params) { if (colamd_debug >= 1) PRINTF (params) ; }
-#define DEBUG2(params) { if (colamd_debug >= 2) PRINTF (params) ; }
-#define DEBUG3(params) { if (colamd_debug >= 3) PRINTF (params) ; }
-#define DEBUG4(params) { if (colamd_debug >= 4) PRINTF (params) ; }
+#define DEBUG0(params) { SUITESPARSE_PRINTF (params) ; }
+#define DEBUG1(params) { if (colamd_debug >= 1) SUITESPARSE_PRINTF (params) ; }
+#define DEBUG2(params) { if (colamd_debug >= 2) SUITESPARSE_PRINTF (params) ; }
+#define DEBUG3(params) { if (colamd_debug >= 3) SUITESPARSE_PRINTF (params) ; }
+#define DEBUG4(params) { if (colamd_debug >= 4) SUITESPARSE_PRINTF (params) ; }
#ifdef MATLAB_MEX_FILE
#define ASSERT(expression) (mxAssert ((expression), ""))
@@ -3188,12 +3178,12 @@ PRIVATE void print_report
Int i1, i2, i3 ;
- PRINTF (("\n%s version %d.%d, %s: ", method,
- COLAMD_MAIN_VERSION, COLAMD_SUB_VERSION, COLAMD_DATE)) ;
+ SUITESPARSE_PRINTF (("\n%s version %d.%d, %s: ", method,
+ COLAMD_MAIN_VERSION, COLAMD_SUB_VERSION, COLAMD_DATE)) ;
if (!stats)
{
- PRINTF (("No statistics available.\n")) ;
+ SUITESPARSE_PRINTF (("No statistics available.\n")) ;
return ;
}
@@ -3203,11 +3193,11 @@ PRIVATE void print_report
if (stats [COLAMD_STATUS] >= 0)
{
- PRINTF (("OK. ")) ;
+ SUITESPARSE_PRINTF (("OK. ")) ;
}
else
{
- PRINTF (("ERROR. ")) ;
+ SUITESPARSE_PRINTF (("ERROR. ")) ;
}
switch (stats [COLAMD_STATUS])
@@ -3215,87 +3205,99 @@ PRIVATE void print_report
case COLAMD_OK_BUT_JUMBLED:
- PRINTF(("Matrix has unsorted or duplicate row indices.\n")) ;
+ SUITESPARSE_PRINTF((
+ "Matrix has unsorted or duplicate row indices.\n")) ;
- PRINTF(("%s: number of duplicate or out-of-order row indices: %d\n",
- method, i3)) ;
+ SUITESPARSE_PRINTF((
+ "%s: number of duplicate or out-of-order row indices: %d\n",
+ method, i3)) ;
- PRINTF(("%s: last seen duplicate or out-of-order row index: %d\n",
- method, INDEX (i2))) ;
+ SUITESPARSE_PRINTF((
+ "%s: last seen duplicate or out-of-order row index: %d\n",
+ method, INDEX (i2))) ;
- PRINTF(("%s: last seen in column: %d",
- method, INDEX (i1))) ;
+ SUITESPARSE_PRINTF((
+ "%s: last seen in column: %d",
+ method, INDEX (i1))) ;
/* no break - fall through to next case instead */
case COLAMD_OK:
- PRINTF(("\n")) ;
+ SUITESPARSE_PRINTF(("\n")) ;
- PRINTF(("%s: number of dense or empty rows ignored: %d\n",
- method, stats [COLAMD_DENSE_ROW])) ;
+ SUITESPARSE_PRINTF((
+ "%s: number of dense or empty rows ignored: %d\n",
+ method, stats [COLAMD_DENSE_ROW])) ;
- PRINTF(("%s: number of dense or empty columns ignored: %d\n",
- method, stats [COLAMD_DENSE_COL])) ;
+ SUITESPARSE_PRINTF((
+ "%s: number of dense or empty columns ignored: %d\n",
+ method, stats [COLAMD_DENSE_COL])) ;
- PRINTF(("%s: number of garbage collections performed: %d\n",
- method, stats [COLAMD_DEFRAG_COUNT])) ;
+ SUITESPARSE_PRINTF((
+ "%s: number of garbage collections performed: %d\n",
+ method, stats [COLAMD_DEFRAG_COUNT])) ;
break ;
case COLAMD_ERROR_A_not_present:
- PRINTF(("Array A (row indices of matrix) not present.\n")) ;
+ SUITESPARSE_PRINTF((
+ "Array A (row indices of matrix) not present.\n")) ;
break ;
case COLAMD_ERROR_p_not_present:
- PRINTF(("Array p (column pointers for matrix) not present.\n")) ;
+ SUITESPARSE_PRINTF((
+ "Array p (column pointers for matrix) not present.\n")) ;
break ;
case COLAMD_ERROR_nrow_negative:
- PRINTF(("Invalid number of rows (%d).\n", i1)) ;
+ SUITESPARSE_PRINTF(("Invalid number of rows (%d).\n", i1)) ;
break ;
case COLAMD_ERROR_ncol_negative:
- PRINTF(("Invalid number of columns (%d).\n", i1)) ;
+ SUITESPARSE_PRINTF(("Invalid number of columns (%d).\n", i1)) ;
break ;
case COLAMD_ERROR_nnz_negative:
- PRINTF(("Invalid number of nonzero entries (%d).\n", i1)) ;
+ SUITESPARSE_PRINTF((
+ "Invalid number of nonzero entries (%d).\n", i1)) ;
break ;
case COLAMD_ERROR_p0_nonzero:
- PRINTF(("Invalid column pointer, p [0] = %d, must be zero.\n", i1));
+ SUITESPARSE_PRINTF((
+ "Invalid column pointer, p [0] = %d, must be zero.\n", i1));
break ;
case COLAMD_ERROR_A_too_small:
- PRINTF(("Array A too small.\n")) ;
- PRINTF((" Need Alen >= %d, but given only Alen = %d.\n",
- i1, i2)) ;
+ SUITESPARSE_PRINTF(("Array A too small.\n")) ;
+ SUITESPARSE_PRINTF((
+ " Need Alen >= %d, but given only Alen = %d.\n",
+ i1, i2)) ;
break ;
case COLAMD_ERROR_col_length_negative:
- PRINTF
- (("Column %d has a negative number of nonzero entries (%d).\n",
- INDEX (i1), i2)) ;
+ SUITESPARSE_PRINTF
+ (("Column %d has a negative number of nonzero entries (%d).\n",
+ INDEX (i1), i2)) ;
break ;
case COLAMD_ERROR_row_index_out_of_bounds:
- PRINTF
- (("Row index (row %d) out of bounds (%d to %d) in column %d.\n",
- INDEX (i2), INDEX (0), INDEX (i3-1), INDEX (i1))) ;
+ SUITESPARSE_PRINTF
+ (("Row index (row %d) out of bounds (%d to %d) in column %d.\n",
+ INDEX (i2), INDEX (0), INDEX (i3-1), INDEX (i1))) ;
break ;
case COLAMD_ERROR_out_of_memory:
- PRINTF(("Out of memory.\n")) ;
+ SUITESPARSE_PRINTF(("Out of memory.\n")) ;
break ;
/* v2.4: internal-error case deleted */
diff --git a/src/C/SuiteSparse/COLAMD/Source/colamd_global.c b/src/C/SuiteSparse/COLAMD/Source/colamd_global.c
index 4d1ae22..9bf3ce2 100644
--- a/src/C/SuiteSparse/COLAMD/Source/colamd_global.c
+++ b/src/C/SuiteSparse/COLAMD/Source/colamd_global.c
@@ -5,20 +5,8 @@
/* ----------------------------------------------------------------------------
* COLAMD, Copyright (C) 2007, Timothy A. Davis.
* See License.txt for the Version 2.1 of the GNU Lesser General Public License
- * http://www.cise.ufl.edu/research/sparse
+ * http://www.suitesparse.com
* -------------------------------------------------------------------------- */
-/* Global variables for COLAMD */
-
-#ifndef NPRINT
-#ifdef MATLAB_MEX_FILE
-#include "mex.h"
-int (*colamd_printf) (const char *, ...) = mexPrintf ;
-#else
-#include <stdio.h>
-int (*colamd_printf) (const char *, ...) = printf ;
-#endif
-#else
-int (*colamd_printf) (const char *, ...) = ((void *) 0) ;
-#endif
-
+/* Global variables for COLAMD : colamd_printf replaced with
+ a function in SuiteSparse_config. */
diff --git a/src/C/SuiteSparse/ChangeLog b/src/C/SuiteSparse/ChangeLog
new file mode 100644
index 0000000..463620f
--- /dev/null
+++ b/src/C/SuiteSparse/ChangeLog
@@ -0,0 +1,505 @@
+July 2015: SuiteSparse version 4.4.5
+
+ * CHOLMOD 3.0.6:
+ - minor fix to CHOLMOD (-DNGPL did not work as expected)
+ - added MATLAB interface for row add/delete (lurowmod)
+ * KLU 1.3.3: Fix for klu_dump.c (debugging case only)
+ * UFcollection: added additional stats for matrix collection
+ * AMD: changed the license. Was LGPL only, now either LGPL or BSD,
+ at the user's option. See AMD/Doc/License.txt for details.
+
+Mar 24, 2015: SuiteSparse version 4.4.4
+
+ * CHOLMOD version number corrected. In 4.4.3, the CHOLMOD_SUBSUB_VERSION
+ string was left at '4' (it should have been '5', for CHOLMOD 3.0.5).
+ This version of SuiteSparse corrects this glitch.
+ * Minor changes to comments in SuiteSparse_config.
+ * SPQR version 2.0.1 released (minor update to documentation)
+
+Jan 19, 2015: SuiteSparse version 4.4.3
+
+ * CHOLMOD 3.0.5: minor bug fix to MatrixOps/cholmod_symmetry
+
+Jan 7, 2015: SuiteSparse version 4.4.2
+
+ * CHOLMOD 3.0.4: serious bug fix in supernodal factorization,
+ introduced in CHOLMOD 3.0.0 (SuiteSparse 4.3.0). Can cause segfault,
+ and has no user workaround.
+
+Oct 23, 2014: SuiteSparse version 4.4.1
+ Minor update: two bug fixes (affecting Windows only)
+
+ * CHOLMOD 3.0.3:
+ minor update to CHOLMOD (non-ANSI C usage in one *.c file, affects
+ Windows only)
+ * KLU 1.3.2:
+ minor fix to MATLAB install; no change to C except version nubmer
+
+
+Oct 10, 2014: SuiteSparse version 4.4.0
+ MAJOR UPDATE: new GPU-acceleration for SPQR
+
+ * AMD 2.4.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * BTF 1.2.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * CAMD 2.4.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * CCOLAMD 2.9.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * CHOLMOD 3.0.2:
+ update to accomodate GPU-accelerated SPQR
+ added CHOLMOD/Include/cholmod_function.h
+ * COLAMD 2.9.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * CSparse 3.1.4:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * CXSparse 3.1.4:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * GPUQREngine 1.0.0:
+ FIRST RELEASE. Used by SPQR 2.0.0
+ * KLU 1.3.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ update to KLU/Tcov/Makefile
+ * LDL 2.2.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * RBio 2.2.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * SPQR 2.0.0:
+ MAJOR UPDATE. added GPU support. Up to 11x faster than on CPU
+ * SuiteSparse_GPURuntime 1.0.0:
+ FIRST RELEASE. Used by SPQR 2.0.0
+ * UMFPACK 5.7.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * MATLAB_Tools:
+ modified SSMULT/ssmult_install.m. No change to C code
+
+
+July 18, 2014: SuiteSparse version 4.3.1
+ Minor update: added cholmod_rowfac_mask2 function to CHOLMOD
+
+ * CHOLMOD 3.0.1:
+ added cholmod_rowfac_mask2 function. Minor fix to build process
+ * SPQR 1.3.3:
+ minor fix to build process
+
+
+March 26, 2014: SuiteSparse version 4.3.0
+ MAJOR UPDATE: first release of CHOLMOD GPU acceleration
+ minor update: modified all packages to use SuiteSparse_config for
+ malloc/calloc/realloc/free, printf, hypot, and divcomplex
+ function pointers.
+
+ * AMD 2.4.0:
+ changed malloc/printf pointers to use SuiteSparse_config
+ * CAMD 2.4.0:
+ changed malloc/printf pointers to use SuiteSparse_config
+ * CCOLAMD 2.9.0:
+ changed malloc/printf pointers to use SuiteSparse_config
+ * CHOLMOD 3.0.0:
+ MAJOR UPDATE to GPU acceleration. Released at GTC 2014.
+ * COLAMD 2.9.0:
+ changed malloc/printf pointers to use SuiteSparse_config
+ * CSparse 3.1.3:
+ minor update to UFget
+ * CXSparse 3.1.3:
+ minor update to UFget
+ * KLU 1.3.0:
+ changed malloc/printf pointers to use SuiteSparse_config
+ * LDL 2.2.0:
+ changed malloc/printf pointers to use SuiteSparse_config
+ * RBio 2.2.0:
+ changed malloc/printf pointers to use SuiteSparse_config
+ * SPQR 1.3.2:
+ changed malloc/printf pointers to use SuiteSparse_config
+ * UMFPACK 5.7.0:
+ changed malloc/printf pointers to use SuiteSparse_config
+ * MATLAB_Tools:
+ added stats to UFcollection, revised commends in SFMULT,
+ minor update to spok
+
+
+April 25, 2013: SuiteSparse version 4.2.1
+ minor update
+
+ * CHOLMOD 2.1.2:
+ minor update to Cholesky/*solve*c (for Windows compiler)
+ * UMFPACK 5.6.2:
+ bug fix in Demo/Makefile for Fortran interface
+ * MATLAB_Tools:
+ minor update to sparseinv
+
+
+April 16, 2013: SuiteSparse version 4.2.0
+ minor update and bug fix
+
+ * CHOLMOD 2.1.1:
+ minor changes to GPU accelerated version, fixed GPU memory leak
+ * CSparse 3.1.2:
+ minor update to cs_sqr.c; no affect on functionality
+ * CXSparse 3.1.2:
+ minor update to cs_sqr.c; no affect on functionality
+
+March 27, 2013: SuiteSparse version 4.1.0
+ new features added to CHOLMOD
+
+ * CHOLMOD 2.1.0:
+ added new features and functions to forward/backsolve:
+ cholmod_lsolve_pattern, cholmod_solve2, cholmod_ensure_dense.
+ * MATLAB_Tools:
+ added SFMULT. minor update to Factorize, problems added to dimacs10
+
+July 17, 2012: SuiteSparse version 4.0.2
+ major update to MATLAB_Tools/Factorize. No change to any C code.
+
+ * MATLAB_Tools:
+ major update to Factorize, minor update to sparseinv
+
+
+June 20, 2012: SuiteSparse version 4.0.1
+
+ * AMD 2.3.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * CAMD 2.3.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * CHOLMOD 2.0.1:
+ bug fix for GPU code, when the matrix is singular
+ minor fix to MATLAB install
+ * CSparse 3.1.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * CXSparse 3.1.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * KLU 1.2.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * RBio 2.1.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * SPQR 1.3.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * UMFPACK 5.6.1:
+ minor fix to MATLAB install; no change to C except version nubmer
+ * MATLAB_Tools:
+ update to UFcollection (filesep)
+
+
+June 1, 2012: SuiteSparse version 4.0.0
+ MAJOR UPDATE: First GPU version for CHOLMOD.
+ UFconfig renamed to SuiteSparse_config.
+
+ * AMD 2.3.0:
+ replaced UFconfig with SuiteSparse_config
+ * BTF 1.2.0:
+ replaced UFconfig with SuiteSparse_config
+ * CAMD 2.3.0:
+ replaced UFconfig with SuiteSparse_config
+ * CCOLAMD 2.8.0:
+ replaced UFconfig with SuiteSparse_config
+ * CHOLMOD 2.0.0:
+ replaced UFconfig with SuiteSparse_config
+ first GPU-accelerated version.
+ * COLAMD 2.8.0:
+ replaced UFconfig with SuiteSparse_config
+ * CSparse 3.1.0:
+ minor changes to enable creation of CXSparse 3.1.0
+ * CXSparse 3.1.0:
+ replaced UFconfig with SuiteSparse_config
+ * KLU 1.2.0:
+ replaced UFconfig with SuiteSparse_config
+ * LDL 2.1.0:
+ replaced UFconfig with SuiteSparse_config
+ * RBio 2.1.0:
+ replaced UFconfig with SuiteSparse_config
+ * SPQR 1.3.0:
+ replaced UFconfig with SuiteSparse_config
+ removed spqr_time; using SuiteSparse timing routines instead
+ * UMFPACK 5.6.0:
+ replaced UFconfig with SuiteSparse_config
+ * MATLAB_Tools:
+ update to documentation for Factorize, update to UFcollection
+
+May 15, 2012: SuiteSparse version 3.7.1
+ minor update
+
+ * AMD 2.2.4:
+ minor compiler workaround
+ * CAMD 2.2.4:
+ minor compiler workaround
+ * KLU 1.1.4:
+ bug fix in the case of Int overflow
+ * MATLAB_Tools:
+ minor update to spqr_rank and UFcollection
+
+Dec 15, 2011: SuiteSparse version 3.7.0
+ MAJOR UPDATE: added spqr_rank and sparseinv to MATLAB_Tools
+ major update to Factorize package in MATLAB_Tools
+ minor update to Makefiles for C code.
+
+ * AMD 2.2.3:
+ Makefile updated
+ * BTF 1.1.3:
+ Makefile updated
+ * CAMD 2.2.3:
+ Makefile updated
+ * CCOLAMD 2.7.4:
+ Makefile updated
+ * CHOLMOD 1.7.4:
+ Makefile updated
+ * COLAMD 2.7.4:
+ Makefile updated
+ * CSparse 3.0.2:
+ Makefile updated. Fix to MATLAB install. Now as CSparse (not CSparse3)
+ * KLU 1.1.3:
+ Makefile updated. minor fix to MATLAB mexFunction
+ * LDL 2.0.4:
+ Makefile updated. Update to demo program
+ * RBio 2.0.2:
+ Makefile updated. Update to MATLAB mexFunction
+ * SPQR 1.2.3
+ Makefile updated. Update to MATLAB install
+ * UMFPACK 5.5.2:
+ Makefile updated. Update to MATLAB install
+ * MATLAB_Tools:
+ added spqr_rank and sparseinv. Major update to Factorize, dimacs10
+
+
+
+May 10, 2011: SuiteSparse version 3.6.1
+ minor update
+
+ * SPQR 1.2.2:
+ minor fix, compiler workaround
+ * CSparse 3.0.1:
+ Added as the CSparse3 directory (original date Jan 19, 2010;
+ added to SuiteSparse on May 10, 2011. Note that CSparse v2.x.x.
+ was also distributed)
+ * MATLAB_Tools:
+ added dimacs10. Minor update to spok.
+
+
+Jan 25, 2011: SuiteSparse version 3.6.0
+ minor update
+
+ * AMD 2.2.2:
+ Makefile updated.
+ * BTF 1.1.2:
+ Makefile updated.
+ * CAMD 2.2.2:
+ Makefile updated.
+ * CCOLAMD 2.7.3:
+ Makefile updated. Minor fix to stats printout
+ * CHOLMOD 1.7.3:
+ Makefile updated. Minor fix, compiler workaround
+ * COLAMD 2.7.3:
+ Makefile updated
+ * CSparse 2.2.5:
+ Makefile updated. minor fixes to UFget, cs_util.c.
+ * KLU 1.1.2:
+ Makefile updated. ported Tcov to Mac.
+ * LDL 2.0.3:
+ Makefile updated.
+ * RBio 2.0.1:
+ Makefile updated.
+ * SPQR 1.2.1:
+ Makefile updated. Added examples. Fixed error handling.
+ * UMFPACK 5.5.1:
+ Makefile updated.
+ * MATLAB_Tools:
+ minor update to spok
+
+Nov 30, 2009: SuiteSparse version 3.5.0
+ major update to SPQR and RBio; minor updates to Makefiles.
+
+ * AMD 2.2.1:
+ Makefile updated.
+ * BTF 1.1.1
+ Makefile updated.
+ * CAMD 2.2.1:
+ Makefile updated.
+ * CCOLAMD 2.7.2:
+ Makefile updated.
+ * CHOLMOD 1.7.2:
+ Makefile updated. Fixed 64-bit BLAS for MATLAB 7.8.
+ * COLAMD 2.7.2:
+ Makefile updated.
+ * CSparse 2.2.4
+ Makefile updated. MATLAB install updated.
+ * KLU 1.1.1:
+ Makefile updated.
+ * LDL 2.0.2:
+ Makefile updated.
+ * RBio 2.0.0:
+ major update: rewritten in C. No longer in Fortran.
+ Makefile updated.
+ * SPQR 1.2.0:
+ major update: added features required by MATLAB package spqr_rank,
+ changed default ordering to COLAMD.
+ Makefile updated.
+ * UMFPACK 5.5.0:
+ major update. Added user-ordering function, interface to CHOLMOD
+ orderings, option to disable singleton search to allow L to be
+ well-conditioned.
+ Makefile updated.
+ * MATLAB_Tools:
+ major update to Factorize. Minor updates to GEE, getversion, spok.
+
+
+May 20, 2009: SuiteSparse version 3.4.0
+ MAJOR UPDATE: added Factorize package to MATLAB_TOols
+ major update to UMFPACK (removed 2-by-2 strategy)
+
+ * RBio 1.1.2:
+ update to MATLAB install
+ * SPQR 1.1.2:
+ added more examples. Mac compiler workaround.
+ * UMFPACK 5.4.0:
+ removed 2-by-2 strategy. update to MATLAB install.
+ * MATLAB_Tools:
+ added Factorize
+
+
+March 24, 2009: SuiteSparse version 3.3.0
+ minor update
+
+ * BTF 1.1.0:
+ minor update.
+ * CHOLMOD 1.7.1:
+ bug fix for cholmod_symmetry
+ * CSparse 2.2.3:
+ cs_gaxpy example fixed. Minor change to MATLAB cs_sparse interface
+ * CXSparse 2.2.3:
+ cs_gaxpy example fixed. Minor change to MATLAB cs_sparse interface
+ * KLU 1.1.0:
+ minor update.
+ * SPQR 1.1.1:
+ minor update (compiler workaround)
+ * UMFPACK 5.3.0:
+ compiler workaround. added timer options.
+ bug fix for 2-by-2 strategy (subsequently removed in v5.4.0)
+
+Sept 20, 2008: SuiteSparse version 3.2.0
+ MAJOR UPDATE: first release of SPQR
+
+ * CHOLMOD 1.7.0:
+ major update for SPQR.
+ * CXSparse 2.2.2:
+ update to MATLAB install
+ * CSparse 2.2.2:
+ update to MATLAB install
+ * SPQR 1.1.0:
+ FIRST RELEASE in SuiteSparse.
+ * MATLAB_TOOLS:
+ added: GEE, find_components, spok
+
+Nov 1, 2007: SuiteSparse version 3.1.0
+ minor update
+
+ * BTF 1.0.1:
+ minor update.
+ * CCOLAMD 2.7.1:
+ minor changes to MATLAB test code.
+ * CHOLMOD 1.6.0:
+ bug fix to cholmod_symmetry. Performance fix for cholmod_nesdis.
+ port to MATLAB 7.5 and many minor changes in MATLAB interface.
+ * COLAMD 2.7.1:
+ minor changes to MATLAB test code.
+ * CSparse 2.2.1:
+ minor update.
+ * CXSparse 2.2.1:
+ * KLU 1.0.1:
+ minor lint cleanup.
+ * RBio 1.1.1:
+ minor lint cleanup.
+ minor update.
+ * UMFPACK 5.2.0:
+ change of license from LGPL to GPL. minor lint cleanup.
+ port to MATLAB 7.5.
+ * MATLAB_Tools:
+ added: LINFACTOR, MESHND, SSMULT, getversion, gipper, hprintf,
+ pagerankdemo, shellgui, and waitmex
+
+May 31, 2007: SuiteSparse version 3.0.0
+ MAJOR UPDATE: first stable release of KLU and BTF
+ other packages ported to 64-bit MATLAB.
+
+ * AMD 2.2.0:
+ port to 64-bit MATLAB. minor changes in printing.
+ * BTF 1.0.0:
+ FIRST STABLE RELEASE
+ * CAMD 2.2.0:
+ port to 64-bit MATLAB. minor changes in printing.
+ * CCOLAMD 2.7.0:
+ port to 64-bit MATLAB. restructured directories
+ * CHOLMOD 1.5.0:
+ port to 64-bit MATLAB. update to Makefile.
+ bug fix for BLAS int, update to cholmod_updown.
+ * COLAMD 2.7.0:
+ port to 64-bit MATLAB. restructured directories
+ * CSparse 2.2.0:
+ update to MATLAB interface. restructured directories
+ * LDL 2.0.0:
+ major update: added 64bit version, restructured directories
+ * RBio 1.1.0:
+ port to 64-bit MATLAB.
+ * UMFPACK 5.1.0:
+ port to 64-bit MATLAB. minor changes in printing.
+
+Dec 13, 2006: SuiteSparse version 2.4.0
+ minor update
+
+ * AMD 2.0.4:
+ minor MATLAB cleanup
+ * CAMD 2.1.2:
+ minor MATLAB cleanup
+ * CCOLAMD 2.5.2
+ minor MATLAB cleanup
+ * CHOLMOD 1.4.0:
+ added support for large files. Renamed MATLAB interface to cholmod2.
+ minor MATLAB cleanup.
+ * COLAMD 2.5.2:
+ minor MATLAB cleanup
+ * CSparse 2.0.7:
+ minor MATLAB cleanup
+ * CXSparse 2.0.7:
+ minor MATLAB cleanup
+ * LDL 1.3.4:
+ minor MATLAB cleanup
+ * UMFPACK 5.0.3:
+ minor MATLAB cleanup
+
+Dec 7, 2006: SuiteSparse version 2.3.1
+ minor update
+
+ * CSparse 2.0.6:
+ update to UFget
+ * CXSparse 2.0.6:
+ update to UFget
+
+Dec 2, 2006: SuiteSparse version 2.3.0
+ MAJOR UPDATE
+
+ * CHOLMOD 1.3.0:
+ major update to file IO functions, added cholmod_symmetry,
+ minor fix to cholmod_analyze_odering and cholmod_dense.c.
+ * MATLAB_Tools:
+ added UFcollection
+
+Sept 11, 2006: SuiteSparse version 2.1.1
+
+ * AMD 2.0.1:
+ minor update
+ * CAMD 2.1.1:
+ minor update
+ * CHOLMOD 1.2.0:
+ performance improvements. Added ordering options to MATLAB interface
+ * COLAMD 2.5.1:
+ minor update
+ * CCOLAMD 2.5.1:
+ minor update
+ * CSparse 2.0.2:
+ minor update to MATLAB interface
+ * CXSparse 2.0.2:
+ minor update to MATLAB interface
+ * LDL 1.3.1:
+ minor update to MATLAB interface
+ * UMFPACK 5.0.1:
+ minor update
+
diff --git a/src/C/SuiteSparse/Contents.m b/src/C/SuiteSparse/Contents.m
index ed86758..8d2902b 100644
--- a/src/C/SuiteSparse/Contents.m
+++ b/src/C/SuiteSparse/Contents.m
@@ -16,7 +16,6 @@
% camd - constrained amd.
% ccolamd - constrained colamd.
% csymamd - constrained symamd.
-% meshnd - nested dissection of regular 2D and 3D meshes
%
%-------------------------------------------------------------------------------
% CHOLMOD: a sparse supernodal Cholesky update/downdate package:
@@ -125,18 +124,26 @@
% Other packages:
%-------------------------------------------------------------------------------
%
-% UFGET MATLAB interface to the UF Sparse Matrix Collection
-% MATLAB_Tools various simple m-files
-% SSMULT sparse matrix times sparse matrix
-% LINFACTOR solve Ax=b using LU or CHOL
+% MATLAB_Tools various MATLAB tools, most in M, some as C mexFunctions:
+%
+% ssmult sparse matrix times sparse matrix
+% meshnd nested dissection of regular 2D and 3D meshes
+% linfactor solve Ax=b using LU or CHOL
+% dimacs10 MATLAB interface for the DIMACS10 collection
+% factorize object-oriented system solver
+% sparseinv sparse inverse subset
+% spqr_rank toolbox for sparse rank-deficient matrices
+%
+% UFcollection for managing the UF Sparse Matrix Collection
+% RBio for reading/writing Rutherford/Boeing sparse matrices
+% UFget MATLAB interface to the UF Sparse Matrix Collection,
+% located in C*Sparse*/MATLAB
%
%-------------------------------------------------------------------------------
%
% For help on compiling SuiteSparse or the demos, testing functions, etc.,
-% please see the help for each individual package. UFcollection and RBio
-% are two additional toolboxes, for managing the UF Sparse Matrix Collection.
+% please see the help for each individual package.
%
-% Copyright 2008, Timothy A. Davis
-% http://www.cise.ufl.edu/research/sparse
+% Copyright 2014, Timothy A. Davis, http://www.suitesparse.com.
help SuiteSparse
diff --git a/src/C/SuiteSparse/Makefile b/src/C/SuiteSparse/Makefile
index 197e8aa..e47f792 100644
--- a/src/C/SuiteSparse/Makefile
+++ b/src/C/SuiteSparse/Makefile
@@ -1,93 +1,166 @@
#-------------------------------------------------------------------------------
-# Makefile for all UF sparse matrix packages
+# Makefile for all SuiteSparse packages
#-------------------------------------------------------------------------------
-include UFconfig/UFconfig.mk
+include SuiteSparse_config/SuiteSparse_config.mk
# Compile the default rules for each package
default:
- ( cd UFconfig/xerbla ; $(MAKE) )
-# ( cd metis-4.0 ; $(MAKE) )
- ( cd AMD ; $(MAKE) )
- ( cd CAMD ; $(MAKE) )
- ( cd COLAMD ; $(MAKE) )
- ( cd BTF ; $(MAKE) )
- ( cd KLU ; $(MAKE) )
- ( cd LDL ; $(MAKE) )
- ( cd CCOLAMD ; $(MAKE) )
- ( cd UMFPACK ; $(MAKE) )
- ( cd CHOLMOD ; $(MAKE) )
- ( cd CSparse ; $(MAKE) )
- ( cd CXSparse ; $(MAKE) )
- ( cd SPQR ; $(MAKE) )
-# ( cd LPDASA ; $(MAKE) )
-# ( cd PARAKLETE ; $(MAKE) )
+ ( cd SuiteSparse_config/xerbla && $(MAKE) )
+ ( cd SuiteSparse_config && $(MAKE) )
+ - ( cd metis-4.0 && $(MAKE) )
+ ( cd AMD && $(MAKE) )
+ ( cd CAMD && $(MAKE) )
+ ( cd COLAMD && $(MAKE) )
+ ( cd BTF && $(MAKE) )
+ ( cd KLU && $(MAKE) )
+ ( cd LDL && $(MAKE) )
+ ( cd CCOLAMD && $(MAKE) )
+ ( cd UMFPACK && $(MAKE) )
+ ( cd CHOLMOD && $(MAKE) )
+ ( cd CSparse && $(MAKE) )
+ ( cd CXSparse && $(MAKE) )
+ ( cd RBio && $(MAKE) )
+ifneq ($(GPU_CONFIG),)
+ ( cd SuiteSparse_GPURuntime && $(MAKE) )
+ ( cd GPUQREngine && $(MAKE) )
+endif
+ ( cd SPQR && $(MAKE) )
+# ( cd PIRO_BAND && $(MAKE) )
+# ( cd SKYLINE_SVD && $(MAKE) )
-library: default
+# install all packages in /usr/local/lib and /usr/local/include
+# (note that CSparse is not installed; CXSparse is installed instead)
+install:
+ ( cd SuiteSparse_config && $(MAKE) install )
+ ( cd AMD && $(MAKE) install )
+ ( cd CAMD && $(MAKE) install )
+ ( cd COLAMD && $(MAKE) install )
+ ( cd BTF && $(MAKE) install )
+ ( cd KLU && $(MAKE) install )
+ ( cd LDL && $(MAKE) install )
+ ( cd CCOLAMD && $(MAKE) install )
+ ( cd UMFPACK && $(MAKE) install )
+ ( cd CHOLMOD && $(MAKE) install )
+ ( cd CXSparse && $(MAKE) install )
+ ( cd RBio && $(MAKE) install )
+ifneq ($(GPU_CONFIG),)
+ ( cd SuiteSparse_GPURuntime && $(MAKE) install )
+ ( cd GPUQREngine && $(MAKE) install )
+endif
+ ( cd SPQR && $(MAKE) install )
+# ( cd PIRO_BAND && $(MAKE) install )
+# ( cd SKYLINE_SVD && $(MAKE) install )
-# Compile the MATLAB mexFunctions (except RBio and UFcollection)
-# CHOLMOD and KLU will fail if you don't have METIS (use SuiteSparse_install.m
-# in the MATLAB Command Window instead to compile them without METIS)
-mex:
- ( cd AMD ; $(MAKE) mex )
- ( cd CAMD ; $(MAKE) mex )
- ( cd COLAMD ; $(MAKE) mex )
- ( cd BTF ; $(MAKE) mex )
- ( cd LDL ; $(MAKE) mex )
- ( cd CCOLAMD ; $(MAKE) mex )
- ( cd CXSparse ; $(MAKE) mex )
- ( cd CSparse ; $(MAKE) mex )
- ( cd UMFPACK ; $(MAKE) mex )
- ( cd SPQR ; $(MAKE) mex )
- ( cd CHOLMOD ; $(MAKE) mex )
- ( cd KLU ; $(MAKE) mex )
+# uninstall all packages
+uninstall:
+ ( cd SuiteSparse_config && $(MAKE) uninstall )
+ ( cd AMD && $(MAKE) uninstall )
+ ( cd CAMD && $(MAKE) uninstall )
+ ( cd COLAMD && $(MAKE) uninstall )
+ ( cd BTF && $(MAKE) uninstall )
+ ( cd KLU && $(MAKE) uninstall )
+ ( cd LDL && $(MAKE) uninstall )
+ ( cd CCOLAMD && $(MAKE) uninstall )
+ ( cd UMFPACK && $(MAKE) uninstall )
+ ( cd CHOLMOD && $(MAKE) uninstall )
+ ( cd CXSparse && $(MAKE) uninstall )
+ ( cd RBio && $(MAKE) uninstall )
+ ( cd SuiteSparse_GPURuntime && $(MAKE) uninstall )
+ ( cd GPUQREngine && $(MAKE) uninstall )
+ ( cd SPQR && $(MAKE) uninstall )
+# ( cd PIRO_BAND && $(MAKE) uninstall )
+# ( cd SKYLINE_SVD && $(MAKE) uninstall )
+
+library:
+ ( cd SuiteSparse_config/xerbla && $(MAKE) )
+ ( cd SuiteSparse_config && $(MAKE) )
+ - ( cd metis-4.0 && $(MAKE) )
+ ( cd AMD && $(MAKE) library )
+ ( cd BTF && $(MAKE) library )
+ ( cd CAMD && $(MAKE) library )
+ ( cd CCOLAMD && $(MAKE) library )
+ ( cd COLAMD && $(MAKE) library )
+ ( cd CHOLMOD && $(MAKE) library )
+ ( cd KLU && $(MAKE) library )
+ ( cd LDL && $(MAKE) library )
+ ( cd UMFPACK && $(MAKE) library )
+ ( cd CSparse && $(MAKE) library )
+ ( cd CXSparse && $(MAKE) library )
+ ( cd RBio && $(MAKE) library )
+ifneq ($(GPU_CONFIG),)
+ ( cd SuiteSparse_GPURuntime && $(MAKE) library )
+ ( cd GPUQREngine && $(MAKE) library )
+endif
+ ( cd SPQR && $(MAKE) library )
+# ( cd PIRO_BAND && $(MAKE) library )
+# ( cd SKYLINE_SVD && $(MAKE) library )
# Remove all files not in the original distribution
purge:
- ( cd UFconfig/xerbla ; $(MAKE) purge )
-# ( cd metis-4.0 ; $(MAKE) realclean )
- ( cd AMD ; $(MAKE) purge )
- ( cd CAMD ; $(MAKE) purge )
- ( cd COLAMD ; $(MAKE) purge )
- ( cd BTF ; $(MAKE) purge )
- ( cd KLU ; $(MAKE) purge )
- ( cd LDL ; $(MAKE) purge )
- ( cd CCOLAMD ; $(MAKE) purge )
- ( cd UMFPACK ; $(MAKE) purge )
- ( cd CHOLMOD ; $(MAKE) purge )
- ( cd CSparse ; $(MAKE) purge )
- ( cd CXSparse ; $(MAKE) purge )
- ( cd RBio ; $(RM) *.mex* )
- ( cd UFcollection ; $(RM) *.mex* )
- ( cd SSMULT ; $(RM) *.mex* )
- ( cd SPQR ; $(MAKE) purge )
- - $(RM) MATLAB_Tools/spok/*.mex* MATLAB_Tools/spok/private/*.mex*
-# ( cd LPDASA ; $(MAKE) purge )
-# ( cd PARAKLETE ; $(MAKE) purge )
+ - ( cd SuiteSparse_config/xerbla && $(MAKE) purge )
+ - ( cd SuiteSparse_config && $(MAKE) purge )
+ - ( cd metis-4.0 && $(MAKE) realclean )
+ - ( cd AMD && $(MAKE) purge )
+ - ( cd CAMD && $(MAKE) purge )
+ - ( cd COLAMD && $(MAKE) purge )
+ - ( cd BTF && $(MAKE) purge )
+ - ( cd KLU && $(MAKE) purge )
+ - ( cd LDL && $(MAKE) purge )
+ - ( cd CCOLAMD && $(MAKE) purge )
+ - ( cd UMFPACK && $(MAKE) purge )
+ - ( cd CHOLMOD && $(MAKE) purge )
+ - ( cd CSparse && $(MAKE) purge )
+ - ( cd CXSparse && $(MAKE) purge )
+ - ( cd RBio && $(MAKE) purge )
+ - ( cd MATLAB_Tools/UFcollection && $(RM) *.mex* )
+ - ( cd MATLAB_Tools/SSMULT && $(RM) *.mex* )
+ - ( cd SuiteSparse_GPURuntime && $(MAKE) purge )
+ - ( cd GPUQREngine && $(MAKE) purge )
+ - ( cd SPQR && $(MAKE) purge )
+# - ( cd PIRO_BAND && $(MAKE) purge )
+# - ( cd SKYLINE_SVD && $(MAKE) purge )
+ - $(RM) MATLAB_Tools/*/*.mex* MATLAB_Tools/spok/private/*.mex*
# Remove all files not in the original distribution, but keep the libraries
clean:
- ( cd UFconfig/xerbla ; $(MAKE) clean )
-# ( cd metis-4.0 ; $(MAKE) clean )
- ( cd AMD ; $(MAKE) clean )
- ( cd CAMD ; $(MAKE) clean )
- ( cd COLAMD ; $(MAKE) clean )
- ( cd BTF ; $(MAKE) clean )
- ( cd KLU ; $(MAKE) clean )
- ( cd LDL ; $(MAKE) clean )
- ( cd CCOLAMD ; $(MAKE) clean )
- ( cd UMFPACK ; $(MAKE) clean )
- ( cd CHOLMOD ; $(MAKE) clean )
- ( cd CSparse ; $(MAKE) clean )
- ( cd CXSparse ; $(MAKE) clean )
- ( cd SPQR ; $(MAKE) clean )
-# ( cd LPDASA ; $(MAKE) clean )
-# ( cd PARAKLETE ; $(MAKE) clean )
+ - ( cd SuiteSparse_config/xerbla && $(MAKE) clean )
+ - ( cd SuiteSparse_config && $(MAKE) clean )
+ - ( cd metis-4.0 && $(MAKE) clean )
+ - ( cd AMD && $(MAKE) clean )
+ - ( cd CAMD && $(MAKE) clean )
+ - ( cd COLAMD && $(MAKE) clean )
+ - ( cd BTF && $(MAKE) clean )
+ - ( cd KLU && $(MAKE) clean )
+ - ( cd LDL && $(MAKE) clean )
+ - ( cd CCOLAMD && $(MAKE) clean )
+ - ( cd UMFPACK && $(MAKE) clean )
+ - ( cd CHOLMOD && $(MAKE) clean )
+ - ( cd CSparse && $(MAKE) clean )
+ - ( cd CXSparse && $(MAKE) clean )
+ - ( cd RBio && $(MAKE) clean )
+ - ( cd SuiteSparse_GPURuntime && $(MAKE) clean )
+ - ( cd GPUQREngine && $(MAKE) clean )
+ - ( cd SPQR && $(MAKE) clean )
+# - ( cd PIRO_BAND && $(MAKE) clean )
+# - ( cd SKYLINE_SVD && $(MAKE) clean )
+
+# Create the PDF documentation
+docs:
+ ( cd AMD && $(MAKE) docs )
+ ( cd CAMD && $(MAKE) docs )
+ ( cd KLU && $(MAKE) docs )
+ ( cd LDL && $(MAKE) docs )
+ ( cd UMFPACK && $(MAKE) docs )
+ ( cd CHOLMOD && $(MAKE) docs )
+ ( cd SPQR && $(MAKE) docs )
+# ( cd PIRO_BAND && $(MAKE) docs )
+# ( cd SKYLINE_SVD && $(MAKE) docs )
distclean: purge
-# Create CXSparse from CSparse. Note that the CXSparse directory should
-# initially not exist.
+# Create CXSparse from CSparse
+# Note that the CXSparse directory should initially not exist.
cx:
( cd CSparse ; $(MAKE) purge )
( cd CXSparse_newfiles ; tar cfv - * | gzip -9 > ../CXSparse_newfiles.tar.gz )
@@ -95,13 +168,17 @@ cx:
( cd CXSparse/Demo ; $(MAKE) )
( cd CXSparse/Demo ; $(MAKE) > cs_demo.out )
( cd CXSparse ; $(MAKE) purge )
+ $(RM) -f CXSparse_newfiles.tar.gz
# statement coverage (Linux only); this requires a lot of time.
# The umfpack tcov requires a lot of disk space
cov:
- ( cd CXSparse ; $(MAKE) cov )
- ( cd CSparse ; $(MAKE) cov )
- ( cd KLU ; $(MAKE) cov )
- ( cd CHOLMOD ; $(MAKE) cov )
- ( cd UMFPACK ; $(MAKE) cov )
- ( cd SPQR ; $(MAKE) cov )
+ ( cd CXSparse && $(MAKE) cov )
+ ( cd CSparse && $(MAKE) cov )
+ ( cd KLU && $(MAKE) cov )
+ ( cd CHOLMOD && $(MAKE) cov )
+ ( cd SPQR && $(MAKE) cov )
+ ( cd UMFPACK && $(MAKE) cov )
+# ( cd PIRO_BAND && $(MAKE) cov )
+# ( cd SKYLINE_SVD && $(MAKE) cov )
+
diff --git a/src/C/SuiteSparse/README.txt b/src/C/SuiteSparse/README.txt
index bbba97a..d3256c3 100644
--- a/src/C/SuiteSparse/README.txt
+++ b/src/C/SuiteSparse/README.txt
@@ -1,18 +1,36 @@
-SuiteSparse: A Suite of Sparse matrix packages
+SuiteSparse: A Suite of Sparse matrix packages at http://www.suitesparse.com
+
+July 13, 2015. SuiteSparse VERSION 4.4.5
------------------
SuiteSparse/README
------------------
================================================================================
-QUICK START FOR MATLAB USERS: uncompress the SuiteSparse.zip or
-SuiteSparse.tar.gz archive file (they contain the same thing), then in the
-MATLAB Command Window, cd to the SuiteSparse directory and type
-SuiteSparse_install. All packages will be compiled, and several demos will be
-run.
+QUICK START FOR MATLAB USERS (Linux, Mac, or Windows): uncompress the
+SuiteSparse.zip or SuiteSparse.tar.gz archive file (they contain the same
+thing), then in the MATLAB Command Window, cd to the SuiteSparse directory and
+type SuiteSparse_install. All packages will be compiled, and several demos
+will be run.
+
+QUICK START FOR LINUX: Just type 'make' in this directory. Then do
+'sudo make install' if you want to install the libraries and include files
+in /usr/local.
+
+QUICK START FOR MAC: Delete the SuiteSparse_config/SuiteSparse_config.mk
+file, and then remove "_Mac" from the *Mac.mk file in that directory. Then
+continue as the 'QUICK START FOR LINUX' above.
+
+QUICK START FOR GPU: Delete the SuiteSparse_config/SuiteSparse_config.mk
+file, and then remove "_GPU" from the *GPU.mk file in that directory.
+Locate and modify CUDA library and include paths in the *.mk file.
+Then continue as the 'QUICK START FOR LINUX' above.
================================================================================
-May 20, 2009. SuiteSparse version 3.4.0
+
+ spqr_rank MATLAB toolbox for rank deficient sparse matrices: null spaces,
+ reliable factorizations, etc. With Leslie Foster, San Jose
+ State Univ.
AMD approximate minimum degree ordering
@@ -33,16 +51,21 @@ May 20, 2009. SuiteSparse version 3.4.0
CHOLMOD sparse Cholesky factorization. Requires AMD, COLAMD, CCOLAMD,
the BLAS, and LAPACK. Optionally uses METIS.
- UFconfig configuration file for all the above packages. The
- UFconfig/UFconfig.mk is included in the Makefile's of all
- packages. CSparse and RBio do not use UFconfig.
+ SuiteSparse_config configuration file for all the above packages. The
+ SuiteSparse_config/SuiteSparse_config.mk is included in the
+ Makefile's of all packages. CSparse and MATLAB_Tools do not
+ use SuiteSparse_config. Prior to SuiteSparse Version 4.0.0,
+ this configuration directory was called 'UFconfig'.
+ Version 4.0.0 and later use SuiteSparse_config instead,
+ which is upward compatible with UFconfig.
- CSparse a concise sparse matrix package, developed for my upcoming
- book, "Direct Methods for Sparse Linear Systems", to be
- published by SIAM.
+ CSparse a concise sparse matrix package, developed for my
+ book, "Direct Methods for Sparse Linear Systems",
+ published by SIAM. Intended primarily for teaching.
CXSparse CSparse Extended. Includes support for complex matrices
- and both int or long integers.
+ and both int or long integers. Use this instead of CSparse
+ for production use.
RBio read/write sparse matrices in Rutherford/Boeing format
@@ -59,18 +82,20 @@ May 20, 2009. SuiteSparse version 3.4.0
MATLAB_Tools various simple m-files for use in MATLAB
- SuiteSparseQR sparse QR factorization
+ SPQR sparse QR factorization
+ GPUQREngine GPU support package for SPQR
+ SuiteSparse_GPURuntime GPU support package for SPQR
-CHOLMOD optionally uses METIS 4.0.1
+Some codes optionally use METIS 4.0.1
(http://www-users.cs.umn.edu/~karypis/metis). To use METIS, place a copy of
the metis-4.0 directory in the same directory containing this README file.
Be sure that you do not have a nested metis-4.0/metis-4.0 directory; SuiteSparse
won't find METIS if you do this, which can happen with a zip file of metis-4.0
-on Windows. The use of METIS will improve the ordering quality in CHOLMOD.
+on Windows. The use of METIS will improve the ordering quality.
Refer to each package for license, copyright, and author information. All
-codes are authored or co-authored by Timothy A. Davis, CISE Dept., Univ. of
-Florida. email: my last name @ cise dot ufl dot edu.
+codes are authored or co-authored by Timothy A. Davis.
+email: DrTimothyAldenDavis at gmail.com
================================================================================
If you use SuiteSparse_install in MATLAB, stop reading here.
@@ -84,13 +109,10 @@ To use "make" in Unix/Linux:
(1) Use the right BLAS and LAPACK libraries
- See http://www.netlib.org/blas for the Fortran reference BLAS (slow, but
- they work). See http://www.tacc.utexas.edu/~kgoto/ or
- http://www.cs.utexas.edu/users/flame/goto/ for an optimized BLAS. See
- http://www.netlib.org/lapack for LAPACK. The UFconfig/UFconfig.mk file
- assumes the vanilla BLAS (-lblas). You should use an optimized BLAS;
- otherwise UMFPACK and CHOLMOD will be slow. Change -lblas to -l(your BLAS
- library here) in the UFconfig/UFconfig.mk file.
+ Edit your SuiteSparse_config/SuiteSparse_config.mk file to point to the
+ right compilers, and to the correct BLAS and LAPACK libraries. There are
+ many examples of different computer architectures there. Scroll through to
+ find yours, and uncomment those lines.
(2) Install Intel's Threading Building Blocks (TBB)
@@ -99,53 +121,27 @@ To use "make" in Unix/Linux:
(3) Configure METIS (or don't use METIS)
+ If you don't download METIS, skip this step. Otherwise,
cd to metis-4.0 and edit the Makefile.in file. I recommend making these
- changes to metis-4.0/Makefile.in:
+ changes to metis-4.0/Makefile.in, but this is optional.
CC = gcc
OPTFLAGS = -O3
- And, if you want to use METIS in MATLAB and compile with "make" instead
- of using SuiteSparse_install.m:
-
- COPTIONS = -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-
- Next, cd to metis-4.0 and type "make".
-
- If you do not wish to use METIS, then edit the UFconfig/UFconfig.mk file,
- and change the lines
-
- CHOLMOD_CONFIG =
- SPQR_CONFIG =
-
- to
-
- CHOLMOD_CONFIG = -DNPARTITION
- SPQR_CONFIG = -DNPARTITION
+(4) Make other changes to SuiteSparse_config/SuiteSparse_config.mk as needed
- Also change the line
-
- METIS = ../../metis-4.0/libmetis.a
-
- to
-
- METIS =
-
-(4) Make other changes to UFconfig/UFconfig.mk as needed
-
- Edit the UFconfig/UFconfig.mk file as needed. Directions are in that file.
- If you have compiled SuiteSparse already (partially or completely), then
- whenever you edit the UFconfig/UFconfig.mk file, you should then type
- "make purge" (or "make realclean") in this directory.
-
- If you want to use "make" to compile mexFunctions, I recommend adding
- these options to the CFLAGS = line:
-
- -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+ Edit the SuiteSparse_config/SuiteSparse_config.mk file as needed.
+ Directions are in that file. If you have compiled SuiteSparse already
+ (partially or completely), then whenever you edit the
+ SuiteSparse_config/SuiteSparse_config.mk file, you should then type "make
+ purge" (or "make realclean") in this directory.
(5) Type "make" in this directory. All packages will be be compiled. METIS
will be compiled if you have it. Several demos will be run.
+ To compile just the libraries, without running any demos, use
+ "make library".
+
The libraries will appear in */Lib/*.a. Include files, as needed by user
programs that use CHOLMOD, AMD, CAMD, COLAMD, CCOLAMD, BTF, KLU, UMFPACK,
LDL, etc. are in */Include/*.h.
@@ -153,10 +149,11 @@ To use "make" in Unix/Linux:
The METIS library is in metis-4.0/libmetis.a. METIS Include files (not
needed by the end user of SuiteSparse) are in located in metis-4.0/Lib/*.h.
+(6) To install, type "sudo make install". This will place copies of all
+ libraries in /usr/local/lib, and all include files in /usr/local/include.
+ You can change the install location by editting SuiteSparse_config.mk.
+ These directories must already exist.
-In a future version, I will include a "make install" that will create *.so
-libraries and place them in /usr/lib. The libraries should be called
-libPACKAGE.so.VERSION.SUBVERSION.SUBSUBVERSION. For example,
-libcolamd.so.2.7.1 should be the library name for COLAMD version 2.7.1.
-The version numbers are located in UFconfig.h (in comments) and in each
-package (as a #define).
+(7) To uninstall, type "sudo make uninstall", which reverses "make install"
+ by removing the SuiteSparse libraries from /usr/local/lib, and the
+ include files from /usr/local/include.
diff --git a/src/C/SuiteSparse/README_cvxopt b/src/C/SuiteSparse/README_cvxopt
index ceda730..05b3c49 100644
--- a/src/C/SuiteSparse/README_cvxopt
+++ b/src/C/SuiteSparse/README_cvxopt
@@ -1,6 +1,6 @@
-This is version 3.5.0 of the SuiteSparse package
-from www.cise.ufl.edu/research/sparse/SuiteSparse/,
-with the following files and directories removed.
+This is version 4.4.5 of the SuiteSparse package
+from www.suitesparse.com with the following files
+and directories removed.
AMD/Demo
AMD/MATLAB
@@ -9,7 +9,6 @@ CAMD
CCOLAMD
CHOLMOD/Demo
CHOLMOD/MATLAB
-CHOLMOD/MatrixOps
CHOLMOD/Modify
CHOLMOD/Partition
CHOLMOD/Tcov
@@ -19,19 +18,17 @@ CSparse
Csparse_to_CXsparse
CXSparse
CXSparse_newfiles
-CXSparse_newfiles.tar.gz
+GPUQREngine
KLU
LDL
-LINFACTOR
MATLAB_Tools
-MESHND
RBio
SPQR
-SSMULT
SuiteSparse_demo.m
+SuiteSparse_GPURuntime
SuiteSparse_install.m
SuiteSparse_test.m
-UFcollection
+UFget
UMFPACK/Demo
UMFPACK/MATLAB
UMFPACK/Tcov
diff --git a/src/C/SuiteSparse/SuiteSparse_config/Makefile b/src/C/SuiteSparse/SuiteSparse_config/Makefile
new file mode 100644
index 0000000..895bce9
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/Makefile
@@ -0,0 +1,48 @@
+#-------------------------------------------------------------------------------
+# SuiteSparse_config Makefile
+#-------------------------------------------------------------------------------
+
+VERSION = 4.4.5
+
+default: ccode
+
+include SuiteSparse_config.mk
+
+ccode: libsuitesparseconfig.a
+
+all: libsuitesparseconfig.a
+
+library: libsuitesparseconfig.a
+
+libsuitesparseconfig.a: SuiteSparse_config.c SuiteSparse_config.h
+ $(CC) $(CF) -c SuiteSparse_config.c
+ $(ARCHIVE) libsuitesparseconfig.a SuiteSparse_config.o
+ $(RANLIB) libsuitesparseconfig.a
+ - $(RM) SuiteSparse_config.o
+
+distclean: purge
+
+purge: clean
+ - $(RM) *.o *.a
+
+clean:
+ - $(RM) -r $(CLEAN)
+
+# install SuiteSparse_config
+install:
+ $(CP) libsuitesparseconfig.a $(INSTALL_LIB)/libsuitesparseconfig.$(VERSION).a
+ ( cd $(INSTALL_LIB) ; ln -sf libsuitesparseconfig.$(VERSION).a libsuitesparseconfig.a )
+ $(CP) SuiteSparse_config.h $(INSTALL_INCLUDE)
+ chmod 644 $(INSTALL_LIB)/libsuitesparseconfig*.a
+ chmod 644 $(INSTALL_INCLUDE)/SuiteSparse_config.h
+
+# uninstall SuiteSparse_config
+uninstall:
+ $(RM) $(INSTALL_LIB)/libsuitesparseconfig*.a
+ $(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h
+
+dif:
+ - diff SuiteSparse_config.mk SuiteSparse_config_linux.mk
+ - diff SuiteSparse_config_linux.mk SuiteSparse_config_GPU_gcc.mk
+ - diff SuiteSparse_config_GPU_gcc.mk SuiteSparse_config_GPU_icc.mk
+ - diff SuiteSparse_config_GPU_icc.mk SuiteSparse_config_GPU_icc10.mk
diff --git a/src/C/SuiteSparse/SuiteSparse_config/README.txt b/src/C/SuiteSparse/SuiteSparse_config/README.txt
new file mode 100644
index 0000000..38202d4
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/README.txt
@@ -0,0 +1,71 @@
+SuiteSparse_config, 2015, Timothy A. Davis, http://www.suitesparse.com
+(formerly the UFconfig package)
+
+This directory contains a default SuiteSparse_config.mk file, which
+in the original distribution is the same as SuiteSparse_config_linux.mk.
+The various config file versions are:
+
+ SuiteSparse_config_GPU_icc.mk for GPU with the Intel compiler
+ SuiteSparse_config_GPU_icc10.mk ditto, but for 10 cores
+ SuiteSparse_config_GPU_gcc.mk for GPU with the gcc compiler
+ SuiteSparse_config_linux.mk for linux, no GPU
+ SuiteSparse_config_Mac.mk for Mac
+ SuiteSparse_config.mk the actual one in use
+
+To use a GPU for CHOLMOD and SPQR, using gcc, do this:
+
+ cp SuiteSparse_config_GPU_gcc.mk SuiteSparse_config.mk
+
+To use a GPU for CHOLMOD and SPQR, using icc and the Intel MKL, do this:
+
+ cp SuiteSparse_config_GPU_icc.mk SuiteSparse_config.mk
+
+To compile SuiteSparse for the Mac, do this:
+
+ cp SuiteSparse_config_Mac.mk SuiteSparse_config.mk
+
+To use a GPU for CHOLMOD and SPQR, using icc and the Intel MKL,
+and for a system with 10 cores, do this
+
+ cp SuiteSparse_config_GPU_icc10.mk SuiteSparse_config.mk
+
+For other alternatives, see the comments in the SuiteSparse_config.mk file.
+
+--------------------------------------------------------------------------------
+
+SuiteSparse_config contains configuration settings for all many of the software
+packages that I develop or co-author. Note that older versions of some of
+these packages do not require SuiteSparse_config.
+
+ Package Description
+ ------- -----------
+ AMD approximate minimum degree ordering
+ CAMD constrained AMD
+ COLAMD column approximate minimum degree ordering
+ CCOLAMD constrained approximate minimum degree ordering
+ UMFPACK sparse LU factorization, with the BLAS
+ CXSparse int/long/real/complex version of CSparse
+ CHOLMOD sparse Cholesky factorization, update/downdate
+ KLU sparse LU factorization, BLAS-free
+ BTF permutation to block triangular form
+ LDL concise sparse LDL'
+ LPDASA LP Dual Active Set Algorithm
+ RBio read/write files in Rutherford/Boeing format
+ SPQR sparse QR factorization (full name: SuiteSparseQR)
+
+SuiteSparse_config is not required by these packages:
+
+ CSparse a Concise Sparse matrix package
+ MATLAB_Tools toolboxes for use in MATLAB
+
+In addition, the xerbla/ directory contains Fortan and C versions of the
+BLAS/LAPACK xerbla routine, which is called when an invalid input is passed to
+the BLAS or LAPACK. The xerbla provided here does not print any message, so
+the entire Fortran I/O library does not need to be linked into a C application.
+Most versions of the BLAS contain xerbla, but those from K. Goto do not. Use
+this if you need too.
+
+If you edit this directory (SuiteSparse_config.mk in particular) then you
+must do "make purge ; make" in the parent directory to recompile all of
+SuiteSparse. Otherwise, the changes will not necessarily be applied.
+
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c
new file mode 100644
index 0000000..0d5dbaf
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c
@@ -0,0 +1,531 @@
+/* ========================================================================== */
+/* === SuiteSparse_config =================================================== */
+/* ========================================================================== */
+
+/* SuiteSparse configuration : memory manager and printf functions. */
+
+/* Copyright (c) 2013, Timothy A. Davis. No licensing restrictions
+ * apply to this file or to the SuiteSparse_config directory.
+ * Author: Timothy A. Davis.
+ */
+
+#include <math.h>
+#include <stdlib.h>
+
+#ifndef NPRINT
+#include <stdio.h>
+#endif
+
+#ifdef MATLAB_MEX_FILE
+#include "mex.h"
+#include "matrix.h"
+#endif
+
+#ifndef NULL
+#define NULL ((void *) 0)
+#endif
+
+#include "SuiteSparse_config.h"
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_config : a global extern struct */
+/* -------------------------------------------------------------------------- */
+
+/* The SuiteSparse_config struct is available to all SuiteSparse functions and
+ to all applications that use those functions. It must be modified with
+ care, particularly in a multithreaded context. Normally, the application
+ will initialize this object once, via SuiteSparse_start, possibily followed
+ by application-specific modifications if the applications wants to use
+ alternative memory manager functions.
+
+ The user can redefine these global pointers at run-time to change the
+ memory manager and printf function used by SuiteSparse.
+
+ If -DNMALLOC is defined at compile-time, then no memory-manager is
+ specified. You must define them at run-time, after calling
+ SuiteSparse_start.
+
+ If -DPRINT is defined a compile time, then printf is disabled, and
+ SuiteSparse will not use printf.
+ */
+
+struct SuiteSparse_config_struct SuiteSparse_config =
+{
+
+ /* memory management functions */
+ #ifndef NMALLOC
+ #ifdef MATLAB_MEX_FILE
+ /* MATLAB mexFunction: */
+ mxMalloc, mxCalloc, mxRealloc, mxFree,
+ #else
+ /* standard ANSI C: */
+ malloc, calloc, realloc, free,
+ #endif
+ #else
+ /* no memory manager defined; you must define one at run-time: */
+ NULL, NULL, NULL, NULL,
+ #endif
+
+ /* printf function */
+ #ifndef NPRINT
+ #ifdef MATLAB_MEX_FILE
+ /* MATLAB mexFunction: */
+ mexPrintf,
+ #else
+ /* standard ANSI C: */
+ printf,
+ #endif
+ #else
+ /* printf is disabled */
+ NULL,
+ #endif
+
+ SuiteSparse_hypot,
+ SuiteSparse_divcomplex
+
+} ;
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_start */
+/* -------------------------------------------------------------------------- */
+
+/* All applications that use SuiteSparse should call SuiteSparse_start prior
+ to using any SuiteSparse function. Only a single thread should call this
+ function, in a multithreaded application. Currently, this function is
+ optional, since all this function currently does is to set the four memory
+ function pointers to NULL (which tells SuiteSparse to use the default
+ functions). In a multi- threaded application, only a single thread should
+ call this function.
+
+ Future releases of SuiteSparse might enforce a requirement that
+ SuiteSparse_start be called prior to calling any SuiteSparse function.
+ */
+
+void SuiteSparse_start ( void )
+{
+
+ /* memory management functions */
+ #ifndef NMALLOC
+ #ifdef MATLAB_MEX_FILE
+ /* MATLAB mexFunction: */
+ SuiteSparse_config.malloc_func = mxMalloc ;
+ SuiteSparse_config.calloc_func = mxCalloc ;
+ SuiteSparse_config.realloc_func = mxRealloc ;
+ SuiteSparse_config.free_func = mxFree ;
+ #else
+ /* standard ANSI C: */
+ SuiteSparse_config.malloc_func = malloc ;
+ SuiteSparse_config.calloc_func = calloc ;
+ SuiteSparse_config.realloc_func = realloc ;
+ SuiteSparse_config.free_func = free ;
+ #endif
+ #else
+ /* no memory manager defined; you must define one after calling
+ SuiteSparse_start */
+ SuiteSparse_config.malloc_func = NULL ;
+ SuiteSparse_config.calloc_func = NULL ;
+ SuiteSparse_config.realloc_func = NULL ;
+ SuiteSparse_config.free_func = NULL ;
+ #endif
+
+ /* printf function */
+ #ifndef NPRINT
+ #ifdef MATLAB_MEX_FILE
+ /* MATLAB mexFunction: */
+ SuiteSparse_config.printf_func = mexPrintf ;
+ #else
+ /* standard ANSI C: */
+ SuiteSparse_config.printf_func = printf ;
+ #endif
+ #else
+ /* printf is disabled */
+ SuiteSparse_config.printf_func = NULL ;
+ #endif
+
+ /* math functions */
+ SuiteSparse_config.hypot_func = SuiteSparse_hypot ;
+ SuiteSparse_config.divcomplex_func = SuiteSparse_divcomplex ;
+}
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_finish */
+/* -------------------------------------------------------------------------- */
+
+/* This currently does nothing, but in the future, applications should call
+ SuiteSparse_start before calling any SuiteSparse function, and then
+ SuiteSparse_finish after calling the last SuiteSparse function, just before
+ exiting. In a multithreaded application, only a single thread should call
+ this function.
+
+ Future releases of SuiteSparse might use this function for any
+ SuiteSparse-wide cleanup operations or finalization of statistics.
+ */
+
+void SuiteSparse_finish ( void )
+{
+ /* do nothing */ ;
+}
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_malloc: malloc wrapper */
+/* -------------------------------------------------------------------------- */
+
+void *SuiteSparse_malloc /* pointer to allocated block of memory */
+(
+ size_t nitems, /* number of items to malloc */
+ size_t size_of_item /* sizeof each item */
+)
+{
+ void *p ;
+ size_t size ;
+ if (nitems < 1) nitems = 1 ;
+ if (size_of_item < 1) size_of_item = 1 ;
+ size = nitems * size_of_item ;
+
+ if (size != ((double) nitems) * size_of_item)
+ {
+ /* size_t overflow */
+ p = NULL ;
+ }
+ else
+ {
+ p = (void *) (SuiteSparse_config.malloc_func) (size) ;
+ }
+ return (p) ;
+}
+
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_calloc: calloc wrapper */
+/* -------------------------------------------------------------------------- */
+
+void *SuiteSparse_calloc /* pointer to allocated block of memory */
+(
+ size_t nitems, /* number of items to calloc */
+ size_t size_of_item /* sizeof each item */
+)
+{
+ void *p ;
+ size_t size ;
+ if (nitems < 1) nitems = 1 ;
+ if (size_of_item < 1) size_of_item = 1 ;
+ size = nitems * size_of_item ;
+
+ if (size != ((double) nitems) * size_of_item)
+ {
+ /* size_t overflow */
+ p = NULL ;
+ }
+ else
+ {
+ p = (void *) (SuiteSparse_config.calloc_func) (nitems, size_of_item) ;
+ }
+ return (p) ;
+}
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_realloc: realloc wrapper */
+/* -------------------------------------------------------------------------- */
+
+/* If p is non-NULL on input, it points to a previously allocated object of
+ size nitems_old * size_of_item. The object is reallocated to be of size
+ nitems_new * size_of_item. If p is NULL on input, then a new object of that
+ size is allocated. On success, a pointer to the new object is returned,
+ and ok is returned as 1. If the allocation fails, ok is set to 0 and a
+ pointer to the old (unmodified) object is returned.
+ */
+
+void *SuiteSparse_realloc /* pointer to reallocated block of memory, or
+ to original block if the realloc failed. */
+(
+ size_t nitems_new, /* new number of items in the object */
+ size_t nitems_old, /* old number of items in the object */
+ size_t size_of_item, /* sizeof each item */
+ void *p, /* old object to reallocate */
+ int *ok /* 1 if successful, 0 otherwise */
+)
+{
+ size_t size ;
+ if (nitems_old < 1) nitems_old = 1 ;
+ if (nitems_new < 1) nitems_new = 1 ;
+ if (size_of_item < 1) size_of_item = 1 ;
+ size = nitems_new * size_of_item ;
+
+ if (size != ((double) nitems_new) * size_of_item)
+ {
+ /* size_t overflow */
+ (*ok) = 0 ;
+ }
+ else if (p == NULL)
+ {
+ /* a fresh object is being allocated */
+ p = SuiteSparse_malloc (nitems_new, size_of_item) ;
+ (*ok) = (p != NULL) ;
+ }
+ else if (nitems_old == nitems_new)
+ {
+ /* the object does not change; do nothing */
+ (*ok) = 1 ;
+ }
+ else
+ {
+ /* change the size of the object from nitems_old to nitems_new */
+ void *pnew ;
+ pnew = (void *) (SuiteSparse_config.realloc_func) (p, size) ;
+ if (pnew == NULL)
+ {
+ if (nitems_new < nitems_old)
+ {
+ /* the attempt to reduce the size of the block failed, but
+ the old block is unchanged. So pretend to succeed. */
+ (*ok) = 1 ;
+ }
+ else
+ {
+ /* out of memory */
+ (*ok) = 0 ;
+ }
+ }
+ else
+ {
+ /* success */
+ p = pnew ;
+ (*ok) = 1 ;
+ }
+ }
+ return (p) ;
+}
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_free: free wrapper */
+/* -------------------------------------------------------------------------- */
+
+void *SuiteSparse_free /* always returns NULL */
+(
+ void *p /* block to free */
+)
+{
+ if (p)
+ {
+ (SuiteSparse_config.free_func) (p) ;
+ }
+ return (NULL) ;
+}
+
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_tic: return current wall clock time */
+/* -------------------------------------------------------------------------- */
+
+/* Returns the number of seconds (tic [0]) and nanoseconds (tic [1]) since some
+ * unspecified but fixed time in the past. If no timer is installed, zero is
+ * returned. A scalar double precision value for 'tic' could be used, but this
+ * might cause loss of precision because clock_getttime returns the time from
+ * some distant time in the past. Thus, an array of size 2 is used.
+ *
+ * The timer is enabled by default. To disable the timer, compile with
+ * -DNTIMER. If enabled on a POSIX C 1993 system, the timer requires linking
+ * with the -lrt library.
+ *
+ * example:
+ *
+ * double tic [2], r, s, t ;
+ * SuiteSparse_tic (tic) ; // start the timer
+ * // do some work A
+ * t = SuiteSparse_toc (tic) ; // t is time for work A, in seconds
+ * // do some work B
+ * s = SuiteSparse_toc (tic) ; // s is time for work A and B, in seconds
+ * SuiteSparse_tic (tic) ; // restart the timer
+ * // do some work C
+ * r = SuiteSparse_toc (tic) ; // s is time for work C, in seconds
+ *
+ * A double array of size 2 is used so that this routine can be more easily
+ * ported to non-POSIX systems. The caller does not rely on the POSIX
+ * <time.h> include file.
+ */
+
+#ifdef SUITESPARSE_TIMER_ENABLED
+
+#include <time.h>
+
+void SuiteSparse_tic
+(
+ double tic [2] /* output, contents undefined on input */
+)
+{
+ /* POSIX C 1993 timer, requires -librt */
+ struct timespec t ;
+ clock_gettime (CLOCK_MONOTONIC, &t) ;
+ tic [0] = (double) (t.tv_sec) ;
+ tic [1] = (double) (t.tv_nsec) ;
+}
+
+#else
+
+void SuiteSparse_tic
+(
+ double tic [2] /* output, contents undefined on input */
+)
+{
+ /* no timer installed */
+ tic [0] = 0 ;
+ tic [1] = 0 ;
+}
+
+#endif
+
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_toc: return time since last tic */
+/* -------------------------------------------------------------------------- */
+
+/* Assuming SuiteSparse_tic is accurate to the nanosecond, this function is
+ * accurate down to the nanosecond for 2^53 nanoseconds since the last call to
+ * SuiteSparse_tic, which is sufficient for SuiteSparse (about 104 days). If
+ * additional accuracy is required, the caller can use two calls to
+ * SuiteSparse_tic and do the calculations differently.
+ */
+
+double SuiteSparse_toc /* returns time in seconds since last tic */
+(
+ double tic [2] /* input, not modified from last call to SuiteSparse_tic */
+)
+{
+ double toc [2] ;
+ SuiteSparse_tic (toc) ;
+ return ((toc [0] - tic [0]) + 1e-9 * (toc [1] - tic [1])) ;
+}
+
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_time: return current wallclock time in seconds */
+/* -------------------------------------------------------------------------- */
+
+/* This function might not be accurate down to the nanosecond. */
+
+double SuiteSparse_time /* returns current wall clock time in seconds */
+(
+ void
+)
+{
+ double toc [2] ;
+ SuiteSparse_tic (toc) ;
+ return (toc [0] + 1e-9 * toc [1]) ;
+}
+
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_version: return the current version of SuiteSparse */
+/* -------------------------------------------------------------------------- */
+
+int SuiteSparse_version
+(
+ int version [3]
+)
+{
+ if (version != NULL)
+ {
+ version [0] = SUITESPARSE_MAIN_VERSION ;
+ version [1] = SUITESPARSE_SUB_VERSION ;
+ version [2] = SUITESPARSE_SUBSUB_VERSION ;
+ }
+ return (SUITESPARSE_VERSION) ;
+}
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_hypot */
+/* -------------------------------------------------------------------------- */
+
+/* There is an equivalent routine called hypot in <math.h>, which conforms
+ * to ANSI C99. However, SuiteSparse does not assume that ANSI C99 is
+ * available. You can use the ANSI C99 hypot routine with:
+ *
+ * #include <math.h>
+ * SuiteSparse_config.hypot_func = hypot ;
+ *
+ * Default value of the SuiteSparse_config.hypot_func pointer is
+ * SuiteSparse_hypot, defined below.
+ *
+ * s = hypot (x,y) computes s = sqrt (x*x + y*y) but does so more accurately.
+ * The NaN cases for the double relops x >= y and x+y == x are safely ignored.
+ *
+ * Source: Algorithm 312, "Absolute value and square root of a complex number,"
+ * P. Friedland, Comm. ACM, vol 10, no 10, October 1967, page 665.
+ */
+
+double SuiteSparse_hypot (double x, double y)
+{
+ double s, r ;
+ x = fabs (x) ;
+ y = fabs (y) ;
+ if (x >= y)
+ {
+ if (x + y == x)
+ {
+ s = x ;
+ }
+ else
+ {
+ r = y / x ;
+ s = x * sqrt (1.0 + r*r) ;
+ }
+ }
+ else
+ {
+ if (y + x == y)
+ {
+ s = y ;
+ }
+ else
+ {
+ r = x / y ;
+ s = y * sqrt (1.0 + r*r) ;
+ }
+ }
+ return (s) ;
+}
+
+/* -------------------------------------------------------------------------- */
+/* SuiteSparse_divcomplex */
+/* -------------------------------------------------------------------------- */
+
+/* c = a/b where c, a, and b are complex. The real and imaginary parts are
+ * passed as separate arguments to this routine. The NaN case is ignored
+ * for the double relop br >= bi. Returns 1 if the denominator is zero,
+ * 0 otherwise.
+ *
+ * This uses ACM Algo 116, by R. L. Smith, 1962, which tries to avoid
+ * underflow and overflow.
+ *
+ * c can be the same variable as a or b.
+ *
+ * Default value of the SuiteSparse_config.divcomplex_func pointer is
+ * SuiteSparse_divcomplex.
+ */
+
+int SuiteSparse_divcomplex
+(
+ double ar, double ai, /* real and imaginary parts of a */
+ double br, double bi, /* real and imaginary parts of b */
+ double *cr, double *ci /* real and imaginary parts of c */
+)
+{
+ double tr, ti, r, den ;
+ if (fabs (br) >= fabs (bi))
+ {
+ r = bi / br ;
+ den = br + r * bi ;
+ tr = (ar + ai * r) / den ;
+ ti = (ai - ar * r) / den ;
+ }
+ else
+ {
+ r = br / bi ;
+ den = r * br + bi ;
+ tr = (ar * r + ai) / den ;
+ ti = (ai * r - ar) / den ;
+ }
+ *cr = tr ;
+ *ci = ti ;
+ return (den == 0.) ;
+}
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.h b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.h
new file mode 100644
index 0000000..12aa75c
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.h
@@ -0,0 +1,247 @@
+/* ========================================================================== */
+/* === SuiteSparse_config =================================================== */
+/* ========================================================================== */
+
+/* Configuration file for SuiteSparse: a Suite of Sparse matrix packages
+ * (AMD, COLAMD, CCOLAMD, CAMD, CHOLMOD, UMFPACK, CXSparse, and others).
+ *
+ * SuiteSparse_config.h provides the definition of the long integer. On most
+ * systems, a C program can be compiled in LP64 mode, in which long's and
+ * pointers are both 64-bits, and int's are 32-bits. Windows 64, however, uses
+ * the LLP64 model, in which int's and long's are 32-bits, and long long's and
+ * pointers are 64-bits.
+ *
+ * SuiteSparse packages that include long integer versions are
+ * intended for the LP64 mode. However, as a workaround for Windows 64
+ * (and perhaps other systems), the long integer can be redefined.
+ *
+ * If _WIN64 is defined, then the __int64 type is used instead of long.
+ *
+ * The long integer can also be defined at compile time. For example, this
+ * could be added to SuiteSparse_config.mk:
+ *
+ * CFLAGS = -O -D'SuiteSparse_long=long long' \
+ * -D'SuiteSparse_long_max=9223372036854775801' -D'SuiteSparse_long_idd="lld"'
+ *
+ * This file defines SuiteSparse_long as either long (on all but _WIN64) or
+ * __int64 on Windows 64. The intent is that a SuiteSparse_long is always a
+ * 64-bit integer in a 64-bit code. ptrdiff_t might be a better choice than
+ * long; it is always the same size as a pointer.
+ *
+ * This file also defines the SUITESPARSE_VERSION and related definitions.
+ *
+ * Copyright (c) 2012, Timothy A. Davis. No licensing restrictions apply
+ * to this file or to the SuiteSparse_config directory.
+ * Author: Timothy A. Davis.
+ */
+
+#ifndef SUITESPARSE_CONFIG_H
+#define SUITESPARSE_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <limits.h>
+#include <stdlib.h>
+
+/* ========================================================================== */
+/* === SuiteSparse_long ===================================================== */
+/* ========================================================================== */
+
+#ifndef SuiteSparse_long
+
+#ifdef _WIN64
+
+#define SuiteSparse_long __int64
+#define SuiteSparse_long_max _I64_MAX
+#define SuiteSparse_long_idd "I64d"
+
+#else
+
+#define SuiteSparse_long long
+#define SuiteSparse_long_max LONG_MAX
+#define SuiteSparse_long_idd "ld"
+
+#endif
+#define SuiteSparse_long_id "%" SuiteSparse_long_idd
+#endif
+
+/* ========================================================================== */
+/* === SuiteSparse_config parameters and functions ========================== */
+/* ========================================================================== */
+
+/* SuiteSparse-wide parameters are placed in this struct. It is meant to be
+ an extern, globally-accessible struct. It is not meant to be updated
+ frequently by multiple threads. Rather, if an application needs to modify
+ SuiteSparse_config, it should do it once at the beginning of the application,
+ before multiple threads are launched.
+
+ The intent of these function pointers is that they not be used in your
+ application directly, except to assign them to the desired user-provided
+ functions. Rather, you should use the
+ */
+
+struct SuiteSparse_config_struct
+{
+ void *(*malloc_func) (size_t) ; /* pointer to malloc */
+ void *(*calloc_func) (size_t, size_t) ; /* pointer to calloc */
+ void *(*realloc_func) (void *, size_t) ; /* pointer to realloc */
+ void (*free_func) (void *) ; /* pointer to free */
+ int (*printf_func) (const char *, ...) ; /* pointer to printf */
+ double (*hypot_func) (double, double) ; /* pointer to hypot */
+ int (*divcomplex_func) (double, double, double, double, double *, double *);
+} ;
+
+extern struct SuiteSparse_config_struct SuiteSparse_config ;
+
+void SuiteSparse_start ( void ) ; /* called to start SuiteSparse */
+
+void SuiteSparse_finish ( void ) ; /* called to finish SuiteSparse */
+
+void *SuiteSparse_malloc /* pointer to allocated block of memory */
+(
+ size_t nitems, /* number of items to malloc (>=1 is enforced) */
+ size_t size_of_item /* sizeof each item */
+) ;
+
+void *SuiteSparse_calloc /* pointer to allocated block of memory */
+(
+ size_t nitems, /* number of items to calloc (>=1 is enforced) */
+ size_t size_of_item /* sizeof each item */
+) ;
+
+void *SuiteSparse_realloc /* pointer to reallocated block of memory, or
+ to original block if the realloc failed. */
+(
+ size_t nitems_new, /* new number of items in the object */
+ size_t nitems_old, /* old number of items in the object */
+ size_t size_of_item, /* sizeof each item */
+ void *p, /* old object to reallocate */
+ int *ok /* 1 if successful, 0 otherwise */
+) ;
+
+void *SuiteSparse_free /* always returns NULL */
+(
+ void *p /* block to free */
+) ;
+
+void SuiteSparse_tic /* start the timer */
+(
+ double tic [2] /* output, contents undefined on input */
+) ;
+
+double SuiteSparse_toc /* return time in seconds since last tic */
+(
+ double tic [2] /* input: from last call to SuiteSparse_tic */
+) ;
+
+double SuiteSparse_time /* returns current wall clock time in seconds */
+(
+ void
+) ;
+
+/* returns sqrt (x^2 + y^2), computed reliably */
+double SuiteSparse_hypot (double x, double y) ;
+
+/* complex division of c = a/b */
+int SuiteSparse_divcomplex
+(
+ double ar, double ai, /* real and imaginary parts of a */
+ double br, double bi, /* real and imaginary parts of b */
+ double *cr, double *ci /* real and imaginary parts of c */
+) ;
+
+/* determine which timer to use, if any */
+#ifndef NTIMER
+#ifdef _POSIX_C_SOURCE
+#if _POSIX_C_SOURCE >= 199309L
+#define SUITESPARSE_TIMER_ENABLED
+#endif
+#endif
+#endif
+
+/* SuiteSparse printf macro */
+#define SUITESPARSE_PRINTF(params) \
+{ \
+ if (SuiteSparse_config.printf_func != NULL) \
+ { \
+ (void) (SuiteSparse_config.printf_func) params ; \
+ } \
+}
+
+/* ========================================================================== */
+/* === SuiteSparse version ================================================== */
+/* ========================================================================== */
+
+/* SuiteSparse is not a package itself, but a collection of packages, some of
+ * which must be used together (UMFPACK requires AMD, CHOLMOD requires AMD,
+ * COLAMD, CAMD, and CCOLAMD, etc). A version number is provided here for the
+ * collection itself. The versions of packages within each version of
+ * SuiteSparse are meant to work together. Combining one package from one
+ * version of SuiteSparse, with another package from another version of
+ * SuiteSparse, may or may not work.
+ *
+ * SuiteSparse contains the following packages:
+ *
+ * SuiteSparse_config version 4.4.1 (version always the same as SuiteSparse)
+ * AMD version 2.4.1
+ * BTF version 1.2.1
+ * CAMD version 2.4.1
+ * CCOLAMD version 2.9.1
+ * CHOLMOD version 3.0.6
+ * COLAMD version 2.9.1
+ * CSparse version 3.1.4
+ * CXSparse version 3.1.4
+ * KLU version 1.3.3
+ * LDL version 2.2.1
+ * RBio version 2.2.1
+ * SPQR version 2.0.1
+ * GPUQREngine version 1.0.0
+ * SuiteSparse_GPURuntime version 1.0.0
+ * UMFPACK version 5.7.1
+ * MATLAB_Tools various packages & M-files
+ *
+ * Other package dependencies:
+ * BLAS required by CHOLMOD and UMFPACK
+ * LAPACK required by CHOLMOD
+ * METIS 4.0.1 required by CHOLMOD (optional) and KLU (optional)
+ * CUBLAS, CUDART NVIDIA libraries required by CHOLMOD and SPQR when
+ * they are compiled with GPU acceleration.
+ */
+
+
+int SuiteSparse_version /* returns SUITESPARSE_VERSION */
+(
+ /* output, not defined on input. Not used if NULL. Returns
+ the three version codes in version [0..2]:
+ version [0] is SUITESPARSE_MAIN_VERSION
+ version [1] is SUITESPARSE_SUB_VERSION
+ version [2] is SUITESPARSE_SUBSUB_VERSION
+ */
+ int version [3]
+) ;
+
+/* Versions prior to 4.2.0 do not have the above function. The following
+ code fragment will work with any version of SuiteSparse:
+
+ #ifdef SUITESPARSE_HAS_VERSION_FUNCTION
+ v = SuiteSparse_version (NULL) ;
+ #else
+ v = SUITESPARSE_VERSION ;
+ #endif
+*/
+#define SUITESPARSE_HAS_VERSION_FUNCTION
+
+#define SUITESPARSE_DATE "July 14, 2015"
+#define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub))
+#define SUITESPARSE_MAIN_VERSION 4
+#define SUITESPARSE_SUB_VERSION 4
+#define SUITESPARSE_SUBSUB_VERSION 5
+#define SUITESPARSE_VERSION \
+ SUITESPARSE_VER_CODE(SUITESPARSE_MAIN_VERSION,SUITESPARSE_SUB_VERSION)
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk
new file mode 100644
index 0000000..3ab813c
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk
@@ -0,0 +1,452 @@
+#===============================================================================
+# SuiteSparse_config.mk: common configuration file for the SuiteSparse
+#===============================================================================
+
+# This file contains all configuration settings for all packages authored or
+# co-authored by Tim Davis:
+#
+# Package Version Description
+# ------- ------- -----------
+# AMD 1.2 or later approximate minimum degree ordering
+# COLAMD 2.4 or later column approximate minimum degree ordering
+# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering
+# CAMD any constrained approximate minimum degree ordering
+# UMFPACK 4.5 or later sparse LU factorization, with the BLAS
+# CHOLMOD any sparse Cholesky factorization, update/downdate
+# KLU 0.8 or later sparse LU factorization, BLAS-free
+# BTF 0.8 or later permutation to block triangular form
+# LDL 1.2 or later concise sparse LDL'
+# CXSparse any extended version of CSparse (int/long, real/complex)
+# SuiteSparseQR any sparse QR factorization
+# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format
+#
+# By design, this file is NOT included in the CSparse makefile.
+# That package is fully stand-alone. CSparse is primarily for teaching;
+# production code should use CXSparse.
+#
+# The SuiteSparse_config directory and the above packages should all appear in
+# a single directory, in order for the Makefile's within each package to find
+# this file.
+#
+# To enable an option of the form "# OPTION = ...", edit this file and
+# delete the "#" in the first column of the option you wish to use.
+#
+# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with
+# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you
+# do not have a metis-4.0 directory inside the SuiteSparse directory, the
+# */Makefile's that optionally rely on METIS will automatically detect this
+# and compile without METIS.
+
+#------------------------------------------------------------------------------
+# Generic configuration
+#------------------------------------------------------------------------------
+
+# Using standard definitions from the make environment, typically:
+#
+# CC cc C compiler
+# CXX g++ C++ compiler
+# CFLAGS [ ] flags for C and C++ compiler
+# CPPFLAGS [ ] flags for C and C++ compiler
+# TARGET_ARCH [ ] target architecture
+# FFLAGS [ ] flags for Fortran compiler
+# RM rm -f delete a file
+# AR ar create a static *.a library archive
+# ARFLAGS rv flags for ar
+# MAKE make make itself (sometimes called gmake)
+#
+# You can redefine them here, but by default they are used from the
+# default make environment.
+
+# To use OpenMP add -openmp to the CFLAGS
+# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
+# as the number of cores per socket on the machine being used to maximize
+# memory performance
+ CFLAGS =
+# CFLAGS = -g
+# for the icc compiler and OpenMP:
+# CFLAGS = -openmp
+
+# C and C++ compiler flags. The first three are standard for *.c and *.cpp
+# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+ CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
+# for the MKL BLAS:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
+# with no optimization:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC
+
+# ranlib, and ar, for generating libraries. If you don't need ranlib,
+# just change it to RANLAB = echo
+RANLIB = ranlib
+ARCHIVE = $(AR) $(ARFLAGS)
+
+# copy and delete a file
+CP = cp -f
+MV = mv -f
+
+# Fortran compiler (not required for 'make' or 'make library')
+F77 = gfortran
+F77FLAGS = $(FFLAGS) -O
+F77LIB =
+
+# C and Fortran libraries. Remove -lrt if you don't have it.
+ LIB = -lm -lrt
+# Using the following requires CF = ... -DNTIMER on POSIX C systems.
+# LIB = -lm
+
+# For "make install"
+INSTALL_LIB = /usr/local/lib
+INSTALL_INCLUDE = /usr/local/include
+
+# Which version of MAKE you are using (default is "make")
+# MAKE = make
+# MAKE = gmake
+
+#------------------------------------------------------------------------------
+# BLAS and LAPACK configuration:
+#------------------------------------------------------------------------------
+
+# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK.
+# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
+# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
+# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard
+# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
+# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
+# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
+# on a 2.5Ghz dual-core AMD Opteron.
+
+# These settings will probably not work, since there is no fixed convention for
+# naming the BLAS and LAPACK library (*.a or *.so) files.
+
+# This is probably slow ... it might connect to the Standard Reference BLAS:
+# BLAS = -lblas -lgfortran
+ LAPACK = -llapack
+
+# MKL
+# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
+# LAPACK =
+
+# ACML
+# BLAS = -lacml -lgfortran
+# LAPACK =
+
+# OpenBLAS
+ BLAS = -lopenblas
+# LAPACK =
+
+# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto.
+# Using the Goto BLAS:
+# BLAS = -lgoto -lgfortran -lgfortranbegin
+# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
+
+# Using non-optimized versions:
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack_plain
+
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack
+
+# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
+# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
+# stops the application program if an error occurs. A C version of xerbla
+# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
+# includes a Fortran-callable xerbla routine that prints nothing and does not
+# stop the application program. This is optional.
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a
+
+# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
+# use this option:
+XERBLA =
+
+# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
+# use this:
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a
+
+#------------------------------------------------------------------------------
+# GPU configuration for CHOLMOD and SPQR
+#------------------------------------------------------------------------------
+
+# no cuda
+ CUDA_ROOT =
+ GPU_BLAS_PATH =
+ GPU_CONFIG =
+ CUDA_PATH =
+ CUDART_LIB =
+ CUBLAS_LIB =
+ CUDA_INC_PATH =
+ NV20 =
+ NV30 =
+ NV35 =
+ NVCC = echo
+ NVCCFLAGS =
+
+# with cuda for CHOLMOD
+# CUDA_ROOT = /usr/local/cuda
+# GPU_BLAS_PATH = $(CUDA_ROOT)
+# with 4 cores (default):
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS
+# with 10 cores:
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
+# CUDA_PATH = $(CUDA_ROOT)
+# CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so
+# CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so
+# CUDA_INC_PATH = $(CUDA_ROOT)/include/
+# NV20 = -arch=sm_20 -Xcompiler -fPIC
+# NV30 = -arch=sm_30 -Xcompiler -fPIC
+# NV35 = -arch=sm_35 -Xcompiler -fPIC
+# NVCC = $(CUDA_ROOT)/bin/nvcc
+# NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
+
+# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
+
+#------------------------------------------------------------------------------
+# METIS, optionally used by CHOLMOD
+#------------------------------------------------------------------------------
+
+# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
+# compile CHOLMOD with the -DNPARTITION flag.
+
+# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+# You may wish to use an absolute path. METIS is optional. Compile
+# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+METIS_PATH = ../../metis-4.0
+METIS = ../../metis-4.0/libmetis.a
+
+#------------------------------------------------------------------------------
+# UMFPACK configuration:
+#------------------------------------------------------------------------------
+
+# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details.
+#
+# -DNBLAS do not use the BLAS. UMFPACK will be very slow.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris)
+# -DNRECIPROCAL do not multiply by the reciprocal
+# -DNO_DIVIDE_BY_ZERO do not divide by zero
+# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is
+# included in UMFPACK_CONFIG, then UMFPACK does not rely on
+# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
+
+UMFPACK_CONFIG =
+
+# uncomment this line to compile UMFPACK without CHOLMOD:
+# UMFPACK_CONFIG = -DNCHOLMOD
+
+#------------------------------------------------------------------------------
+# CHOLMOD configuration
+#------------------------------------------------------------------------------
+
+# CHOLMOD Library Modules, which appear in libcholmod.a:
+# Core requires: none
+# Check requires: Core
+# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal
+# MatrixOps requires: Core
+# Modify requires: Core
+# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky
+# Supernodal requires: Core, BLAS, LAPACK
+#
+# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
+# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
+# optional: Partition
+# Valgrind same as Tcov
+# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal
+# optional: Partition
+#
+# Configuration flags:
+# -DNCHECK do not include the Check module. License GNU LGPL
+# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL
+# -DNPARTITION do not include the Partition module. License GNU LGPL
+# also do not include METIS.
+# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL
+# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library:
+# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL
+# -DNMODIFY do not include the Modify module. License GNU GPL
+# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL
+#
+# -DNPRINT do not print anything.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF for Solaris only. If defined, do not use the Sun
+# Performance Library
+
+CHOLMOD_CONFIG = $(GPU_CONFIG)
+
+# uncomment this line to compile CHOLMOD without METIS:
+# CHOLMOD_CONFIG = -DNPARTITION
+
+#------------------------------------------------------------------------------
+# SuiteSparseQR configuration:
+#------------------------------------------------------------------------------
+
+# The SuiteSparseQR library can be compiled with the following options:
+#
+# -DNPARTITION do not include the CHOLMOD partition module
+# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp
+# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
+
+# default, without timing, without TBB:
+SPQR_CONFIG = $(GPU_CONFIG)
+# with TBB:
+# SPQR_CONFIG = -DHAVE_TBB
+
+# This is needed for IBM AIX: (but not for and C codes, just C++)
+# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
+
+# with TBB, you must select this:
+# TBB = -ltbb
+# without TBB:
+TBB =
+
+#------------------------------------------------------------------------------
+# code formatting
+#------------------------------------------------------------------------------
+
+# Use "grep" only, if you do not have "indent"
+# PRETTY = grep -v "^\#"
+# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
+ PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
+
+#------------------------------------------------------------------------------
+# Linux
+#------------------------------------------------------------------------------
+
+# Using default compilers:
+# CC = gcc
+# CF = $(CFLAGS) -O3 -fexceptions
+
+# alternatives:
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
+# -funit-at-a-time
+# CF = $(CFLAGS) -O3 -fexceptions \
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+# CF = $(CFLAGS) -O3
+# CF = $(CFLAGS) -O3 -g -fexceptions
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow \
+# -Wredundant-decls -Wdisabled-optimization -ansi
+
+# consider:
+# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
+# -frename-registers -ffast-math -funroll-loops
+
+# Using the Goto BLAS:
+# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
+
+# Using Intel's icc and ifort compilers:
+# (does not work for mexFunctions unless you add a mexopts.sh file)
+# F77 = ifort
+# CC = icc
+# CF = $(CFLAGS) -O3 -xN -vec_report=0
+# CF = $(CFLAGS) -g
+
+# 64bit:
+# F77FLAGS = -O -m64
+# CF = $(CFLAGS) -O3 -fexceptions -m64
+# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
+# LAPACK = -llapack64
+
+# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+
+# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto -lgfortran
+
+#------------------------------------------------------------------------------
+# Mac
+#------------------------------------------------------------------------------
+
+# As recommended by macports, http://suitesparse.darwinports.com/
+# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
+# on my MacBook Air, and they work fine.
+
+# F77 = gfortran
+# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
+# BLAS = -framework Accelerate
+# LAPACK = -framework Accelerate
+# LIB = -lm
+
+#------------------------------------------------------------------------------
+# Solaris
+#------------------------------------------------------------------------------
+
+# 32-bit
+# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
+
+# 64-bit
+# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
+
+# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
+
+# The Sun Performance Library includes both LAPACK and the BLAS:
+# BLAS = -xlic_lib=sunperf
+# LAPACK =
+
+
+#------------------------------------------------------------------------------
+# Compaq Alpha
+#------------------------------------------------------------------------------
+
+# 64-bit mode only
+# CF = $(CFLAGS) -O2 -std1
+# BLAS = -ldxml
+# LAPACK =
+
+#------------------------------------------------------------------------------
+# IBM RS 6000
+#------------------------------------------------------------------------------
+
+# BLAS = -lessl
+# LAPACK =
+
+# 32-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384
+
+# 64-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
+
+#------------------------------------------------------------------------------
+# SGI IRIX
+#------------------------------------------------------------------------------
+
+# BLAS = -lscsl
+# LAPACK =
+
+# 32-bit mode
+# CF = $(CFLAGS) -O
+
+# 64-bit mode (32 bit int's and 64-bit long's):
+# CF = $(CFLAGS) -64
+# F77FLAGS = -64
+
+# SGI doesn't have ranlib
+# RANLIB = echo
+
+#------------------------------------------------------------------------------
+# AMD Opteron (64 bit)
+#------------------------------------------------------------------------------
+
+# BLAS = -lgoto_opteron64 -lg2c
+# LAPACK = -llapack_opteron64
+
+# SUSE Linux 10.1, AMD Opteron
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+# LAPACK = -llapack_opteron64
+
+#------------------------------------------------------------------------------
+# remove object files and profile output
+#------------------------------------------------------------------------------
+
+CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_debug.mk b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_debug.mk
new file mode 100644
index 0000000..be6a62f
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_debug.mk
@@ -0,0 +1,452 @@
+#===============================================================================
+# SuiteSparse_config.mk: common configuration file for the SuiteSparse
+#===============================================================================
+
+# This file contains all configuration settings for all packages authored or
+# co-authored by Tim Davis:
+#
+# Package Version Description
+# ------- ------- -----------
+# AMD 1.2 or later approximate minimum degree ordering
+# COLAMD 2.4 or later column approximate minimum degree ordering
+# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering
+# CAMD any constrained approximate minimum degree ordering
+# UMFPACK 4.5 or later sparse LU factorization, with the BLAS
+# CHOLMOD any sparse Cholesky factorization, update/downdate
+# KLU 0.8 or later sparse LU factorization, BLAS-free
+# BTF 0.8 or later permutation to block triangular form
+# LDL 1.2 or later concise sparse LDL'
+# CXSparse any extended version of CSparse (int/long, real/complex)
+# SuiteSparseQR any sparse QR factorization
+# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format
+#
+# By design, this file is NOT included in the CSparse makefile.
+# That package is fully stand-alone. CSparse is primarily for teaching;
+# production code should use CXSparse.
+#
+# The SuiteSparse_config directory and the above packages should all appear in
+# a single directory, in order for the Makefile's within each package to find
+# this file.
+#
+# To enable an option of the form "# OPTION = ...", edit this file and
+# delete the "#" in the first column of the option you wish to use.
+#
+# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with
+# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you
+# do not have a metis-4.0 directory inside the SuiteSparse directory, the
+# */Makefile's that optionally rely on METIS will automatically detect this
+# and compile without METIS.
+
+#------------------------------------------------------------------------------
+# Generic configuration
+#------------------------------------------------------------------------------
+
+# Using standard definitions from the make environment, typically:
+#
+# CC cc C compiler
+# CXX g++ C++ compiler
+# CFLAGS [ ] flags for C and C++ compiler
+# CPPFLAGS [ ] flags for C and C++ compiler
+# TARGET_ARCH [ ] target architecture
+# FFLAGS [ ] flags for Fortran compiler
+# RM rm -f delete a file
+# AR ar create a static *.a library archive
+# ARFLAGS rv flags for ar
+# MAKE make make itself (sometimes called gmake)
+#
+# You can redefine them here, but by default they are used from the
+# default make environment.
+
+# To use OpenMP add -openmp to the CFLAGS
+# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
+# as the number of cores per socket on the machine being used to maximize
+# memory performance
+# CFLAGS =
+ CFLAGS = -g
+# for the icc compiler and OpenMP:
+# CFLAGS = -openmp
+
+# C and C++ compiler flags. The first three are standard for *.c and *.cpp
+# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
+# for the MKL BLAS:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
+# with no optimization:
+ CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC
+
+# ranlib, and ar, for generating libraries. If you don't need ranlib,
+# just change it to RANLAB = echo
+RANLIB = ranlib
+ARCHIVE = $(AR) $(ARFLAGS)
+
+# copy and delete a file
+CP = cp -f
+MV = mv -f
+
+# Fortran compiler (not required for 'make' or 'make library')
+F77 = gfortran
+F77FLAGS = $(FFLAGS) -O
+F77LIB =
+
+# C and Fortran libraries. Remove -lrt if you don't have it.
+ LIB = -lm -lrt
+# Using the following requires CF = ... -DNTIMER on POSIX C systems.
+# LIB = -lm
+
+# For "make install"
+INSTALL_LIB = /usr/local/lib
+INSTALL_INCLUDE = /usr/local/include
+
+# Which version of MAKE you are using (default is "make")
+# MAKE = make
+# MAKE = gmake
+
+#------------------------------------------------------------------------------
+# BLAS and LAPACK configuration:
+#------------------------------------------------------------------------------
+
+# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK.
+# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
+# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
+# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard
+# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
+# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
+# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
+# on a 2.5Ghz dual-core AMD Opteron.
+
+# These settings will probably not work, since there is no fixed convention for
+# naming the BLAS and LAPACK library (*.a or *.so) files.
+
+# This is probably slow ... it might connect to the Standard Reference BLAS:
+ BLAS = -lblas -lgfortran
+ LAPACK = -llapack
+
+# MKL
+# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
+# LAPACK =
+
+# ACML
+# BLAS = -lacml -lgfortran
+# LAPACK =
+
+# OpenBLAS
+# BLAS = -lopenblas
+# LAPACK =
+
+# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto.
+# Using the Goto BLAS:
+# BLAS = -lgoto -lgfortran -lgfortranbegin
+# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
+
+# Using non-optimized versions:
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack_plain
+
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack
+
+# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
+# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
+# stops the application program if an error occurs. A C version of xerbla
+# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
+# includes a Fortran-callable xerbla routine that prints nothing and does not
+# stop the application program. This is optional.
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a
+
+# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
+# use this option:
+XERBLA =
+
+# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
+# use this:
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a
+
+#------------------------------------------------------------------------------
+# GPU configuration for CHOLMOD and SPQR
+#------------------------------------------------------------------------------
+
+# no cuda
+# CUDA_ROOT =
+# GPU_BLAS_PATH =
+# GPU_CONFIG =
+# CUDA_PATH =
+# CUDART_LIB =
+# CUBLAS_LIB =
+# CUDA_INC_PATH =
+# NV20 =
+# NV30 =
+# NV35 =
+# NVCC = echo
+# NVCCFLAGS =
+
+# with cuda for CHOLMOD
+ CUDA_ROOT = /usr/local/cuda
+ GPU_BLAS_PATH = $(CUDA_ROOT)
+# with 4 cores (default):
+ GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS
+# with 10 cores:
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
+ CUDA_PATH = $(CUDA_ROOT)
+ CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so
+ CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so
+ CUDA_INC_PATH = $(CUDA_ROOT)/include/
+ NV20 = -arch=sm_20 -Xcompiler -fPIC
+ NV30 = -arch=sm_30 -Xcompiler -fPIC
+ NV35 = -arch=sm_35 -Xcompiler -fPIC
+ NVCC = $(CUDA_ROOT)/bin/nvcc
+ NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
+
+# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
+
+#------------------------------------------------------------------------------
+# METIS, optionally used by CHOLMOD
+#------------------------------------------------------------------------------
+
+# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
+# compile CHOLMOD with the -DNPARTITION flag.
+
+# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+# You may wish to use an absolute path. METIS is optional. Compile
+# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+METIS_PATH = ../../metis-4.0
+METIS = ../../metis-4.0/libmetis.a
+
+#------------------------------------------------------------------------------
+# UMFPACK configuration:
+#------------------------------------------------------------------------------
+
+# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details.
+#
+# -DNBLAS do not use the BLAS. UMFPACK will be very slow.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris)
+# -DNRECIPROCAL do not multiply by the reciprocal
+# -DNO_DIVIDE_BY_ZERO do not divide by zero
+# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is
+# included in UMFPACK_CONFIG, then UMFPACK does not rely on
+# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
+
+UMFPACK_CONFIG =
+
+# uncomment this line to compile UMFPACK without CHOLMOD:
+# UMFPACK_CONFIG = -DNCHOLMOD
+
+#------------------------------------------------------------------------------
+# CHOLMOD configuration
+#------------------------------------------------------------------------------
+
+# CHOLMOD Library Modules, which appear in libcholmod.a:
+# Core requires: none
+# Check requires: Core
+# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal
+# MatrixOps requires: Core
+# Modify requires: Core
+# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky
+# Supernodal requires: Core, BLAS, LAPACK
+#
+# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
+# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
+# optional: Partition
+# Valgrind same as Tcov
+# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal
+# optional: Partition
+#
+# Configuration flags:
+# -DNCHECK do not include the Check module. License GNU LGPL
+# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL
+# -DNPARTITION do not include the Partition module. License GNU LGPL
+# also do not include METIS.
+# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL
+# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library:
+# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL
+# -DNMODIFY do not include the Modify module. License GNU GPL
+# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL
+#
+# -DNPRINT do not print anything.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF for Solaris only. If defined, do not use the Sun
+# Performance Library
+
+CHOLMOD_CONFIG = $(GPU_CONFIG)
+
+# uncomment this line to compile CHOLMOD without METIS:
+# CHOLMOD_CONFIG = -DNPARTITION
+
+#------------------------------------------------------------------------------
+# SuiteSparseQR configuration:
+#------------------------------------------------------------------------------
+
+# The SuiteSparseQR library can be compiled with the following options:
+#
+# -DNPARTITION do not include the CHOLMOD partition module
+# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp
+# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
+
+# default, without timing, without TBB:
+SPQR_CONFIG = $(GPU_CONFIG)
+# with TBB:
+# SPQR_CONFIG = -DHAVE_TBB
+
+# This is needed for IBM AIX: (but not for and C codes, just C++)
+# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
+
+# with TBB, you must select this:
+# TBB = -ltbb
+# without TBB:
+TBB =
+
+#------------------------------------------------------------------------------
+# code formatting
+#------------------------------------------------------------------------------
+
+# Use "grep" only, if you do not have "indent"
+# PRETTY = grep -v "^\#"
+# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
+ PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
+
+#------------------------------------------------------------------------------
+# Linux
+#------------------------------------------------------------------------------
+
+# Using default compilers:
+# CC = gcc
+# CF = $(CFLAGS) -O3 -fexceptions
+
+# alternatives:
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
+# -funit-at-a-time
+# CF = $(CFLAGS) -O3 -fexceptions \
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+# CF = $(CFLAGS) -O3
+# CF = $(CFLAGS) -O3 -g -fexceptions
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow \
+# -Wredundant-decls -Wdisabled-optimization -ansi
+
+# consider:
+# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
+# -frename-registers -ffast-math -funroll-loops
+
+# Using the Goto BLAS:
+# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
+
+# Using Intel's icc and ifort compilers:
+# (does not work for mexFunctions unless you add a mexopts.sh file)
+# F77 = ifort
+# CC = icc
+# CF = $(CFLAGS) -O3 -xN -vec_report=0
+# CF = $(CFLAGS) -g
+
+# 64bit:
+# F77FLAGS = -O -m64
+# CF = $(CFLAGS) -O3 -fexceptions -m64
+# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
+# LAPACK = -llapack64
+
+# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+
+# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto -lgfortran
+
+#------------------------------------------------------------------------------
+# Mac
+#------------------------------------------------------------------------------
+
+# As recommended by macports, http://suitesparse.darwinports.com/
+# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
+# on my MacBook Air, and they work fine.
+
+# F77 = gfortran
+# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
+# BLAS = -framework Accelerate
+# LAPACK = -framework Accelerate
+# LIB = -lm
+
+#------------------------------------------------------------------------------
+# Solaris
+#------------------------------------------------------------------------------
+
+# 32-bit
+# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
+
+# 64-bit
+# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
+
+# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
+
+# The Sun Performance Library includes both LAPACK and the BLAS:
+# BLAS = -xlic_lib=sunperf
+# LAPACK =
+
+
+#------------------------------------------------------------------------------
+# Compaq Alpha
+#------------------------------------------------------------------------------
+
+# 64-bit mode only
+# CF = $(CFLAGS) -O2 -std1
+# BLAS = -ldxml
+# LAPACK =
+
+#------------------------------------------------------------------------------
+# IBM RS 6000
+#------------------------------------------------------------------------------
+
+# BLAS = -lessl
+# LAPACK =
+
+# 32-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384
+
+# 64-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
+
+#------------------------------------------------------------------------------
+# SGI IRIX
+#------------------------------------------------------------------------------
+
+# BLAS = -lscsl
+# LAPACK =
+
+# 32-bit mode
+# CF = $(CFLAGS) -O
+
+# 64-bit mode (32 bit int's and 64-bit long's):
+# CF = $(CFLAGS) -64
+# F77FLAGS = -64
+
+# SGI doesn't have ranlib
+# RANLIB = echo
+
+#------------------------------------------------------------------------------
+# AMD Opteron (64 bit)
+#------------------------------------------------------------------------------
+
+# BLAS = -lgoto_opteron64 -lg2c
+# LAPACK = -llapack_opteron64
+
+# SUSE Linux 10.1, AMD Opteron
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+# LAPACK = -llapack_opteron64
+
+#------------------------------------------------------------------------------
+# remove object files and profile output
+#------------------------------------------------------------------------------
+
+CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_gcc.mk b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_gcc.mk
new file mode 100644
index 0000000..79d888c
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_gcc.mk
@@ -0,0 +1,452 @@
+#===============================================================================
+# SuiteSparse_config.mk: common configuration file for the SuiteSparse
+#===============================================================================
+
+# This file contains all configuration settings for all packages authored or
+# co-authored by Tim Davis:
+#
+# Package Version Description
+# ------- ------- -----------
+# AMD 1.2 or later approximate minimum degree ordering
+# COLAMD 2.4 or later column approximate minimum degree ordering
+# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering
+# CAMD any constrained approximate minimum degree ordering
+# UMFPACK 4.5 or later sparse LU factorization, with the BLAS
+# CHOLMOD any sparse Cholesky factorization, update/downdate
+# KLU 0.8 or later sparse LU factorization, BLAS-free
+# BTF 0.8 or later permutation to block triangular form
+# LDL 1.2 or later concise sparse LDL'
+# CXSparse any extended version of CSparse (int/long, real/complex)
+# SuiteSparseQR any sparse QR factorization
+# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format
+#
+# By design, this file is NOT included in the CSparse makefile.
+# That package is fully stand-alone. CSparse is primarily for teaching;
+# production code should use CXSparse.
+#
+# The SuiteSparse_config directory and the above packages should all appear in
+# a single directory, in order for the Makefile's within each package to find
+# this file.
+#
+# To enable an option of the form "# OPTION = ...", edit this file and
+# delete the "#" in the first column of the option you wish to use.
+#
+# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with
+# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you
+# do not have a metis-4.0 directory inside the SuiteSparse directory, the
+# */Makefile's that optionally rely on METIS will automatically detect this
+# and compile without METIS.
+
+#------------------------------------------------------------------------------
+# Generic configuration
+#------------------------------------------------------------------------------
+
+# Using standard definitions from the make environment, typically:
+#
+# CC cc C compiler
+# CXX g++ C++ compiler
+# CFLAGS [ ] flags for C and C++ compiler
+# CPPFLAGS [ ] flags for C and C++ compiler
+# TARGET_ARCH [ ] target architecture
+# FFLAGS [ ] flags for Fortran compiler
+# RM rm -f delete a file
+# AR ar create a static *.a library archive
+# ARFLAGS rv flags for ar
+# MAKE make make itself (sometimes called gmake)
+#
+# You can redefine them here, but by default they are used from the
+# default make environment.
+
+# To use OpenMP add -openmp to the CFLAGS
+# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
+# as the number of cores per socket on the machine being used to maximize
+# memory performance
+ CFLAGS =
+# CFLAGS = -g
+# for the icc compiler and OpenMP:
+# CFLAGS = -openmp
+
+# C and C++ compiler flags. The first three are standard for *.c and *.cpp
+# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+ CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
+# for the MKL BLAS:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
+# with no optimization:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC
+
+# ranlib, and ar, for generating libraries. If you don't need ranlib,
+# just change it to RANLAB = echo
+RANLIB = ranlib
+ARCHIVE = $(AR) $(ARFLAGS)
+
+# copy and delete a file
+CP = cp -f
+MV = mv -f
+
+# Fortran compiler (not required for 'make' or 'make library')
+F77 = gfortran
+F77FLAGS = $(FFLAGS) -O
+F77LIB =
+
+# C and Fortran libraries. Remove -lrt if you don't have it.
+ LIB = -lm -lrt
+# Using the following requires CF = ... -DNTIMER on POSIX C systems.
+# LIB = -lm
+
+# For "make install"
+INSTALL_LIB = /usr/local/lib
+INSTALL_INCLUDE = /usr/local/include
+
+# Which version of MAKE you are using (default is "make")
+# MAKE = make
+# MAKE = gmake
+
+#------------------------------------------------------------------------------
+# BLAS and LAPACK configuration:
+#------------------------------------------------------------------------------
+
+# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK.
+# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
+# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
+# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard
+# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
+# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
+# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
+# on a 2.5Ghz dual-core AMD Opteron.
+
+# These settings will probably not work, since there is no fixed convention for
+# naming the BLAS and LAPACK library (*.a or *.so) files.
+
+# This is probably slow ... it might connect to the Standard Reference BLAS:
+ BLAS = -lblas -lgfortran
+ LAPACK = -llapack
+
+# MKL
+# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
+# LAPACK =
+
+# ACML
+# BLAS = -lacml -lgfortran
+# LAPACK =
+
+# OpenBLAS
+# BLAS = -lopenblas
+# LAPACK =
+
+# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto.
+# Using the Goto BLAS:
+# BLAS = -lgoto -lgfortran -lgfortranbegin
+# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
+
+# Using non-optimized versions:
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack_plain
+
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack
+
+# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
+# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
+# stops the application program if an error occurs. A C version of xerbla
+# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
+# includes a Fortran-callable xerbla routine that prints nothing and does not
+# stop the application program. This is optional.
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a
+
+# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
+# use this option:
+XERBLA =
+
+# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
+# use this:
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a
+
+#------------------------------------------------------------------------------
+# GPU configuration for CHOLMOD and SPQR
+#------------------------------------------------------------------------------
+
+# no cuda
+# CUDA_ROOT =
+# GPU_BLAS_PATH =
+# GPU_CONFIG =
+# CUDA_PATH =
+# CUDART_LIB =
+# CUBLAS_LIB =
+# CUDA_INC_PATH =
+# NV20 =
+# NV30 =
+# NV35 =
+# NVCC = echo
+# NVCCFLAGS =
+
+# with cuda for CHOLMOD
+ CUDA_ROOT = /usr/local/cuda
+ GPU_BLAS_PATH = $(CUDA_ROOT)
+# with 4 cores (default):
+ GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS
+# with 10 cores:
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
+ CUDA_PATH = $(CUDA_ROOT)
+ CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so
+ CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so
+ CUDA_INC_PATH = $(CUDA_ROOT)/include/
+ NV20 = -arch=sm_20 -Xcompiler -fPIC
+ NV30 = -arch=sm_30 -Xcompiler -fPIC
+ NV35 = -arch=sm_35 -Xcompiler -fPIC
+ NVCC = $(CUDA_ROOT)/bin/nvcc
+ NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
+
+# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
+
+#------------------------------------------------------------------------------
+# METIS, optionally used by CHOLMOD
+#------------------------------------------------------------------------------
+
+# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
+# compile CHOLMOD with the -DNPARTITION flag.
+
+# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+# You may wish to use an absolute path. METIS is optional. Compile
+# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+METIS_PATH = ../../metis-4.0
+METIS = ../../metis-4.0/libmetis.a
+
+#------------------------------------------------------------------------------
+# UMFPACK configuration:
+#------------------------------------------------------------------------------
+
+# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details.
+#
+# -DNBLAS do not use the BLAS. UMFPACK will be very slow.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris)
+# -DNRECIPROCAL do not multiply by the reciprocal
+# -DNO_DIVIDE_BY_ZERO do not divide by zero
+# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is
+# included in UMFPACK_CONFIG, then UMFPACK does not rely on
+# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
+
+UMFPACK_CONFIG =
+
+# uncomment this line to compile UMFPACK without CHOLMOD:
+# UMFPACK_CONFIG = -DNCHOLMOD
+
+#------------------------------------------------------------------------------
+# CHOLMOD configuration
+#------------------------------------------------------------------------------
+
+# CHOLMOD Library Modules, which appear in libcholmod.a:
+# Core requires: none
+# Check requires: Core
+# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal
+# MatrixOps requires: Core
+# Modify requires: Core
+# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky
+# Supernodal requires: Core, BLAS, LAPACK
+#
+# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
+# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
+# optional: Partition
+# Valgrind same as Tcov
+# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal
+# optional: Partition
+#
+# Configuration flags:
+# -DNCHECK do not include the Check module. License GNU LGPL
+# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL
+# -DNPARTITION do not include the Partition module. License GNU LGPL
+# also do not include METIS.
+# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL
+# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library:
+# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL
+# -DNMODIFY do not include the Modify module. License GNU GPL
+# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL
+#
+# -DNPRINT do not print anything.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF for Solaris only. If defined, do not use the Sun
+# Performance Library
+
+CHOLMOD_CONFIG = $(GPU_CONFIG)
+
+# uncomment this line to compile CHOLMOD without METIS:
+# CHOLMOD_CONFIG = -DNPARTITION
+
+#------------------------------------------------------------------------------
+# SuiteSparseQR configuration:
+#------------------------------------------------------------------------------
+
+# The SuiteSparseQR library can be compiled with the following options:
+#
+# -DNPARTITION do not include the CHOLMOD partition module
+# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp
+# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
+
+# default, without timing, without TBB:
+SPQR_CONFIG = $(GPU_CONFIG)
+# with TBB:
+# SPQR_CONFIG = -DHAVE_TBB
+
+# This is needed for IBM AIX: (but not for and C codes, just C++)
+# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
+
+# with TBB, you must select this:
+# TBB = -ltbb
+# without TBB:
+TBB =
+
+#------------------------------------------------------------------------------
+# code formatting
+#------------------------------------------------------------------------------
+
+# Use "grep" only, if you do not have "indent"
+# PRETTY = grep -v "^\#"
+# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
+ PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
+
+#------------------------------------------------------------------------------
+# Linux
+#------------------------------------------------------------------------------
+
+# Using default compilers:
+# CC = gcc
+# CF = $(CFLAGS) -O3 -fexceptions
+
+# alternatives:
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
+# -funit-at-a-time
+# CF = $(CFLAGS) -O3 -fexceptions \
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+# CF = $(CFLAGS) -O3
+# CF = $(CFLAGS) -O3 -g -fexceptions
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow \
+# -Wredundant-decls -Wdisabled-optimization -ansi
+
+# consider:
+# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
+# -frename-registers -ffast-math -funroll-loops
+
+# Using the Goto BLAS:
+# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
+
+# Using Intel's icc and ifort compilers:
+# (does not work for mexFunctions unless you add a mexopts.sh file)
+# F77 = ifort
+# CC = icc
+# CF = $(CFLAGS) -O3 -xN -vec_report=0
+# CF = $(CFLAGS) -g
+
+# 64bit:
+# F77FLAGS = -O -m64
+# CF = $(CFLAGS) -O3 -fexceptions -m64
+# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
+# LAPACK = -llapack64
+
+# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+
+# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto -lgfortran
+
+#------------------------------------------------------------------------------
+# Mac
+#------------------------------------------------------------------------------
+
+# As recommended by macports, http://suitesparse.darwinports.com/
+# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
+# on my MacBook Air, and they work fine.
+
+# F77 = gfortran
+# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
+# BLAS = -framework Accelerate
+# LAPACK = -framework Accelerate
+# LIB = -lm
+
+#------------------------------------------------------------------------------
+# Solaris
+#------------------------------------------------------------------------------
+
+# 32-bit
+# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
+
+# 64-bit
+# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
+
+# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
+
+# The Sun Performance Library includes both LAPACK and the BLAS:
+# BLAS = -xlic_lib=sunperf
+# LAPACK =
+
+
+#------------------------------------------------------------------------------
+# Compaq Alpha
+#------------------------------------------------------------------------------
+
+# 64-bit mode only
+# CF = $(CFLAGS) -O2 -std1
+# BLAS = -ldxml
+# LAPACK =
+
+#------------------------------------------------------------------------------
+# IBM RS 6000
+#------------------------------------------------------------------------------
+
+# BLAS = -lessl
+# LAPACK =
+
+# 32-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384
+
+# 64-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
+
+#------------------------------------------------------------------------------
+# SGI IRIX
+#------------------------------------------------------------------------------
+
+# BLAS = -lscsl
+# LAPACK =
+
+# 32-bit mode
+# CF = $(CFLAGS) -O
+
+# 64-bit mode (32 bit int's and 64-bit long's):
+# CF = $(CFLAGS) -64
+# F77FLAGS = -64
+
+# SGI doesn't have ranlib
+# RANLIB = echo
+
+#------------------------------------------------------------------------------
+# AMD Opteron (64 bit)
+#------------------------------------------------------------------------------
+
+# BLAS = -lgoto_opteron64 -lg2c
+# LAPACK = -llapack_opteron64
+
+# SUSE Linux 10.1, AMD Opteron
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+# LAPACK = -llapack_opteron64
+
+#------------------------------------------------------------------------------
+# remove object files and profile output
+#------------------------------------------------------------------------------
+
+CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc.mk b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc.mk
new file mode 100644
index 0000000..8f75139
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc.mk
@@ -0,0 +1,452 @@
+#===============================================================================
+# SuiteSparse_config.mk: common configuration file for the SuiteSparse
+#===============================================================================
+
+# This file contains all configuration settings for all packages authored or
+# co-authored by Tim Davis:
+#
+# Package Version Description
+# ------- ------- -----------
+# AMD 1.2 or later approximate minimum degree ordering
+# COLAMD 2.4 or later column approximate minimum degree ordering
+# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering
+# CAMD any constrained approximate minimum degree ordering
+# UMFPACK 4.5 or later sparse LU factorization, with the BLAS
+# CHOLMOD any sparse Cholesky factorization, update/downdate
+# KLU 0.8 or later sparse LU factorization, BLAS-free
+# BTF 0.8 or later permutation to block triangular form
+# LDL 1.2 or later concise sparse LDL'
+# CXSparse any extended version of CSparse (int/long, real/complex)
+# SuiteSparseQR any sparse QR factorization
+# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format
+#
+# By design, this file is NOT included in the CSparse makefile.
+# That package is fully stand-alone. CSparse is primarily for teaching;
+# production code should use CXSparse.
+#
+# The SuiteSparse_config directory and the above packages should all appear in
+# a single directory, in order for the Makefile's within each package to find
+# this file.
+#
+# To enable an option of the form "# OPTION = ...", edit this file and
+# delete the "#" in the first column of the option you wish to use.
+#
+# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with
+# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you
+# do not have a metis-4.0 directory inside the SuiteSparse directory, the
+# */Makefile's that optionally rely on METIS will automatically detect this
+# and compile without METIS.
+
+#------------------------------------------------------------------------------
+# Generic configuration
+#------------------------------------------------------------------------------
+
+# Using standard definitions from the make environment, typically:
+#
+# CC cc C compiler
+# CXX g++ C++ compiler
+# CFLAGS [ ] flags for C and C++ compiler
+# CPPFLAGS [ ] flags for C and C++ compiler
+# TARGET_ARCH [ ] target architecture
+# FFLAGS [ ] flags for Fortran compiler
+# RM rm -f delete a file
+# AR ar create a static *.a library archive
+# ARFLAGS rv flags for ar
+# MAKE make make itself (sometimes called gmake)
+#
+# You can redefine them here, but by default they are used from the
+# default make environment.
+
+# To use OpenMP add -openmp to the CFLAGS
+# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
+# as the number of cores per socket on the machine being used to maximize
+# memory performance
+ CFLAGS =
+# CFLAGS = -g
+# for the icc compiler and OpenMP:
+ CFLAGS = -openmp
+
+# C and C++ compiler flags. The first three are standard for *.c and *.cpp
+# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
+# for the MKL BLAS:
+ CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
+# with no optimization:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC
+
+# ranlib, and ar, for generating libraries. If you don't need ranlib,
+# just change it to RANLAB = echo
+RANLIB = ranlib
+ARCHIVE = $(AR) $(ARFLAGS)
+
+# copy and delete a file
+CP = cp -f
+MV = mv -f
+
+# Fortran compiler (not required for 'make' or 'make library')
+F77 = gfortran
+F77FLAGS = $(FFLAGS) -O
+F77LIB =
+
+# C and Fortran libraries. Remove -lrt if you don't have it.
+ LIB = -lm -lrt
+# Using the following requires CF = ... -DNTIMER on POSIX C systems.
+# LIB = -lm
+
+# For "make install"
+INSTALL_LIB = /usr/local/lib
+INSTALL_INCLUDE = /usr/local/include
+
+# Which version of MAKE you are using (default is "make")
+# MAKE = make
+# MAKE = gmake
+
+#------------------------------------------------------------------------------
+# BLAS and LAPACK configuration:
+#------------------------------------------------------------------------------
+
+# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK.
+# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
+# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
+# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard
+# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
+# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
+# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
+# on a 2.5Ghz dual-core AMD Opteron.
+
+# These settings will probably not work, since there is no fixed convention for
+# naming the BLAS and LAPACK library (*.a or *.so) files.
+
+# This is probably slow ... it might connect to the Standard Reference BLAS:
+# BLAS = -lblas -lgfortran
+# LAPACK = -llapack
+
+# MKL
+ BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
+ LAPACK =
+
+# ACML
+# BLAS = -lacml -lgfortran
+# LAPACK =
+
+# OpenBLAS
+# BLAS = -lopenblas
+# LAPACK =
+
+# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto.
+# Using the Goto BLAS:
+# BLAS = -lgoto -lgfortran -lgfortranbegin
+# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
+
+# Using non-optimized versions:
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack_plain
+
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack
+
+# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
+# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
+# stops the application program if an error occurs. A C version of xerbla
+# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
+# includes a Fortran-callable xerbla routine that prints nothing and does not
+# stop the application program. This is optional.
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a
+
+# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
+# use this option:
+XERBLA =
+
+# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
+# use this:
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a
+
+#------------------------------------------------------------------------------
+# GPU configuration for CHOLMOD and SPQR
+#------------------------------------------------------------------------------
+
+# no cuda
+# CUDA_ROOT =
+# GPU_BLAS_PATH =
+# GPU_CONFIG =
+# CUDA_PATH =
+# CUDART_LIB =
+# CUBLAS_LIB =
+# CUDA_INC_PATH =
+# NV20 =
+# NV30 =
+# NV35 =
+# NVCC = echo
+# NVCCFLAGS =
+
+# with cuda for CHOLMOD
+ CUDA_ROOT = /usr/local/cuda
+ GPU_BLAS_PATH = $(CUDA_ROOT)
+# with 4 cores (default):
+ GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS
+# with 10 cores:
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
+ CUDA_PATH = $(CUDA_ROOT)
+ CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so
+ CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so
+ CUDA_INC_PATH = $(CUDA_ROOT)/include/
+ NV20 = -arch=sm_20 -Xcompiler -fPIC
+ NV30 = -arch=sm_30 -Xcompiler -fPIC
+ NV35 = -arch=sm_35 -Xcompiler -fPIC
+ NVCC = $(CUDA_ROOT)/bin/nvcc
+ NVCCFLAGS = -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -Xcompiler -fPIC
+
+# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
+
+#------------------------------------------------------------------------------
+# METIS, optionally used by CHOLMOD
+#------------------------------------------------------------------------------
+
+# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
+# compile CHOLMOD with the -DNPARTITION flag.
+
+# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+# You may wish to use an absolute path. METIS is optional. Compile
+# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+METIS_PATH = ../../metis-4.0
+METIS = ../../metis-4.0/libmetis.a
+
+#------------------------------------------------------------------------------
+# UMFPACK configuration:
+#------------------------------------------------------------------------------
+
+# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details.
+#
+# -DNBLAS do not use the BLAS. UMFPACK will be very slow.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris)
+# -DNRECIPROCAL do not multiply by the reciprocal
+# -DNO_DIVIDE_BY_ZERO do not divide by zero
+# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is
+# included in UMFPACK_CONFIG, then UMFPACK does not rely on
+# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
+
+UMFPACK_CONFIG =
+
+# uncomment this line to compile UMFPACK without CHOLMOD:
+# UMFPACK_CONFIG = -DNCHOLMOD
+
+#------------------------------------------------------------------------------
+# CHOLMOD configuration
+#------------------------------------------------------------------------------
+
+# CHOLMOD Library Modules, which appear in libcholmod.a:
+# Core requires: none
+# Check requires: Core
+# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal
+# MatrixOps requires: Core
+# Modify requires: Core
+# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky
+# Supernodal requires: Core, BLAS, LAPACK
+#
+# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
+# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
+# optional: Partition
+# Valgrind same as Tcov
+# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal
+# optional: Partition
+#
+# Configuration flags:
+# -DNCHECK do not include the Check module. License GNU LGPL
+# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL
+# -DNPARTITION do not include the Partition module. License GNU LGPL
+# also do not include METIS.
+# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL
+# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library:
+# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL
+# -DNMODIFY do not include the Modify module. License GNU GPL
+# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL
+#
+# -DNPRINT do not print anything.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF for Solaris only. If defined, do not use the Sun
+# Performance Library
+
+CHOLMOD_CONFIG = $(GPU_CONFIG)
+
+# uncomment this line to compile CHOLMOD without METIS:
+# CHOLMOD_CONFIG = -DNPARTITION
+
+#------------------------------------------------------------------------------
+# SuiteSparseQR configuration:
+#------------------------------------------------------------------------------
+
+# The SuiteSparseQR library can be compiled with the following options:
+#
+# -DNPARTITION do not include the CHOLMOD partition module
+# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp
+# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
+
+# default, without timing, without TBB:
+SPQR_CONFIG = $(GPU_CONFIG)
+# with TBB:
+# SPQR_CONFIG = -DHAVE_TBB
+
+# This is needed for IBM AIX: (but not for and C codes, just C++)
+# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
+
+# with TBB, you must select this:
+# TBB = -ltbb
+# without TBB:
+TBB =
+
+#------------------------------------------------------------------------------
+# code formatting
+#------------------------------------------------------------------------------
+
+# Use "grep" only, if you do not have "indent"
+# PRETTY = grep -v "^\#"
+# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
+ PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
+
+#------------------------------------------------------------------------------
+# Linux
+#------------------------------------------------------------------------------
+
+# Using default compilers:
+# CC = gcc
+# CF = $(CFLAGS) -O3 -fexceptions
+
+# alternatives:
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
+# -funit-at-a-time
+# CF = $(CFLAGS) -O3 -fexceptions \
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+# CF = $(CFLAGS) -O3
+# CF = $(CFLAGS) -O3 -g -fexceptions
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow \
+# -Wredundant-decls -Wdisabled-optimization -ansi
+
+# consider:
+# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
+# -frename-registers -ffast-math -funroll-loops
+
+# Using the Goto BLAS:
+# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
+
+# Using Intel's icc and ifort compilers:
+# (does not work for mexFunctions unless you add a mexopts.sh file)
+# F77 = ifort
+ CC = icc
+# CF = $(CFLAGS) -O3 -xN -vec_report=0
+# CF = $(CFLAGS) -g
+
+# 64bit:
+# F77FLAGS = -O -m64
+# CF = $(CFLAGS) -O3 -fexceptions -m64
+# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
+# LAPACK = -llapack64
+
+# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+
+# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto -lgfortran
+
+#------------------------------------------------------------------------------
+# Mac
+#------------------------------------------------------------------------------
+
+# As recommended by macports, http://suitesparse.darwinports.com/
+# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
+# on my MacBook Air, and they work fine.
+
+# F77 = gfortran
+# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
+# BLAS = -framework Accelerate
+# LAPACK = -framework Accelerate
+# LIB = -lm
+
+#------------------------------------------------------------------------------
+# Solaris
+#------------------------------------------------------------------------------
+
+# 32-bit
+# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
+
+# 64-bit
+# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
+
+# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
+
+# The Sun Performance Library includes both LAPACK and the BLAS:
+# BLAS = -xlic_lib=sunperf
+# LAPACK =
+
+
+#------------------------------------------------------------------------------
+# Compaq Alpha
+#------------------------------------------------------------------------------
+
+# 64-bit mode only
+# CF = $(CFLAGS) -O2 -std1
+# BLAS = -ldxml
+# LAPACK =
+
+#------------------------------------------------------------------------------
+# IBM RS 6000
+#------------------------------------------------------------------------------
+
+# BLAS = -lessl
+# LAPACK =
+
+# 32-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384
+
+# 64-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
+
+#------------------------------------------------------------------------------
+# SGI IRIX
+#------------------------------------------------------------------------------
+
+# BLAS = -lscsl
+# LAPACK =
+
+# 32-bit mode
+# CF = $(CFLAGS) -O
+
+# 64-bit mode (32 bit int's and 64-bit long's):
+# CF = $(CFLAGS) -64
+# F77FLAGS = -64
+
+# SGI doesn't have ranlib
+# RANLIB = echo
+
+#------------------------------------------------------------------------------
+# AMD Opteron (64 bit)
+#------------------------------------------------------------------------------
+
+# BLAS = -lgoto_opteron64 -lg2c
+# LAPACK = -llapack_opteron64
+
+# SUSE Linux 10.1, AMD Opteron
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+# LAPACK = -llapack_opteron64
+
+#------------------------------------------------------------------------------
+# remove object files and profile output
+#------------------------------------------------------------------------------
+
+CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc10.mk b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc10.mk
new file mode 100644
index 0000000..8e2fde3
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc10.mk
@@ -0,0 +1,453 @@
+#===============================================================================
+# SuiteSparse_config.mk: common configuration file for the SuiteSparse
+#===============================================================================
+
+# This file contains all configuration settings for all packages authored or
+# co-authored by Tim Davis:
+#
+# Package Version Description
+# ------- ------- -----------
+# AMD 1.2 or later approximate minimum degree ordering
+# COLAMD 2.4 or later column approximate minimum degree ordering
+# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering
+# CAMD any constrained approximate minimum degree ordering
+# UMFPACK 4.5 or later sparse LU factorization, with the BLAS
+# CHOLMOD any sparse Cholesky factorization, update/downdate
+# KLU 0.8 or later sparse LU factorization, BLAS-free
+# BTF 0.8 or later permutation to block triangular form
+# LDL 1.2 or later concise sparse LDL'
+# CXSparse any extended version of CSparse (int/long, real/complex)
+# SuiteSparseQR any sparse QR factorization
+# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format
+#
+# By design, this file is NOT included in the CSparse makefile.
+# That package is fully stand-alone. CSparse is primarily for teaching;
+# production code should use CXSparse.
+#
+# The SuiteSparse_config directory and the above packages should all appear in
+# a single directory, in order for the Makefile's within each package to find
+# this file.
+#
+# To enable an option of the form "# OPTION = ...", edit this file and
+# delete the "#" in the first column of the option you wish to use.
+#
+# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with
+# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you
+# do not have a metis-4.0 directory inside the SuiteSparse directory, the
+# */Makefile's that optionally rely on METIS will automatically detect this
+# and compile without METIS.
+
+#------------------------------------------------------------------------------
+# Generic configuration
+#------------------------------------------------------------------------------
+
+# Using standard definitions from the make environment, typically:
+#
+# CC cc C compiler
+# CXX g++ C++ compiler
+# CFLAGS [ ] flags for C and C++ compiler
+# CPPFLAGS [ ] flags for C and C++ compiler
+# TARGET_ARCH [ ] target architecture
+# FFLAGS [ ] flags for Fortran compiler
+# RM rm -f delete a file
+# AR ar create a static *.a library archive
+# ARFLAGS rv flags for ar
+# MAKE make make itself (sometimes called gmake)
+#
+# You can redefine them here, but by default they are used from the
+# default make environment.
+
+# To use OpenMP add -openmp to the CFLAGS
+# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
+# as the number of cores per socket on the machine being used to maximize
+# memory performance
+ CFLAGS =
+# CFLAGS = -g
+# for the icc compiler and OpenMP:
+ CXX = icpc
+ CFLAGS = -openmp
+
+# C and C++ compiler flags. The first three are standard for *.c and *.cpp
+# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
+# for the MKL BLAS:
+ CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
+# with no optimization:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC
+
+# ranlib, and ar, for generating libraries. If you don't need ranlib,
+# just change it to RANLAB = echo
+RANLIB = ranlib
+ARCHIVE = $(AR) $(ARFLAGS)
+
+# copy and delete a file
+CP = cp -f
+MV = mv -f
+
+# Fortran compiler (not required for 'make' or 'make library')
+F77 = gfortran
+F77FLAGS = $(FFLAGS) -O
+F77LIB =
+
+# C and Fortran libraries. Remove -lrt if you don't have it.
+ LIB = -lm -lrt
+# Using the following requires CF = ... -DNTIMER on POSIX C systems.
+# LIB = -lm
+
+# For "make install"
+INSTALL_LIB = /usr/local/lib
+INSTALL_INCLUDE = /usr/local/include
+
+# Which version of MAKE you are using (default is "make")
+# MAKE = make
+# MAKE = gmake
+
+#------------------------------------------------------------------------------
+# BLAS and LAPACK configuration:
+#------------------------------------------------------------------------------
+
+# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK.
+# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
+# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
+# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard
+# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
+# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
+# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
+# on a 2.5Ghz dual-core AMD Opteron.
+
+# These settings will probably not work, since there is no fixed convention for
+# naming the BLAS and LAPACK library (*.a or *.so) files.
+
+# This is probably slow ... it might connect to the Standard Reference BLAS:
+# BLAS = -lblas -lgfortran
+# LAPACK = -llapack
+
+# MKL
+ BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
+ LAPACK =
+
+# ACML
+# BLAS = -lacml -lgfortran
+# LAPACK =
+
+# OpenBLAS
+# BLAS = -lopenblas
+# LAPACK =
+
+# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto.
+# Using the Goto BLAS:
+# BLAS = -lgoto -lgfortran -lgfortranbegin
+# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
+
+# Using non-optimized versions:
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack_plain
+
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack
+
+# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
+# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
+# stops the application program if an error occurs. A C version of xerbla
+# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
+# includes a Fortran-callable xerbla routine that prints nothing and does not
+# stop the application program. This is optional.
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a
+
+# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
+# use this option:
+XERBLA =
+
+# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
+# use this:
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a
+
+#------------------------------------------------------------------------------
+# GPU configuration for CHOLMOD and SPQR
+#------------------------------------------------------------------------------
+
+# no cuda
+# CUDA_ROOT =
+# GPU_BLAS_PATH =
+# GPU_CONFIG =
+# CUDA_PATH =
+# CUDART_LIB =
+# CUBLAS_LIB =
+# CUDA_INC_PATH =
+# NV20 =
+# NV30 =
+# NV35 =
+# NVCC = echo
+# NVCCFLAGS =
+
+# with cuda for CHOLMOD
+# CUDA_ROOT = /usr/local/cuda
+ GPU_BLAS_PATH = $(CUDA_ROOT)
+# with 4 cores (default):
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS
+# with 10 cores:
+ GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
+ CUDA_PATH = $(CUDA_ROOT)
+ CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so
+ CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so
+ CUDA_INC_PATH = $(CUDA_ROOT)/include/
+ NV20 = -arch=sm_20 -Xcompiler -fPIC
+ NV30 = -arch=sm_30 -Xcompiler -fPIC
+ NV35 = -arch=sm_35 -Xcompiler -fPIC
+ NVCC = $(CUDA_ROOT)/bin/nvcc
+ NVCCFLAGS = -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -Xcompiler -fPIC
+
+# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
+
+#------------------------------------------------------------------------------
+# METIS, optionally used by CHOLMOD
+#------------------------------------------------------------------------------
+
+# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
+# compile CHOLMOD with the -DNPARTITION flag.
+
+# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+# You may wish to use an absolute path. METIS is optional. Compile
+# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+METIS_PATH = ../../metis-4.0
+METIS = ../../metis-4.0/libmetis.a
+
+#------------------------------------------------------------------------------
+# UMFPACK configuration:
+#------------------------------------------------------------------------------
+
+# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details.
+#
+# -DNBLAS do not use the BLAS. UMFPACK will be very slow.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris)
+# -DNRECIPROCAL do not multiply by the reciprocal
+# -DNO_DIVIDE_BY_ZERO do not divide by zero
+# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is
+# included in UMFPACK_CONFIG, then UMFPACK does not rely on
+# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
+
+UMFPACK_CONFIG =
+
+# uncomment this line to compile UMFPACK without CHOLMOD:
+# UMFPACK_CONFIG = -DNCHOLMOD
+
+#------------------------------------------------------------------------------
+# CHOLMOD configuration
+#------------------------------------------------------------------------------
+
+# CHOLMOD Library Modules, which appear in libcholmod.a:
+# Core requires: none
+# Check requires: Core
+# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal
+# MatrixOps requires: Core
+# Modify requires: Core
+# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky
+# Supernodal requires: Core, BLAS, LAPACK
+#
+# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
+# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
+# optional: Partition
+# Valgrind same as Tcov
+# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal
+# optional: Partition
+#
+# Configuration flags:
+# -DNCHECK do not include the Check module. License GNU LGPL
+# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL
+# -DNPARTITION do not include the Partition module. License GNU LGPL
+# also do not include METIS.
+# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL
+# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library:
+# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL
+# -DNMODIFY do not include the Modify module. License GNU GPL
+# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL
+#
+# -DNPRINT do not print anything.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF for Solaris only. If defined, do not use the Sun
+# Performance Library
+
+CHOLMOD_CONFIG = $(GPU_CONFIG)
+
+# uncomment this line to compile CHOLMOD without METIS:
+# CHOLMOD_CONFIG = -DNPARTITION
+
+#------------------------------------------------------------------------------
+# SuiteSparseQR configuration:
+#------------------------------------------------------------------------------
+
+# The SuiteSparseQR library can be compiled with the following options:
+#
+# -DNPARTITION do not include the CHOLMOD partition module
+# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp
+# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
+
+# default, without timing, without TBB:
+SPQR_CONFIG = $(GPU_CONFIG)
+# with TBB:
+# SPQR_CONFIG = -DHAVE_TBB
+
+# This is needed for IBM AIX: (but not for and C codes, just C++)
+# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
+
+# with TBB, you must select this:
+# TBB = -ltbb
+# without TBB:
+TBB =
+
+#------------------------------------------------------------------------------
+# code formatting
+#------------------------------------------------------------------------------
+
+# Use "grep" only, if you do not have "indent"
+# PRETTY = grep -v "^\#"
+# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
+ PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
+
+#------------------------------------------------------------------------------
+# Linux
+#------------------------------------------------------------------------------
+
+# Using default compilers:
+# CC = gcc
+# CF = $(CFLAGS) -O3 -fexceptions
+
+# alternatives:
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
+# -funit-at-a-time
+# CF = $(CFLAGS) -O3 -fexceptions \
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+# CF = $(CFLAGS) -O3
+# CF = $(CFLAGS) -O3 -g -fexceptions
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow \
+# -Wredundant-decls -Wdisabled-optimization -ansi
+
+# consider:
+# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
+# -frename-registers -ffast-math -funroll-loops
+
+# Using the Goto BLAS:
+# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
+
+# Using Intel's icc and ifort compilers:
+# (does not work for mexFunctions unless you add a mexopts.sh file)
+# F77 = ifort
+ CC = icc
+# CF = $(CFLAGS) -O3 -xN -vec_report=0
+# CF = $(CFLAGS) -g
+
+# 64bit:
+# F77FLAGS = -O -m64
+# CF = $(CFLAGS) -O3 -fexceptions -m64
+# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
+# LAPACK = -llapack64
+
+# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+
+# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto -lgfortran
+
+#------------------------------------------------------------------------------
+# Mac
+#------------------------------------------------------------------------------
+
+# As recommended by macports, http://suitesparse.darwinports.com/
+# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
+# on my MacBook Air, and they work fine.
+
+# F77 = gfortran
+# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
+# BLAS = -framework Accelerate
+# LAPACK = -framework Accelerate
+# LIB = -lm
+
+#------------------------------------------------------------------------------
+# Solaris
+#------------------------------------------------------------------------------
+
+# 32-bit
+# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
+
+# 64-bit
+# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
+
+# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
+
+# The Sun Performance Library includes both LAPACK and the BLAS:
+# BLAS = -xlic_lib=sunperf
+# LAPACK =
+
+
+#------------------------------------------------------------------------------
+# Compaq Alpha
+#------------------------------------------------------------------------------
+
+# 64-bit mode only
+# CF = $(CFLAGS) -O2 -std1
+# BLAS = -ldxml
+# LAPACK =
+
+#------------------------------------------------------------------------------
+# IBM RS 6000
+#------------------------------------------------------------------------------
+
+# BLAS = -lessl
+# LAPACK =
+
+# 32-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384
+
+# 64-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
+
+#------------------------------------------------------------------------------
+# SGI IRIX
+#------------------------------------------------------------------------------
+
+# BLAS = -lscsl
+# LAPACK =
+
+# 32-bit mode
+# CF = $(CFLAGS) -O
+
+# 64-bit mode (32 bit int's and 64-bit long's):
+# CF = $(CFLAGS) -64
+# F77FLAGS = -64
+
+# SGI doesn't have ranlib
+# RANLIB = echo
+
+#------------------------------------------------------------------------------
+# AMD Opteron (64 bit)
+#------------------------------------------------------------------------------
+
+# BLAS = -lgoto_opteron64 -lg2c
+# LAPACK = -llapack_opteron64
+
+# SUSE Linux 10.1, AMD Opteron
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+# LAPACK = -llapack_opteron64
+
+#------------------------------------------------------------------------------
+# remove object files and profile output
+#------------------------------------------------------------------------------
+
+CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_Mac.mk b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_Mac.mk
new file mode 100644
index 0000000..9179819
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_Mac.mk
@@ -0,0 +1,452 @@
+#===============================================================================
+# SuiteSparse_config.mk: common configuration file for the SuiteSparse
+#===============================================================================
+
+# This file contains all configuration settings for all packages authored or
+# co-authored by Tim Davis:
+#
+# Package Version Description
+# ------- ------- -----------
+# AMD 1.2 or later approximate minimum degree ordering
+# COLAMD 2.4 or later column approximate minimum degree ordering
+# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering
+# CAMD any constrained approximate minimum degree ordering
+# UMFPACK 4.5 or later sparse LU factorization, with the BLAS
+# CHOLMOD any sparse Cholesky factorization, update/downdate
+# KLU 0.8 or later sparse LU factorization, BLAS-free
+# BTF 0.8 or later permutation to block triangular form
+# LDL 1.2 or later concise sparse LDL'
+# CXSparse any extended version of CSparse (int/long, real/complex)
+# SuiteSparseQR any sparse QR factorization
+# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format
+#
+# By design, this file is NOT included in the CSparse makefile.
+# That package is fully stand-alone. CSparse is primarily for teaching;
+# production code should use CXSparse.
+#
+# The SuiteSparse_config directory and the above packages should all appear in
+# a single directory, in order for the Makefile's within each package to find
+# this file.
+#
+# To enable an option of the form "# OPTION = ...", edit this file and
+# delete the "#" in the first column of the option you wish to use.
+#
+# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with
+# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you
+# do not have a metis-4.0 directory inside the SuiteSparse directory, the
+# */Makefile's that optionally rely on METIS will automatically detect this
+# and compile without METIS.
+
+#------------------------------------------------------------------------------
+# Generic configuration
+#------------------------------------------------------------------------------
+
+# Using standard definitions from the make environment, typically:
+#
+# CC cc C compiler
+# CXX g++ C++ compiler
+# CFLAGS [ ] flags for C and C++ compiler
+# CPPFLAGS [ ] flags for C and C++ compiler
+# TARGET_ARCH [ ] target architecture
+# FFLAGS [ ] flags for Fortran compiler
+# RM rm -f delete a file
+# AR ar create a static *.a library archive
+# ARFLAGS rv flags for ar
+# MAKE make make itself (sometimes called gmake)
+#
+# You can redefine them here, but by default they are used from the
+# default make environment.
+
+# To use OpenMP add -openmp to the CFLAGS
+# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
+# as the number of cores per socket on the machine being used to maximize
+# memory performance
+ CFLAGS =
+# CFLAGS = -g
+# for the icc compiler and OpenMP:
+# CFLAGS = -openmp
+
+# C and C++ compiler flags. The first three are standard for *.c and *.cpp
+# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+ CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
+# for the MKL BLAS:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
+# with no optimization:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC
+
+# ranlib, and ar, for generating libraries. If you don't need ranlib,
+# just change it to RANLAB = echo
+RANLIB = ranlib
+ARCHIVE = $(AR) $(ARFLAGS)
+
+# copy and delete a file
+CP = cp -f
+MV = mv -f
+
+# Fortran compiler (not required for 'make' or 'make library')
+F77 = gfortran
+F77FLAGS = $(FFLAGS) -O
+F77LIB =
+
+# C and Fortran libraries. Remove -lrt if you don't have it.
+ LIB = -lm -lrt
+# Using the following requires CF = ... -DNTIMER on POSIX C systems.
+# LIB = -lm
+
+# For "make install"
+INSTALL_LIB = /usr/local/lib
+INSTALL_INCLUDE = /usr/local/include
+
+# Which version of MAKE you are using (default is "make")
+# MAKE = make
+# MAKE = gmake
+
+#------------------------------------------------------------------------------
+# BLAS and LAPACK configuration:
+#------------------------------------------------------------------------------
+
+# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK.
+# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
+# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
+# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard
+# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
+# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
+# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
+# on a 2.5Ghz dual-core AMD Opteron.
+
+# These settings will probably not work, since there is no fixed convention for
+# naming the BLAS and LAPACK library (*.a or *.so) files.
+
+# This is probably slow ... it might connect to the Standard Reference BLAS:
+ BLAS = -lblas -lgfortran
+ LAPACK = -llapack
+
+# MKL
+# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
+# LAPACK =
+
+# ACML
+# BLAS = -lacml -lgfortran
+# LAPACK =
+
+# OpenBLAS
+# BLAS = -lopenblas
+# LAPACK =
+
+# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto.
+# Using the Goto BLAS:
+# BLAS = -lgoto -lgfortran -lgfortranbegin
+# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
+
+# Using non-optimized versions:
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack_plain
+
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack
+
+# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
+# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
+# stops the application program if an error occurs. A C version of xerbla
+# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
+# includes a Fortran-callable xerbla routine that prints nothing and does not
+# stop the application program. This is optional.
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a
+
+# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
+# use this option:
+XERBLA =
+
+# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
+# use this:
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a
+
+#------------------------------------------------------------------------------
+# GPU configuration for CHOLMOD and SPQR
+#------------------------------------------------------------------------------
+
+# no cuda
+ CUDA_ROOT =
+ GPU_BLAS_PATH =
+ GPU_CONFIG =
+ CUDA_PATH =
+ CUDART_LIB =
+ CUBLAS_LIB =
+ CUDA_INC_PATH =
+ NV20 =
+ NV30 =
+ NV35 =
+ NVCC = echo
+ NVCCFLAGS =
+
+# with cuda for CHOLMOD
+# CUDA_ROOT = /usr/local/cuda
+# GPU_BLAS_PATH = $(CUDA_ROOT)
+# with 4 cores (default):
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS
+# with 10 cores:
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
+# CUDA_PATH = $(CUDA_ROOT)
+# CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so
+# CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so
+# CUDA_INC_PATH = $(CUDA_ROOT)/include/
+# NV20 = -arch=sm_20 -Xcompiler -fPIC
+# NV30 = -arch=sm_30 -Xcompiler -fPIC
+# NV35 = -arch=sm_35 -Xcompiler -fPIC
+# NVCC = $(CUDA_ROOT)/bin/nvcc
+# NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
+
+# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
+
+#------------------------------------------------------------------------------
+# METIS, optionally used by CHOLMOD
+#------------------------------------------------------------------------------
+
+# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
+# compile CHOLMOD with the -DNPARTITION flag.
+
+# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+# You may wish to use an absolute path. METIS is optional. Compile
+# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+METIS_PATH = ../../metis-4.0
+METIS = ../../metis-4.0/libmetis.a
+
+#------------------------------------------------------------------------------
+# UMFPACK configuration:
+#------------------------------------------------------------------------------
+
+# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details.
+#
+# -DNBLAS do not use the BLAS. UMFPACK will be very slow.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris)
+# -DNRECIPROCAL do not multiply by the reciprocal
+# -DNO_DIVIDE_BY_ZERO do not divide by zero
+# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is
+# included in UMFPACK_CONFIG, then UMFPACK does not rely on
+# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
+
+UMFPACK_CONFIG =
+
+# uncomment this line to compile UMFPACK without CHOLMOD:
+# UMFPACK_CONFIG = -DNCHOLMOD
+
+#------------------------------------------------------------------------------
+# CHOLMOD configuration
+#------------------------------------------------------------------------------
+
+# CHOLMOD Library Modules, which appear in libcholmod.a:
+# Core requires: none
+# Check requires: Core
+# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal
+# MatrixOps requires: Core
+# Modify requires: Core
+# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky
+# Supernodal requires: Core, BLAS, LAPACK
+#
+# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
+# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
+# optional: Partition
+# Valgrind same as Tcov
+# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal
+# optional: Partition
+#
+# Configuration flags:
+# -DNCHECK do not include the Check module. License GNU LGPL
+# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL
+# -DNPARTITION do not include the Partition module. License GNU LGPL
+# also do not include METIS.
+# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL
+# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library:
+# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL
+# -DNMODIFY do not include the Modify module. License GNU GPL
+# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL
+#
+# -DNPRINT do not print anything.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF for Solaris only. If defined, do not use the Sun
+# Performance Library
+
+CHOLMOD_CONFIG = $(GPU_CONFIG)
+
+# uncomment this line to compile CHOLMOD without METIS:
+# CHOLMOD_CONFIG = -DNPARTITION
+
+#------------------------------------------------------------------------------
+# SuiteSparseQR configuration:
+#------------------------------------------------------------------------------
+
+# The SuiteSparseQR library can be compiled with the following options:
+#
+# -DNPARTITION do not include the CHOLMOD partition module
+# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp
+# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
+
+# default, without timing, without TBB:
+SPQR_CONFIG = $(GPU_CONFIG)
+# with TBB:
+# SPQR_CONFIG = -DHAVE_TBB
+
+# This is needed for IBM AIX: (but not for and C codes, just C++)
+# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
+
+# with TBB, you must select this:
+# TBB = -ltbb
+# without TBB:
+TBB =
+
+#------------------------------------------------------------------------------
+# code formatting
+#------------------------------------------------------------------------------
+
+# Use "grep" only, if you do not have "indent"
+ PRETTY = grep -v "^\#"
+# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
+# PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
+
+#------------------------------------------------------------------------------
+# Linux
+#------------------------------------------------------------------------------
+
+# Using default compilers:
+# CC = gcc
+# CF = $(CFLAGS) -O3 -fexceptions
+
+# alternatives:
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
+# -funit-at-a-time
+# CF = $(CFLAGS) -O3 -fexceptions \
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+# CF = $(CFLAGS) -O3
+# CF = $(CFLAGS) -O3 -g -fexceptions
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow \
+# -Wredundant-decls -Wdisabled-optimization -ansi
+
+# consider:
+# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
+# -frename-registers -ffast-math -funroll-loops
+
+# Using the Goto BLAS:
+# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
+
+# Using Intel's icc and ifort compilers:
+# (does not work for mexFunctions unless you add a mexopts.sh file)
+# F77 = ifort
+# CC = icc
+# CF = $(CFLAGS) -O3 -xN -vec_report=0
+# CF = $(CFLAGS) -g
+
+# 64bit:
+# F77FLAGS = -O -m64
+# CF = $(CFLAGS) -O3 -fexceptions -m64
+# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
+# LAPACK = -llapack64
+
+# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+
+# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto -lgfortran
+
+#------------------------------------------------------------------------------
+# Mac
+#------------------------------------------------------------------------------
+
+# As recommended by macports, http://suitesparse.darwinports.com/
+# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
+# on my MacBook Air, and they work fine.
+
+ F77 = gfortran
+ CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
+ BLAS = -framework Accelerate
+ LAPACK = -framework Accelerate
+ LIB = -lm
+
+#------------------------------------------------------------------------------
+# Solaris
+#------------------------------------------------------------------------------
+
+# 32-bit
+# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
+
+# 64-bit
+# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
+
+# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
+
+# The Sun Performance Library includes both LAPACK and the BLAS:
+# BLAS = -xlic_lib=sunperf
+# LAPACK =
+
+
+#------------------------------------------------------------------------------
+# Compaq Alpha
+#------------------------------------------------------------------------------
+
+# 64-bit mode only
+# CF = $(CFLAGS) -O2 -std1
+# BLAS = -ldxml
+# LAPACK =
+
+#------------------------------------------------------------------------------
+# IBM RS 6000
+#------------------------------------------------------------------------------
+
+# BLAS = -lessl
+# LAPACK =
+
+# 32-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384
+
+# 64-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
+
+#------------------------------------------------------------------------------
+# SGI IRIX
+#------------------------------------------------------------------------------
+
+# BLAS = -lscsl
+# LAPACK =
+
+# 32-bit mode
+# CF = $(CFLAGS) -O
+
+# 64-bit mode (32 bit int's and 64-bit long's):
+# CF = $(CFLAGS) -64
+# F77FLAGS = -64
+
+# SGI doesn't have ranlib
+# RANLIB = echo
+
+#------------------------------------------------------------------------------
+# AMD Opteron (64 bit)
+#------------------------------------------------------------------------------
+
+# BLAS = -lgoto_opteron64 -lg2c
+# LAPACK = -llapack_opteron64
+
+# SUSE Linux 10.1, AMD Opteron
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+# LAPACK = -llapack_opteron64
+
+#------------------------------------------------------------------------------
+# remove object files and profile output
+#------------------------------------------------------------------------------
+
+CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_backslash.mk b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_backslash.mk
new file mode 100644
index 0000000..3ab813c
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_backslash.mk
@@ -0,0 +1,452 @@
+#===============================================================================
+# SuiteSparse_config.mk: common configuration file for the SuiteSparse
+#===============================================================================
+
+# This file contains all configuration settings for all packages authored or
+# co-authored by Tim Davis:
+#
+# Package Version Description
+# ------- ------- -----------
+# AMD 1.2 or later approximate minimum degree ordering
+# COLAMD 2.4 or later column approximate minimum degree ordering
+# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering
+# CAMD any constrained approximate minimum degree ordering
+# UMFPACK 4.5 or later sparse LU factorization, with the BLAS
+# CHOLMOD any sparse Cholesky factorization, update/downdate
+# KLU 0.8 or later sparse LU factorization, BLAS-free
+# BTF 0.8 or later permutation to block triangular form
+# LDL 1.2 or later concise sparse LDL'
+# CXSparse any extended version of CSparse (int/long, real/complex)
+# SuiteSparseQR any sparse QR factorization
+# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format
+#
+# By design, this file is NOT included in the CSparse makefile.
+# That package is fully stand-alone. CSparse is primarily for teaching;
+# production code should use CXSparse.
+#
+# The SuiteSparse_config directory and the above packages should all appear in
+# a single directory, in order for the Makefile's within each package to find
+# this file.
+#
+# To enable an option of the form "# OPTION = ...", edit this file and
+# delete the "#" in the first column of the option you wish to use.
+#
+# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with
+# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you
+# do not have a metis-4.0 directory inside the SuiteSparse directory, the
+# */Makefile's that optionally rely on METIS will automatically detect this
+# and compile without METIS.
+
+#------------------------------------------------------------------------------
+# Generic configuration
+#------------------------------------------------------------------------------
+
+# Using standard definitions from the make environment, typically:
+#
+# CC cc C compiler
+# CXX g++ C++ compiler
+# CFLAGS [ ] flags for C and C++ compiler
+# CPPFLAGS [ ] flags for C and C++ compiler
+# TARGET_ARCH [ ] target architecture
+# FFLAGS [ ] flags for Fortran compiler
+# RM rm -f delete a file
+# AR ar create a static *.a library archive
+# ARFLAGS rv flags for ar
+# MAKE make make itself (sometimes called gmake)
+#
+# You can redefine them here, but by default they are used from the
+# default make environment.
+
+# To use OpenMP add -openmp to the CFLAGS
+# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
+# as the number of cores per socket on the machine being used to maximize
+# memory performance
+ CFLAGS =
+# CFLAGS = -g
+# for the icc compiler and OpenMP:
+# CFLAGS = -openmp
+
+# C and C++ compiler flags. The first three are standard for *.c and *.cpp
+# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+ CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
+# for the MKL BLAS:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
+# with no optimization:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC
+
+# ranlib, and ar, for generating libraries. If you don't need ranlib,
+# just change it to RANLAB = echo
+RANLIB = ranlib
+ARCHIVE = $(AR) $(ARFLAGS)
+
+# copy and delete a file
+CP = cp -f
+MV = mv -f
+
+# Fortran compiler (not required for 'make' or 'make library')
+F77 = gfortran
+F77FLAGS = $(FFLAGS) -O
+F77LIB =
+
+# C and Fortran libraries. Remove -lrt if you don't have it.
+ LIB = -lm -lrt
+# Using the following requires CF = ... -DNTIMER on POSIX C systems.
+# LIB = -lm
+
+# For "make install"
+INSTALL_LIB = /usr/local/lib
+INSTALL_INCLUDE = /usr/local/include
+
+# Which version of MAKE you are using (default is "make")
+# MAKE = make
+# MAKE = gmake
+
+#------------------------------------------------------------------------------
+# BLAS and LAPACK configuration:
+#------------------------------------------------------------------------------
+
+# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK.
+# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
+# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
+# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard
+# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
+# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
+# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
+# on a 2.5Ghz dual-core AMD Opteron.
+
+# These settings will probably not work, since there is no fixed convention for
+# naming the BLAS and LAPACK library (*.a or *.so) files.
+
+# This is probably slow ... it might connect to the Standard Reference BLAS:
+# BLAS = -lblas -lgfortran
+ LAPACK = -llapack
+
+# MKL
+# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
+# LAPACK =
+
+# ACML
+# BLAS = -lacml -lgfortran
+# LAPACK =
+
+# OpenBLAS
+ BLAS = -lopenblas
+# LAPACK =
+
+# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto.
+# Using the Goto BLAS:
+# BLAS = -lgoto -lgfortran -lgfortranbegin
+# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
+
+# Using non-optimized versions:
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack_plain
+
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack
+
+# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
+# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
+# stops the application program if an error occurs. A C version of xerbla
+# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
+# includes a Fortran-callable xerbla routine that prints nothing and does not
+# stop the application program. This is optional.
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a
+
+# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
+# use this option:
+XERBLA =
+
+# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
+# use this:
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a
+
+#------------------------------------------------------------------------------
+# GPU configuration for CHOLMOD and SPQR
+#------------------------------------------------------------------------------
+
+# no cuda
+ CUDA_ROOT =
+ GPU_BLAS_PATH =
+ GPU_CONFIG =
+ CUDA_PATH =
+ CUDART_LIB =
+ CUBLAS_LIB =
+ CUDA_INC_PATH =
+ NV20 =
+ NV30 =
+ NV35 =
+ NVCC = echo
+ NVCCFLAGS =
+
+# with cuda for CHOLMOD
+# CUDA_ROOT = /usr/local/cuda
+# GPU_BLAS_PATH = $(CUDA_ROOT)
+# with 4 cores (default):
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS
+# with 10 cores:
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
+# CUDA_PATH = $(CUDA_ROOT)
+# CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so
+# CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so
+# CUDA_INC_PATH = $(CUDA_ROOT)/include/
+# NV20 = -arch=sm_20 -Xcompiler -fPIC
+# NV30 = -arch=sm_30 -Xcompiler -fPIC
+# NV35 = -arch=sm_35 -Xcompiler -fPIC
+# NVCC = $(CUDA_ROOT)/bin/nvcc
+# NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
+
+# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
+
+#------------------------------------------------------------------------------
+# METIS, optionally used by CHOLMOD
+#------------------------------------------------------------------------------
+
+# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
+# compile CHOLMOD with the -DNPARTITION flag.
+
+# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+# You may wish to use an absolute path. METIS is optional. Compile
+# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+METIS_PATH = ../../metis-4.0
+METIS = ../../metis-4.0/libmetis.a
+
+#------------------------------------------------------------------------------
+# UMFPACK configuration:
+#------------------------------------------------------------------------------
+
+# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details.
+#
+# -DNBLAS do not use the BLAS. UMFPACK will be very slow.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris)
+# -DNRECIPROCAL do not multiply by the reciprocal
+# -DNO_DIVIDE_BY_ZERO do not divide by zero
+# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is
+# included in UMFPACK_CONFIG, then UMFPACK does not rely on
+# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
+
+UMFPACK_CONFIG =
+
+# uncomment this line to compile UMFPACK without CHOLMOD:
+# UMFPACK_CONFIG = -DNCHOLMOD
+
+#------------------------------------------------------------------------------
+# CHOLMOD configuration
+#------------------------------------------------------------------------------
+
+# CHOLMOD Library Modules, which appear in libcholmod.a:
+# Core requires: none
+# Check requires: Core
+# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal
+# MatrixOps requires: Core
+# Modify requires: Core
+# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky
+# Supernodal requires: Core, BLAS, LAPACK
+#
+# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
+# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
+# optional: Partition
+# Valgrind same as Tcov
+# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal
+# optional: Partition
+#
+# Configuration flags:
+# -DNCHECK do not include the Check module. License GNU LGPL
+# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL
+# -DNPARTITION do not include the Partition module. License GNU LGPL
+# also do not include METIS.
+# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL
+# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library:
+# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL
+# -DNMODIFY do not include the Modify module. License GNU GPL
+# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL
+#
+# -DNPRINT do not print anything.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF for Solaris only. If defined, do not use the Sun
+# Performance Library
+
+CHOLMOD_CONFIG = $(GPU_CONFIG)
+
+# uncomment this line to compile CHOLMOD without METIS:
+# CHOLMOD_CONFIG = -DNPARTITION
+
+#------------------------------------------------------------------------------
+# SuiteSparseQR configuration:
+#------------------------------------------------------------------------------
+
+# The SuiteSparseQR library can be compiled with the following options:
+#
+# -DNPARTITION do not include the CHOLMOD partition module
+# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp
+# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
+
+# default, without timing, without TBB:
+SPQR_CONFIG = $(GPU_CONFIG)
+# with TBB:
+# SPQR_CONFIG = -DHAVE_TBB
+
+# This is needed for IBM AIX: (but not for and C codes, just C++)
+# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
+
+# with TBB, you must select this:
+# TBB = -ltbb
+# without TBB:
+TBB =
+
+#------------------------------------------------------------------------------
+# code formatting
+#------------------------------------------------------------------------------
+
+# Use "grep" only, if you do not have "indent"
+# PRETTY = grep -v "^\#"
+# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
+ PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
+
+#------------------------------------------------------------------------------
+# Linux
+#------------------------------------------------------------------------------
+
+# Using default compilers:
+# CC = gcc
+# CF = $(CFLAGS) -O3 -fexceptions
+
+# alternatives:
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
+# -funit-at-a-time
+# CF = $(CFLAGS) -O3 -fexceptions \
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+# CF = $(CFLAGS) -O3
+# CF = $(CFLAGS) -O3 -g -fexceptions
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow \
+# -Wredundant-decls -Wdisabled-optimization -ansi
+
+# consider:
+# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
+# -frename-registers -ffast-math -funroll-loops
+
+# Using the Goto BLAS:
+# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
+
+# Using Intel's icc and ifort compilers:
+# (does not work for mexFunctions unless you add a mexopts.sh file)
+# F77 = ifort
+# CC = icc
+# CF = $(CFLAGS) -O3 -xN -vec_report=0
+# CF = $(CFLAGS) -g
+
+# 64bit:
+# F77FLAGS = -O -m64
+# CF = $(CFLAGS) -O3 -fexceptions -m64
+# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
+# LAPACK = -llapack64
+
+# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+
+# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto -lgfortran
+
+#------------------------------------------------------------------------------
+# Mac
+#------------------------------------------------------------------------------
+
+# As recommended by macports, http://suitesparse.darwinports.com/
+# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
+# on my MacBook Air, and they work fine.
+
+# F77 = gfortran
+# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
+# BLAS = -framework Accelerate
+# LAPACK = -framework Accelerate
+# LIB = -lm
+
+#------------------------------------------------------------------------------
+# Solaris
+#------------------------------------------------------------------------------
+
+# 32-bit
+# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
+
+# 64-bit
+# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
+
+# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
+
+# The Sun Performance Library includes both LAPACK and the BLAS:
+# BLAS = -xlic_lib=sunperf
+# LAPACK =
+
+
+#------------------------------------------------------------------------------
+# Compaq Alpha
+#------------------------------------------------------------------------------
+
+# 64-bit mode only
+# CF = $(CFLAGS) -O2 -std1
+# BLAS = -ldxml
+# LAPACK =
+
+#------------------------------------------------------------------------------
+# IBM RS 6000
+#------------------------------------------------------------------------------
+
+# BLAS = -lessl
+# LAPACK =
+
+# 32-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384
+
+# 64-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
+
+#------------------------------------------------------------------------------
+# SGI IRIX
+#------------------------------------------------------------------------------
+
+# BLAS = -lscsl
+# LAPACK =
+
+# 32-bit mode
+# CF = $(CFLAGS) -O
+
+# 64-bit mode (32 bit int's and 64-bit long's):
+# CF = $(CFLAGS) -64
+# F77FLAGS = -64
+
+# SGI doesn't have ranlib
+# RANLIB = echo
+
+#------------------------------------------------------------------------------
+# AMD Opteron (64 bit)
+#------------------------------------------------------------------------------
+
+# BLAS = -lgoto_opteron64 -lg2c
+# LAPACK = -llapack_opteron64
+
+# SUSE Linux 10.1, AMD Opteron
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+# LAPACK = -llapack_opteron64
+
+#------------------------------------------------------------------------------
+# remove object files and profile output
+#------------------------------------------------------------------------------
+
+CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_linux.mk b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_linux.mk
new file mode 100644
index 0000000..ba2da23
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config_linux.mk
@@ -0,0 +1,452 @@
+#===============================================================================
+# SuiteSparse_config.mk: common configuration file for the SuiteSparse
+#===============================================================================
+
+# This file contains all configuration settings for all packages authored or
+# co-authored by Tim Davis:
+#
+# Package Version Description
+# ------- ------- -----------
+# AMD 1.2 or later approximate minimum degree ordering
+# COLAMD 2.4 or later column approximate minimum degree ordering
+# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering
+# CAMD any constrained approximate minimum degree ordering
+# UMFPACK 4.5 or later sparse LU factorization, with the BLAS
+# CHOLMOD any sparse Cholesky factorization, update/downdate
+# KLU 0.8 or later sparse LU factorization, BLAS-free
+# BTF 0.8 or later permutation to block triangular form
+# LDL 1.2 or later concise sparse LDL'
+# CXSparse any extended version of CSparse (int/long, real/complex)
+# SuiteSparseQR any sparse QR factorization
+# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format
+#
+# By design, this file is NOT included in the CSparse makefile.
+# That package is fully stand-alone. CSparse is primarily for teaching;
+# production code should use CXSparse.
+#
+# The SuiteSparse_config directory and the above packages should all appear in
+# a single directory, in order for the Makefile's within each package to find
+# this file.
+#
+# To enable an option of the form "# OPTION = ...", edit this file and
+# delete the "#" in the first column of the option you wish to use.
+#
+# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with
+# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you
+# do not have a metis-4.0 directory inside the SuiteSparse directory, the
+# */Makefile's that optionally rely on METIS will automatically detect this
+# and compile without METIS.
+
+#------------------------------------------------------------------------------
+# Generic configuration
+#------------------------------------------------------------------------------
+
+# Using standard definitions from the make environment, typically:
+#
+# CC cc C compiler
+# CXX g++ C++ compiler
+# CFLAGS [ ] flags for C and C++ compiler
+# CPPFLAGS [ ] flags for C and C++ compiler
+# TARGET_ARCH [ ] target architecture
+# FFLAGS [ ] flags for Fortran compiler
+# RM rm -f delete a file
+# AR ar create a static *.a library archive
+# ARFLAGS rv flags for ar
+# MAKE make make itself (sometimes called gmake)
+#
+# You can redefine them here, but by default they are used from the
+# default make environment.
+
+# To use OpenMP add -openmp to the CFLAGS
+# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
+# as the number of cores per socket on the machine being used to maximize
+# memory performance
+ CFLAGS =
+# CFLAGS = -g
+# for the icc compiler and OpenMP:
+# CFLAGS = -openmp
+
+# C and C++ compiler flags. The first three are standard for *.c and *.cpp
+# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+ CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
+# for the MKL BLAS:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
+# with no optimization:
+# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC
+
+# ranlib, and ar, for generating libraries. If you don't need ranlib,
+# just change it to RANLAB = echo
+RANLIB = ranlib
+ARCHIVE = $(AR) $(ARFLAGS)
+
+# copy and delete a file
+CP = cp -f
+MV = mv -f
+
+# Fortran compiler (not required for 'make' or 'make library')
+F77 = gfortran
+F77FLAGS = $(FFLAGS) -O
+F77LIB =
+
+# C and Fortran libraries. Remove -lrt if you don't have it.
+ LIB = -lm -lrt
+# Using the following requires CF = ... -DNTIMER on POSIX C systems.
+# LIB = -lm
+
+# For "make install"
+INSTALL_LIB = /usr/local/lib
+INSTALL_INCLUDE = /usr/local/include
+
+# Which version of MAKE you are using (default is "make")
+# MAKE = make
+# MAKE = gmake
+
+#------------------------------------------------------------------------------
+# BLAS and LAPACK configuration:
+#------------------------------------------------------------------------------
+
+# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK.
+# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
+# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
+# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard
+# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
+# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
+# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
+# on a 2.5Ghz dual-core AMD Opteron.
+
+# These settings will probably not work, since there is no fixed convention for
+# naming the BLAS and LAPACK library (*.a or *.so) files.
+
+# This is probably slow ... it might connect to the Standard Reference BLAS:
+ BLAS = -lblas -lgfortran
+ LAPACK = -llapack
+
+# MKL
+# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
+# LAPACK =
+
+# ACML
+# BLAS = -lacml -lgfortran
+# LAPACK =
+
+# OpenBLAS
+# BLAS = -lopenblas
+# LAPACK =
+
+# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto.
+# Using the Goto BLAS:
+# BLAS = -lgoto -lgfortran -lgfortranbegin
+# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
+
+# Using non-optimized versions:
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack_plain
+
+# BLAS = -lblas_plain -lgfortran -lgfortranbegin
+# LAPACK = -llapack
+
+# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
+# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
+# stops the application program if an error occurs. A C version of xerbla
+# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
+# includes a Fortran-callable xerbla routine that prints nothing and does not
+# stop the application program. This is optional.
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a
+
+# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
+# use this option:
+XERBLA =
+
+# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
+# use this:
+
+# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a
+
+#------------------------------------------------------------------------------
+# GPU configuration for CHOLMOD and SPQR
+#------------------------------------------------------------------------------
+
+# no cuda
+ CUDA_ROOT =
+ GPU_BLAS_PATH =
+ GPU_CONFIG =
+ CUDA_PATH =
+ CUDART_LIB =
+ CUBLAS_LIB =
+ CUDA_INC_PATH =
+ NV20 =
+ NV30 =
+ NV35 =
+ NVCC = echo
+ NVCCFLAGS =
+
+# with cuda for CHOLMOD
+# CUDA_ROOT = /usr/local/cuda
+# GPU_BLAS_PATH = $(CUDA_ROOT)
+# with 4 cores (default):
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS
+# with 10 cores:
+# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
+# CUDA_PATH = $(CUDA_ROOT)
+# CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so
+# CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so
+# CUDA_INC_PATH = $(CUDA_ROOT)/include/
+# NV20 = -arch=sm_20 -Xcompiler -fPIC
+# NV30 = -arch=sm_30 -Xcompiler -fPIC
+# NV35 = -arch=sm_35 -Xcompiler -fPIC
+# NVCC = $(CUDA_ROOT)/bin/nvcc
+# NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
+
+# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
+
+#------------------------------------------------------------------------------
+# METIS, optionally used by CHOLMOD
+#------------------------------------------------------------------------------
+
+# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
+# compile CHOLMOD with the -DNPARTITION flag.
+
+# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+# You may wish to use an absolute path. METIS is optional. Compile
+# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+METIS_PATH = ../../metis-4.0
+METIS = ../../metis-4.0/libmetis.a
+
+#------------------------------------------------------------------------------
+# UMFPACK configuration:
+#------------------------------------------------------------------------------
+
+# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details.
+#
+# -DNBLAS do not use the BLAS. UMFPACK will be very slow.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris)
+# -DNRECIPROCAL do not multiply by the reciprocal
+# -DNO_DIVIDE_BY_ZERO do not divide by zero
+# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is
+# included in UMFPACK_CONFIG, then UMFPACK does not rely on
+# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
+
+UMFPACK_CONFIG =
+
+# uncomment this line to compile UMFPACK without CHOLMOD:
+# UMFPACK_CONFIG = -DNCHOLMOD
+
+#------------------------------------------------------------------------------
+# CHOLMOD configuration
+#------------------------------------------------------------------------------
+
+# CHOLMOD Library Modules, which appear in libcholmod.a:
+# Core requires: none
+# Check requires: Core
+# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal
+# MatrixOps requires: Core
+# Modify requires: Core
+# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky
+# Supernodal requires: Core, BLAS, LAPACK
+#
+# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
+# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
+# optional: Partition
+# Valgrind same as Tcov
+# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal
+# optional: Partition
+#
+# Configuration flags:
+# -DNCHECK do not include the Check module. License GNU LGPL
+# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL
+# -DNPARTITION do not include the Partition module. License GNU LGPL
+# also do not include METIS.
+# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL
+# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library:
+# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL
+# -DNMODIFY do not include the Modify module. License GNU GPL
+# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL
+#
+# -DNPRINT do not print anything.
+# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
+# LAPACK and the BLAS (defaults to 'int')
+# -DNSUNPERF for Solaris only. If defined, do not use the Sun
+# Performance Library
+
+CHOLMOD_CONFIG = $(GPU_CONFIG)
+
+# uncomment this line to compile CHOLMOD without METIS:
+# CHOLMOD_CONFIG = -DNPARTITION
+
+#------------------------------------------------------------------------------
+# SuiteSparseQR configuration:
+#------------------------------------------------------------------------------
+
+# The SuiteSparseQR library can be compiled with the following options:
+#
+# -DNPARTITION do not include the CHOLMOD partition module
+# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp
+# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
+
+# default, without timing, without TBB:
+SPQR_CONFIG = $(GPU_CONFIG)
+# with TBB:
+# SPQR_CONFIG = -DHAVE_TBB
+
+# This is needed for IBM AIX: (but not for and C codes, just C++)
+# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
+
+# with TBB, you must select this:
+# TBB = -ltbb
+# without TBB:
+TBB =
+
+#------------------------------------------------------------------------------
+# code formatting
+#------------------------------------------------------------------------------
+
+# Use "grep" only, if you do not have "indent"
+# PRETTY = grep -v "^\#"
+# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
+ PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
+
+#------------------------------------------------------------------------------
+# Linux
+#------------------------------------------------------------------------------
+
+# Using default compilers:
+# CC = gcc
+# CF = $(CFLAGS) -O3 -fexceptions
+
+# alternatives:
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
+# -funit-at-a-time
+# CF = $(CFLAGS) -O3 -fexceptions \
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+# CF = $(CFLAGS) -O3
+# CF = $(CFLAGS) -O3 -g -fexceptions
+# CF = $(CFLAGS) -g -fexceptions \
+# -Wall -W -Wshadow \
+# -Wredundant-decls -Wdisabled-optimization -ansi
+
+# consider:
+# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
+# -frename-registers -ffast-math -funroll-loops
+
+# Using the Goto BLAS:
+# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
+
+# Using Intel's icc and ifort compilers:
+# (does not work for mexFunctions unless you add a mexopts.sh file)
+# F77 = ifort
+# CC = icc
+# CF = $(CFLAGS) -O3 -xN -vec_report=0
+# CF = $(CFLAGS) -g
+
+# 64bit:
+# F77FLAGS = -O -m64
+# CF = $(CFLAGS) -O3 -fexceptions -m64
+# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
+# LAPACK = -llapack64
+
+# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+
+# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
+# F77 = gfortran
+# BLAS = -lgoto -lgfortran
+
+#------------------------------------------------------------------------------
+# Mac
+#------------------------------------------------------------------------------
+
+# As recommended by macports, http://suitesparse.darwinports.com/
+# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
+# on my MacBook Air, and they work fine.
+
+# F77 = gfortran
+# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
+# BLAS = -framework Accelerate
+# LAPACK = -framework Accelerate
+# LIB = -lm
+
+#------------------------------------------------------------------------------
+# Solaris
+#------------------------------------------------------------------------------
+
+# 32-bit
+# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
+
+# 64-bit
+# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
+
+# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
+
+# The Sun Performance Library includes both LAPACK and the BLAS:
+# BLAS = -xlic_lib=sunperf
+# LAPACK =
+
+
+#------------------------------------------------------------------------------
+# Compaq Alpha
+#------------------------------------------------------------------------------
+
+# 64-bit mode only
+# CF = $(CFLAGS) -O2 -std1
+# BLAS = -ldxml
+# LAPACK =
+
+#------------------------------------------------------------------------------
+# IBM RS 6000
+#------------------------------------------------------------------------------
+
+# BLAS = -lessl
+# LAPACK =
+
+# 32-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384
+
+# 64-bit mode:
+# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
+# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
+
+#------------------------------------------------------------------------------
+# SGI IRIX
+#------------------------------------------------------------------------------
+
+# BLAS = -lscsl
+# LAPACK =
+
+# 32-bit mode
+# CF = $(CFLAGS) -O
+
+# 64-bit mode (32 bit int's and 64-bit long's):
+# CF = $(CFLAGS) -64
+# F77FLAGS = -64
+
+# SGI doesn't have ranlib
+# RANLIB = echo
+
+#------------------------------------------------------------------------------
+# AMD Opteron (64 bit)
+#------------------------------------------------------------------------------
+
+# BLAS = -lgoto_opteron64 -lg2c
+# LAPACK = -llapack_opteron64
+
+# SUSE Linux 10.1, AMD Opteron
+# F77 = gfortran
+# BLAS = -lgoto_opteron64 -lgfortran
+# LAPACK = -llapack_opteron64
+
+#------------------------------------------------------------------------------
+# remove object files and profile output
+#------------------------------------------------------------------------------
+
+CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/src/C/SuiteSparse/SuiteSparse_config/xerbla/Makefile b/src/C/SuiteSparse/SuiteSparse_config/xerbla/Makefile
new file mode 100644
index 0000000..9de7330
--- /dev/null
+++ b/src/C/SuiteSparse/SuiteSparse_config/xerbla/Makefile
@@ -0,0 +1,33 @@
+# Makefile for null-output xerbla
+
+default: ccode
+
+include ../SuiteSparse_config.mk
+
+ccode: libcerbla.a
+
+fortran: libxerbla.a
+
+all: libxerbla.a libcerbla.a
+
+# Fortran version:
+libxerbla.a: xerbla.f
+ $(F77) $(F77FLAGS) -c xerbla.f
+ $(ARCHIVE) libxerbla.a xerbla.o
+ - $(RANLIB) libxerbla.a
+ - $(RM) xerbla.o
+
+# C version:
+libcerbla.a: xerbla.c xerbla.h
+ $(CC) $(CF) -c xerbla.c
+ $(ARCHIVE) libcerbla.a xerbla.o
+ - $(RANLIB) libcerbla.a
+ - $(RM) xerbla.o
+
+distclean: purge
+
+purge: clean
+ - $(RM) *.o *.a
+
+clean:
+ - $(RM) $(CLEAN)
diff --git a/src/C/SuiteSparse/UFconfig/xerbla/xerbla.c b/src/C/SuiteSparse/SuiteSparse_config/xerbla/xerbla.c
similarity index 100%
rename from src/C/SuiteSparse/UFconfig/xerbla/xerbla.c
rename to src/C/SuiteSparse/SuiteSparse_config/xerbla/xerbla.c
diff --git a/src/C/SuiteSparse/UFconfig/xerbla/xerbla.f b/src/C/SuiteSparse/SuiteSparse_config/xerbla/xerbla.f
similarity index 100%
rename from src/C/SuiteSparse/UFconfig/xerbla/xerbla.f
rename to src/C/SuiteSparse/SuiteSparse_config/xerbla/xerbla.f
diff --git a/src/C/SuiteSparse/UFconfig/xerbla/xerbla.h b/src/C/SuiteSparse/SuiteSparse_config/xerbla/xerbla.h
similarity index 100%
rename from src/C/SuiteSparse/UFconfig/xerbla/xerbla.h
rename to src/C/SuiteSparse/SuiteSparse_config/xerbla/xerbla.h
diff --git a/src/C/SuiteSparse/UFconfig/README.txt b/src/C/SuiteSparse/UFconfig/README.txt
deleted file mode 100644
index d9edc23..0000000
--- a/src/C/SuiteSparse/UFconfig/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-UFconfig contains configuration settings for all many of the software packages
-that I develop or co-author. Note that older versions of some of these packages
-do not require UFconfig.
-
- Package Description
- ------- -----------
- AMD approximate minimum degree ordering
- CAMD constrained AMD
- COLAMD column approximate minimum degree ordering
- CCOLAMD constrained approximate minimum degree ordering
- UMFPACK sparse LU factorization, with the BLAS
- CXSparse int/long/real/complex version of CSparse
- CHOLMOD sparse Cholesky factorization, update/downdate
- KLU sparse LU factorization, BLAS-free
- BTF permutation to block triangular form
- LDL concise sparse LDL'
- LPDASA LP Dual Active Set Algorithm
- SuiteSparseQR sparse QR factorization
-
-UFconfig is not required by:
-
- CSparse a Concise Sparse matrix package
- RBio read/write files in Rutherford/Boeing format
- UFcollection tools for managing the UF Sparse Matrix Collection
- LINFACTOR simple m-file to show how to use LU and CHOL to solve Ax=b
- MESHND 2D and 3D mesh generation and nested dissection ordering
- MATLAB_Tools misc collection of m-files
- SSMULT sparse matrix times sparse matrix, for use in MATLAB
-
-In addition, the xerbla/ directory contains Fortan and C versions of the
-BLAS/LAPACK xerbla routine, which is called when an invalid input is passed to
-the BLAS or LAPACK. The xerbla provided here does not print any message, so
-the entire Fortran I/O library does not need to be linked into a C application.
-Most versions of the BLAS contain xerbla, but those from K. Goto do not. Use
-this if you need too.
diff --git a/src/C/SuiteSparse/UFconfig/UFconfig.h b/src/C/SuiteSparse/UFconfig/UFconfig.h
deleted file mode 100644
index 7b5e79e..0000000
--- a/src/C/SuiteSparse/UFconfig/UFconfig.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ========================================================================== */
-/* === UFconfig.h =========================================================== */
-/* ========================================================================== */
-
-/* Configuration file for SuiteSparse: a Suite of Sparse matrix packages
- * (AMD, COLAMD, CCOLAMD, CAMD, CHOLMOD, UMFPACK, CXSparse, and others).
- *
- * UFconfig.h provides the definition of the long integer. On most systems,
- * a C program can be compiled in LP64 mode, in which long's and pointers are
- * both 64-bits, and int's are 32-bits. Windows 64, however, uses the LLP64
- * model, in which int's and long's are 32-bits, and long long's and pointers
- * are 64-bits.
- *
- * SuiteSparse packages that include long integer versions are
- * intended for the LP64 mode. However, as a workaround for Windows 64
- * (and perhaps other systems), the long integer can be redefined.
- *
- * If _WIN64 is defined, then the __int64 type is used instead of long.
- *
- * The long integer can also be defined at compile time. For example, this
- * could be added to UFconfig.mk:
- *
- * CFLAGS = -O -D'UF_long=long long' -D'UF_long_max=9223372036854775801' \
- * -D'UF_long_id="%lld"'
- *
- * This file defines UF_long as either long (on all but _WIN64) or
- * __int64 on Windows 64. The intent is that a UF_long is always a 64-bit
- * integer in a 64-bit code. ptrdiff_t might be a better choice than long;
- * it is always the same size as a pointer.
- *
- * This file also defines the SUITESPARSE_VERSION and related definitions.
- *
- * Copyright (c) 2007, University of Florida. No licensing restrictions
- * apply to this file or to the UFconfig directory. Author: Timothy A. Davis.
- */
-
-#ifndef _UFCONFIG_H
-#define _UFCONFIG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <limits.h>
-
-/* ========================================================================== */
-/* === UF_long ============================================================== */
-/* ========================================================================== */
-
-#ifndef UF_long
-
-#ifdef _WIN64
-
-#define UF_long __int64
-#define UF_long_max _I64_MAX
-#define UF_long_id "%I64d"
-
-#else
-
-#define UF_long long
-#define UF_long_max LONG_MAX
-#define UF_long_id "%ld"
-
-#endif
-#endif
-
-/* ========================================================================== */
-/* === SuiteSparse version ================================================== */
-/* ========================================================================== */
-
-/* SuiteSparse is not a package itself, but a collection of packages, some of
- * which must be used together (UMFPACK requires AMD, CHOLMOD requires AMD,
- * COLAMD, CAMD, and CCOLAMD, etc). A version number is provided here for the
- * collection itself. The versions of packages within each version of
- * SuiteSparse are meant to work together. Combining one packge from one
- * version of SuiteSparse, with another package from another version of
- * SuiteSparse, may or may not work.
- *
- * SuiteSparse Version 3.4.0 contains the following packages:
- *
- * AMD version 2.2.0
- * CAMD version 2.2.0
- * COLAMD version 2.7.1
- * CCOLAMD version 2.7.1
- * CHOLMOD version 1.7.1
- * CSparse version 2.2.3
- * CXSparse version 2.2.3
- * KLU version 1.1.0
- * BTF version 1.1.0
- * LDL version 2.0.1
- * UFconfig version number is the same as SuiteSparse
- * UMFPACK version 5.4.0
- * RBio version 1.1.2
- * UFcollection version 1.2.0
- * LINFACTOR version 1.1.0
- * MESHND version 1.1.1
- * SSMULT version 2.0.0
- * MATLAB_Tools no specific version number
- * SuiteSparseQR version 1.1.2
- *
- * Other package dependencies:
- * BLAS required by CHOLMOD and UMFPACK
- * LAPACK required by CHOLMOD
- * METIS 4.0.1 required by CHOLMOD (optional) and KLU (optional)
- */
-
-#define SUITESPARSE_DATE "May 20, 2009"
-#define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub))
-#define SUITESPARSE_MAIN_VERSION 3
-#define SUITESPARSE_SUB_VERSION 4
-#define SUITESPARSE_SUBSUB_VERSION 0
-#define SUITESPARSE_VERSION \
- SUITESPARSE_VER_CODE(SUITESPARSE_MAIN_VERSION,SUITESPARSE_SUB_VERSION)
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/C/SuiteSparse/UFconfig/UFconfig.mk b/src/C/SuiteSparse/UFconfig/UFconfig.mk
deleted file mode 100644
index bda4c7b..0000000
--- a/src/C/SuiteSparse/UFconfig/UFconfig.mk
+++ /dev/null
@@ -1,354 +0,0 @@
-#===============================================================================
-# UFconfig.mk: common configuration file for the SuiteSparse
-#===============================================================================
-
-# This file contains all configuration settings for all packages authored or
-# co-authored by Tim Davis at the University of Florida:
-#
-# Package Version Description
-# ------- ------- -----------
-# AMD 1.2 or later approximate minimum degree ordering
-# COLAMD 2.4 or later column approximate minimum degree ordering
-# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering
-# CAMD any constrained approximate minimum degree ordering
-# UMFPACK 4.5 or later sparse LU factorization, with the BLAS
-# CHOLMOD any sparse Cholesky factorization, update/downdate
-# KLU 0.8 or later sparse LU factorization, BLAS-free
-# BTF 0.8 or later permutation to block triangular form
-# LDL 1.2 or later concise sparse LDL'
-# LPDASA any linear program solve (dual active set algorithm)
-# CXSparse any extended version of CSparse (int/long, real/complex)
-# SuiteSparseQR any sparse QR factorization
-#
-# The UFconfig directory and the above packages should all appear in a single
-# directory, in order for the Makefile's within each package to find this file.
-#
-# To enable an option of the form "# OPTION = ...", edit this file and
-# delete the "#" in the first column of the option you wish to use.
-
-#------------------------------------------------------------------------------
-# Generic configuration
-#------------------------------------------------------------------------------
-
-# C compiler and compiler flags: These will normally not give you optimal
-# performance. You should select the optimization parameters that are best
-# for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example.
-CC = cc
-# CFLAGS = -O (for example; see below for details)
-
-# C++ compiler (also uses CFLAGS)
-CPLUSPLUS = g++
-
-# ranlib, and ar, for generating libraries
-RANLIB = ranlib
-AR = ar cr
-
-# delete and rename a file
-RM = rm -f
-MV = mv -f
-
-# Fortran compiler (not normally required)
-F77 = f77
-F77FLAGS = -O
-F77LIB =
-
-# C and Fortran libraries
-LIB = -lm
-
-# For compiling MATLAB mexFunctions (MATLAB 7.5 or later)
-MEX = mex -O -largeArrayDims -lmwlapack -lmwblas
-
-# For compiling MATLAB mexFunctions (MATLAB 7.3 and 7.4)
-# MEX = mex -O -largeArrayDims -lmwlapack
-
-# For MATLAB 7.2 or earlier, you must use one of these options:
-# MEX = mex -O -lmwlapack
-# MEX = mex -O
-
-# Which version of MAKE you are using (default is "make")
-# MAKE = make
-# MAKE = gmake
-
-#------------------------------------------------------------------------------
-# BLAS and LAPACK configuration:
-#------------------------------------------------------------------------------
-
-# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK.
-# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
-# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
-# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard
-# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
-# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
-# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
-# on a 2.5Ghz dual-core AMD Opteron.
-
-# These settings will probably not work, since there is no fixed convention for
-# naming the BLAS and LAPACK library (*.a or *.so) files.
-
-# Using the Goto BLAS:
-# BLAS = -lgoto -lgfortran -lgfortranbegin -lg2c
-
-# This is probably slow ... it might connect to the Standard Reference BLAS:
-BLAS = -lblas -lgfortran -lgfortranbegin -lg2c
-LAPACK = -llapack
-
-# Using non-optimized versions:
-# BLAS = -lblas_plain -lgfortran -lgfortranbegin -lg2c
-# LAPACK = -llapack_plain
-
-# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
-# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
-# stops the application program if an error occurs. A C version of xerbla
-# distributed with this software (UFconfig/xerbla/libcerbla.a) includes a
-# Fortran-callable xerbla routine that prints nothing and does not stop the
-# application program. This is optional.
-# XERBLA = ../../UFconfig/xerbla/libcerbla.a
-
-# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
-# use this option:
-XERBLA =
-
-# If you wish to use the Fortran UFconfig/xerbla/xerbla.f instead, use this:
-# XERBLA = ../../UFconfig/xerbla/libxerbla.a
-
-#------------------------------------------------------------------------------
-# METIS, optionally used by CHOLMOD
-#------------------------------------------------------------------------------
-
-# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
-# compile CHOLMOD with the -DNPARTITION flag. You must also use the
-# "METIS =" option, below.
-
-# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
-# You may wish to use an absolute path. METIS is optional. Compile
-# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-METIS_PATH = ../../metis-4.0
-METIS = ../../metis-4.0/libmetis.a
-
-# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
-# options:
-# METIS_PATH =
-# METIS =
-
-#------------------------------------------------------------------------------
-# UMFPACK configuration:
-#------------------------------------------------------------------------------
-
-# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details.
-#
-# -DNBLAS do not use the BLAS. UMFPACK will be very slow.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-# LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris)
-# -DNPOSIX do not use POSIX routines sysconf and times.
-# -DGETRUSAGE use getrusage
-# -DNO_TIMER do not use any timing routines
-# -DNRECIPROCAL do not multiply by the reciprocal
-# -DNO_DIVIDE_BY_ZERO do not divide by zero
-
-UMFPACK_CONFIG =
-
-#------------------------------------------------------------------------------
-# CHOLMOD configuration
-#------------------------------------------------------------------------------
-
-# CHOLMOD Library Modules, which appear in libcholmod.a:
-# Core requires: none
-# Check requires: Core
-# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal
-# MatrixOps requires: Core
-# Modify requires: Core
-# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky
-# Supernodal requires: Core, BLAS, LAPACK
-#
-# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
-# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
-# optional: Partition
-# Valgrind same as Tcov
-# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal
-# optional: Partition
-#
-# Configuration flags:
-# -DNCHECK do not include the Check module. License GNU LGPL
-# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL
-# -DNPARTITION do not include the Partition module. License GNU LGPL
-# also do not include METIS.
-# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library:
-# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL
-# -DNMODIFY do not include the Modify module. License GNU GPL
-# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL
-#
-# -DNPRINT do not print anything.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-# LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF for Solaris only. If defined, do not use the Sun
-# Performance Library
-
-CHOLMOD_CONFIG =
-
-#------------------------------------------------------------------------------
-# SuiteSparseQR configuration:
-#------------------------------------------------------------------------------
-
-# The SuiteSparseQR library can be compiled with the following options:
-#
-# -DNPARTITION do not include the CHOLMOD partition module
-# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp
-# -DTIMING enable timing and flop counts
-# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
-
-# default, without timing, without TBB:
-SPQR_CONFIG =
-# with timing and TBB:
-# SPQR_CONFIG = -DTIMING -DHAVE_TBB
-# with timing
-# SPQR_CONFIG = -DTIMING
-
-# with TBB, you must select this:
-# TBB = -ltbb
-# without TBB:
-TBB =
-
-# with timing, you must include the timing library:
-# RTLIB = -lrt
-# without timing
-RTLIB =
-
-#------------------------------------------------------------------------------
-# Linux
-#------------------------------------------------------------------------------
-
-# Using default compilers:
-# CC = gcc
-CFLAGS = -O3 -fexceptions
-
-# alternatives:
-# CFLAGS = -g -fexceptions \
- -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
- -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
-# CFLAGS = -O3 -fexceptions \
- -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
- -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
-# CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-# CFLAGS = -O3
-# CFLAGS = -O3 -g -fexceptions
-# CFLAGS = -g -fexceptions \
- -Wall -W -Wshadow \
- -Wredundant-decls -Wdisabled-optimization -ansi
-
-# consider:
-# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
-# -frename-registers -ffast-math -funroll-loops
-
-# Using the Goto BLAS:
-# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
-
-# Using Intel's icc and ifort compilers:
-# (does not work for mexFunctions unless you add a mexopts.sh file)
-# F77 = ifort
-# CC = icc
-# CFLAGS = -O3 -xN -vec_report=0
-# CFLAGS = -g
-# old (broken): CFLAGS = -ansi -O3 -ip -tpp7 -xW -vec_report0
-
-# 64bit:
-# F77FLAGS = -O -m64
-# CFLAGS = -O3 -fexceptions -m64
-# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
-# LAPACK = -llapack64
-
-
-# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-
-# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto -lgfortran
-
-#------------------------------------------------------------------------------
-# Solaris
-#------------------------------------------------------------------------------
-
-# 32-bit
-# CFLAGS = -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
-
-# 64-bit
-# CFLAGS = -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
-
-# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
-
-# The Sun Performance Library includes both LAPACK and the BLAS:
-# BLAS = -xlic_lib=sunperf
-# LAPACK =
-
-
-#------------------------------------------------------------------------------
-# Compaq Alpha
-#------------------------------------------------------------------------------
-
-# 64-bit mode only
-# CFLAGS = -O2 -std1
-# BLAS = -ldxml
-# LAPACK =
-
-#------------------------------------------------------------------------------
-# Macintosh
-#------------------------------------------------------------------------------
-
-# CC = gcc
-# CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
-# LIB = -lstdc++
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
-
-#------------------------------------------------------------------------------
-# IBM RS 6000
-#------------------------------------------------------------------------------
-
-# BLAS = -lessl
-# LAPACK =
-
-# 32-bit mode:
-# CFLAGS = -O4 -qipa -qmaxmem=16384 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384
-
-# 64-bit mode:
-# CFLAGS = -O4 -qipa -qmaxmem=16384 -q64 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
-# AR = ar -X64
-
-#------------------------------------------------------------------------------
-# SGI IRIX
-#------------------------------------------------------------------------------
-
-# BLAS = -lscsl
-# LAPACK =
-
-# 32-bit mode
-# CFLAGS = -O
-
-# 64-bit mode (32 bit int's and 64-bit long's):
-# CFLAGS = -64
-# F77FLAGS = -64
-
-# SGI doesn't have ranlib
-# RANLIB = echo
-
-#------------------------------------------------------------------------------
-# AMD Opteron (64 bit)
-#------------------------------------------------------------------------------
-
-# BLAS = -lgoto_opteron64 -lg2c
-# LAPACK = -llapack_opteron64
-
-# SUSE Linux 10.1, AMD Opteron
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-# LAPACK = -llapack_opteron64
-
-#------------------------------------------------------------------------------
-# remove object files and profile output
-#------------------------------------------------------------------------------
-
-CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/src/C/SuiteSparse/UFconfig/xerbla/Makefile b/src/C/SuiteSparse/UFconfig/xerbla/Makefile
deleted file mode 100644
index 7eb2d58..0000000
--- a/src/C/SuiteSparse/UFconfig/xerbla/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Makefile for null-output xerbla
-
-default: ccode
-
-include ../UFconfig.mk
-
-ccode: libcerbla.a
-
-fortran: libxerbla.a
-
-all: libxerbla.a libcerbla.a
-
-# Fortran version:
-libxerbla.a: xerbla.f
- $(F77) $(F77FLAGS) -c xerbla.f
- $(AR) libxerbla.a xerbla.o
- - $(RM) xerbla.o
-
-# C version:
-libcerbla.a: xerbla.c xerbla.h
- $(CC) $(CFLAGS) -c xerbla.c
- $(AR) libcerbla.a xerbla.o
- - $(RM) xerbla.o
-
-distclean: purge
-
-purge: clean
- - $(RM) *.o *.a
-
-clean:
- - $(RM) $(CLEAN)
diff --git a/src/C/SuiteSparse/UMFPACK/Doc/ChangeLog b/src/C/SuiteSparse/UMFPACK/Doc/ChangeLog
index fab719a..5736af7 100644
--- a/src/C/SuiteSparse/UMFPACK/Doc/ChangeLog
+++ b/src/C/SuiteSparse/UMFPACK/Doc/ChangeLog
@@ -1,3 +1,50 @@
+Oct 10, 2014: version 5.7.1
+
+ modified MATLAB/umfpack_make.m. No change to C code except version number.
+
+July 31, 2013: version 5.7.0
+
+ * changed malloc, printf, hypot and divcomplex pointers to use
+ SuiteSparse_config
+
+April 25, 2013: version 5.6.2
+
+ * bug fix in Demo/Makefile for Fortran interface
+
+Jun 20, 2012: verison 5.6.1
+
+ * minor update for Windows (removed filesep)
+
+Jun 1, 2012: version 5.6.0
+
+ * UFconfig replaced with SuiteSparse_config
+ * -DNO_TIMER option removed. See SuiteSparse_config to configure the timer.
+
+Dec 7, 2011, version 5.5.2
+
+ * fixed the Makefile to better align with CFLAGS and other standards
+ * minor fix to umfpack_make.m
+ * Makefile now detects whether or not METIS is present, and
+ sets -DNPARTITION if it is not
+
+Jan 25, 2011, version 5.5.1
+
+ * minor fix to "make install"
+ * Demo/Makefile updated, to allow for METIS to be in a non-default path
+
+Nov 30, 2009, version 5.5.0
+
+ * changed and simplified how UMFPACK connects to 64-bit BLAS
+ * added user-ordering function option (umfpack_*_fsymbolic)
+ * added interface to CHOLMOD's ordering methods (METIS, in particular)
+ * added an option to disable the search for singletons. Disabling this
+ search for singletons can slow UMFPACK down quite a bit for some
+ matrices, but it does ensure that L is well-conditioned and that
+ any ill-conditioning of A is captured only in U.
+ * removed UMFPACK/MATLAB/GNUmakefile and UMFPACK/MATLAB/Makefile;
+ to compile the UMFPACK mexFunction, use umfpack_make.m in MATLAB.
+ * added "make install" and "make uninstall"
+
May 20, 2009, version 5.4.0
* bug fix in umfpack_make.m for Windows
diff --git a/src/C/SuiteSparse/UMFPACK/Doc/License b/src/C/SuiteSparse/UMFPACK/Doc/License
index 085bf62..d29de06 100644
--- a/src/C/SuiteSparse/UMFPACK/Doc/License
+++ b/src/C/SuiteSparse/UMFPACK/Doc/License
@@ -1,4 +1,4 @@
-UMFPACK Version 5.2.0, Copyright 1995-2007 by Timothy A. Davis.
+UMFPACK, Copyright 1995-2009 by Timothy A. Davis.
All Rights Reserved.
UMFPACK is available under alternate licenses, contact T. Davis for details.
@@ -34,5 +34,5 @@ UMFPACK License:
Availability:
- http://www.cise.ufl.edu/research/sparse/umfpack
+ http://www.suitesparse.com
diff --git a/src/C/SuiteSparse/UMFPACK/Doc/Makefile b/src/C/SuiteSparse/UMFPACK/Doc/Makefile
index 41cf07e..6b93e0f 100644
--- a/src/C/SuiteSparse/UMFPACK/Doc/Makefile
+++ b/src/C/SuiteSparse/UMFPACK/Doc/Makefile
@@ -7,7 +7,7 @@
default: dist
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
#-------------------------------------------------------------------------------
# Remove all but the files in the original distribution
diff --git a/src/C/SuiteSparse/UMFPACK/Doc/QuickStart.tex b/src/C/SuiteSparse/UMFPACK/Doc/QuickStart.tex
index 5be3214..ce4abba 100644
--- a/src/C/SuiteSparse/UMFPACK/Doc/QuickStart.tex
+++ b/src/C/SuiteSparse/UMFPACK/Doc/QuickStart.tex
@@ -8,7 +8,7 @@
\newcommand{\tr}{^{\sf T}} % transpose
\topmargin 0in
-\textheight 9in
+\textheight 8.5in
\oddsidemargin 0pt
\evensidemargin 0pt
\textwidth 6.5in
@@ -16,10 +16,9 @@
\begin{document}
\author{Timothy A. Davis \\
-Dept. of Computer and Information Science and Engineering \\
-Univ. of Florida, Gainesville, FL}
-\title{UMFPACK Version 5.4.0 Quick Start Guide}
-\date{May 20, 2009}
+DrTimothyAldenDavis at gmail.com, http://www.suitesparse.com}
+\title{UMFPACK Quick Start Guide}
+\date{VERSION 5.7.1, Oct 10, 2014}
\maketitle
%-------------------------------------------------------------------------------
@@ -35,10 +34,9 @@ Univ. of Florida, Gainesville, FL}
\end{abstract}
%-------------------------------------------------------------------------------
-Copyright\copyright 1995-2009 by Timothy A. Davis.
+Copyright\copyright 1995-2013 by Timothy A. Davis.
All Rights Reserved. Refer to the UMFPACK User Guide
-for the License. See \newline
-http://www.cise.ufl.edu/research/sparse/umfpack
+for the License. See http://www.suitesparse.com
for the code and full documentation.
%-------------------------------------------------------------------------------
@@ -234,21 +232,26 @@ for more details.
\label{Install}
%-------------------------------------------------------------------------------
-You will need to install AMD v2.2 to use UMFPACK.
-Note that this version of UMFPACK cannot use AMD v1.2 or earlier.
+You will need to install both UMFPACK and AMD to use UMFPACK.
The {\tt UMFPACK} and {\tt AMD} subdirectories must be placed side-by-side
within the same parent directory. AMD is a stand-alone package that
is required by UMFPACK. UMFPACK can be compiled without the
-BLAS but your performance will be much less than what it should be.
+BLAS
+but your performance will be much less than what it should be.
-System-dependent configurations are in the {\tt UFconfig/UFconfig.mk}
+UMFPACK also requires CHOLMOD, CCAMD, CCOLAMD, COLAMD, and metis-4.0
+by default. You can remove this dependency by compiling with
+{\tt -DNCHOLMOD}. Add this to the {\tt UMFPACK\_CONFIG} definition
+in {\tt SuiteSparse\_config/SuiteSparse\_config.mk}.
+
+System-dependent configurations are in the {\tt SuiteSparse\_config/SuiteSparse\_config.mk}
file. The default
settings will work on most systems, except for the BLAS definition.
Sample configurations are provided
-for Linux, Sun Solaris, SGI IRIX, IBM AIX, and the DEC/Compaq Alpha.
+for Linux, Mac, Sun Solaris, SGI IRIX, IBM AIX, and the DEC/Compaq Alpha.
To compile and install both packages,
-go to the UMFPACK directory and type {\tt make}. This will compile the
+go to the {\tt UMFPACK} directory and type {\tt make}. This will compile the
libraries ({\tt AMD/Lib/libamd.a} and {\tt UMFPACK/Lib/libumfpack.a}).
A demo of the AMD ordering routine will be compiled and tested in
the {\tt AMD/Demo} directory, and five demo programs will then be
@@ -258,31 +261,29 @@ files in the distribution. Expect to see a few differences, such as
residual norms, compile-time control settings, and perhaps memory usage
differences.
-To use {\tt make} to compile the MATLAB mexFunctions for MATLAB
-and AMD, you can either type {\tt make mex} in the UMFPACK directory.
-You may first need to edit the {\tt UFconfig/UFconfig.mk} file to
-modify the definition of the {\tt MEX}, if you have a version of MATLAB
-older than Version 7.2. Remove the {\tt -largeArrayDims} definition.
-If you use the MATLAB command {\tt umfpack\_make} in the MATLAB directory,
-then this case is handled for you automatically.
+If you have trouble with {\tt make} for UMFPACK,
+try using the plain {\tt Makefile} instead of {\tt GNUmakefile}.
+Go to the UMFPACK/Lib directory and type {\tt make -f Makefile}.
+
+Use the MATLAB command {\tt umfpack\_make} in the MATLAB directory
+to compile UMFPACK and AMD for use in MATLAB.
If you compile UMFPACK and AMD and then later change the
-{\tt UFconfig/UFconfig.mk} file
+{\tt SuiteSparse\_config/SuiteSparse\_config.mk} file
then you should type {\tt make purge} and then {\tt make} to recompile.
Here are the various parameters that you can control in your
-{\tt UFconfig/UFconfig.mk} file:
+{\tt SuiteSparse\_config/SuiteSparse\_config.mk} file:
\begin{itemize}
\item {\tt CC = } your C compiler, such as {\tt cc}.
\item {\tt RANLIB = } your system's {\tt ranlib} program, if needed.
\item {\tt CFLAGS = } optimization flags, such as {\tt -O}.
-\item {\tt UMFPACK\_CONFIG = } configuration settings, for the BLAS,
+\item {\tt UMFPACK\_CONFIG = } configuration settings for the BLAS,
memory allocation routines, and timing routines.
\item {\tt LIB = } your libraries, such as {\tt -lm} or {\tt -lblas}.
\item {\tt RM =} the command to delete a file.
\item {\tt MV =} the command to rename a file.
-\item {\tt MEX =} the command to compile a MATLAB mexFunction.
\item {\tt F77 =} the command to compile a Fortran program (optional).
\item {\tt F77FLAGS =} the Fortran compiler flags (optional).
\item {\tt F77LIB =} the Fortran libraries (optional).
@@ -303,18 +304,22 @@ most deal with how the BLAS are called:
Sun Solaris, SGI Irix, Red Hat Linux, Compaq Alpha, and
AIX (the IBM RS 6000).
-\item {\tt -DGETRUSAGE} if you have the {\tt getrusage} function.
-\item {\tt -DNPOSIX} if you do not have the POSIX-compliant
- {\tt sysconf} and {\tt times} routines.
\item {\tt -DNRECIPROCAL} controls a trade-off between speed and accuracy.
This is off by default (speed preferred over accuracy) except when
compiling for MATLAB.
\end{itemize}
When you compile your program that uses the C-callable UMFPACK library,
-you need to add the both {\tt UMFPACK/Lib/libumfpack.a} and
-{\tt AMD/Lib/libamd.a}
-libraries, and you need to tell your compiler to look in the
+you need to link your program with all libraries
+({\tt UMFPACK/Lib/libumfpack.a} and {\tt AMD/Lib/libamd.a},
+and unless you compile with \verb'-DNCHOLMOD' you also must link with
+{\tt CHOLMOD/Lib/libcholmod.a}, \newline
+{\tt COLAMD/Lib/libcolamd.a},
+{\tt CCOLAMD/Lib/libccolamd.a},
+{\tt CAMD/Lib/libcamd.a},
+and \newline
+{\tt metis-4.0/libmetis.a}).
+You need to tell your compiler to look in the
directories {\tt UMFPACK/Include} and {\tt AMD/Include} for include
files. See {\tt UMFPACK/Demo/Makefile} for an example.
You do not need to directly include any AMD include files in your
@@ -451,10 +456,6 @@ Arguments:
[UMFPACK_PIVOT_TOLERANCE] (default 0.1) times the largest entry
in its column.
- UMFPACK_STRATEGY_2BY2: option disabled.
-
- Control [UMFPACK_2BY2_TOLERANCE]: ignored.
-
Control [UMFPACK_SCALE]: This parameter is new to V4.1. See
umfpack_numeric.h for a description. Only affects the 2-by-2
strategy. Default: UMFPACK_SCALE_SUM.
@@ -503,7 +504,7 @@ Arguments:
UMFPACK_ERROR_internal_error
Something very serious went wrong. This is a bug.
- Please contact the author (davis at cise.ufl.edu).
+ Please contact the author (DrTimothyAldenDavis at gmail.com).
Info [UMFPACK_SIZE_OF_UNIT]: the number of bytes in a Unit,
for memory usage statistics below.
@@ -652,8 +653,8 @@ Arguments:
increase in the total work.
Control [UMFPACK_SYM_PIVOT_TOLERANCE]: This parameter is new to V4.1.
- If diagonal pivoting is attempted (the symmetric or symmetric-2by2
- strategies are used) then this parameter is used to control when the
+ If diagonal pivoting is attempted (the symmetric
+ strategy is used) then this parameter is used to control when the
diagonal entry is selected in a given pivot column. The absolute
value of the entry must be >= Control [UMFPACK_SYM_PIVOT_TOLERANCE]
times the largest absolute value in the column. A value of zero
diff --git a/src/C/SuiteSparse/UMFPACK/Doc/UserGuide.bib b/src/C/SuiteSparse/UMFPACK/Doc/UserGuide.bib
index 540f12e..614c1c4 100644
--- a/src/C/SuiteSparse/UMFPACK/Doc/UserGuide.bib
+++ b/src/C/SuiteSparse/UMFPACK/Doc/UserGuide.bib
@@ -24,16 +24,6 @@
,number={3}
,pages={381-388}}
- at techreport{AmestoyDavisDuff03_user,
- author={Amestoy, P. R. and Davis, T. A. and Duff, I. S.},
- title={{AMD} Version 1.0 User Guide},
- institution={CISE Dept., Univ. of Florida},
- year={2003}
- ,number={TR-03-011}
- ,address={Gainesville, FL}
- ,note={www.cise.ufl.edu/tech-reports.}
- }
-
@article{Davis03,
author={Davis, T. A.},
title={A column pre-ordering strategy for the unsymmetric-pattern multifrontal method},
@@ -52,26 +42,6 @@
,number={2}
,pages={196-199}}
- at techreport{Davis03_umf,
- author={Davis, T. A.},
- title={{UMFPACK} User Guide},
- institution={Univ. of Florida, CISE Dept.},
- year={2005}
- ,number={TR-04-003 (revised)}
- ,address={Gainesville, FL}
- ,note={(www.cise.ufl.edu/tech-reports)}
- }
-
- at techreport{Davis03_umfquick,
- author={Davis, T. A.},
- title={{UMFPACK} Quick Start Guide},
- institution={Univ. of Florida, CISE Dept.},
- year={2005}
- ,number={TR-04-005 (revised)}
- ,address={Gainesville, FL}
- ,note={(www.cise.ufl.edu/tech-reports)}
- }
-
@article{DavisDuff97,
author={Davis, T. A. and Duff, I. S.},
title={An unsymmetric-pattern multifrontal method for sparse {LU} factorization},
@@ -195,15 +165,6 @@
number={3},
pages={250-269}}
- at techreport{Larimore98,
- author={Larimore, S. I.},
- title={An approximate minimum degree column ordering algorithm},
- institution={Univ. of Florida, CISE Dept.},
- year={1998}
- ,number={TR-98-016}
- ,address={Gainesville, FL}
- ,note={www.cise.ufl.edu/tech-reports}}
-
@article{DavisGilbertLarimoreNg00,
author={Davis, T. A. and Gilbert, J. R. and Larimore, S. I. and Ng, E. G.},
title={A column approximate minimum degree ordering algorithm},
diff --git a/src/C/SuiteSparse/UMFPACK/Doc/UserGuide.stex b/src/C/SuiteSparse/UMFPACK/Doc/UserGuide.stex
index 7f380cf..2b8ca08 100644
--- a/src/C/SuiteSparse/UMFPACK/Doc/UserGuide.stex
+++ b/src/C/SuiteSparse/UMFPACK/Doc/UserGuide.stex
@@ -10,7 +10,7 @@
\newcommand{\implies}{\rightarrow}
\topmargin 0in
-\textheight 9in
+\textheight 8.5in
\oddsidemargin 0pt
\evensidemargin 0pt
\textwidth 6.5in
@@ -18,10 +18,9 @@
\begin{document}
\author{Timothy A. Davis \\
-Dept. of Computer and Information Science and Engineering \\
-Univ. of Florida, Gainesville, FL}
-\title{UMFPACK Version 5.4.0 User Guide}
-\date{May 20, 2009}
+DrTimothyAldenDavis at gmail.com, http://www.suitesparse.com}
+\title{UMFPACK User Guide}
+\date{VERSION 5.7.1, Oct 10, 2014}
\maketitle
%-------------------------------------------------------------------------------
@@ -38,7 +37,7 @@ Univ. of Florida, Gainesville, FL}
Technical Report TR-04-003 (revised)
-Copyright\copyright 1995-2009 by Timothy A. Davis.
+Copyright\copyright 1995-2013 by Timothy A. Davis.
All Rights Reserved.
UMFPACK is available under alternate licences; contact T. Davis for details.
@@ -72,7 +71,7 @@ UMFPACK is available under alternate licences; contact T. Davis for details.
and a notice that the code was modified is included.
{\bf Availability:}
- http://www.cise.ufl.edu/research/sparse/umfpack
+ http://www.suitesparse.com
{\bf Acknowledgments:}
@@ -140,8 +139,8 @@ the strategy.
may be numerically zero.
Let $d$ be the number of nonzero entries on the diagonal of $\m{S}$.
Let $\m{S}$ be $\nu$-by-$\nu$.
- Rule 3: $(\sigma_1 \ge 0.7) \:\wedge\: (d \ge 0.9 \nu) \implies$ symmetric.
- The matrix has a nearly symmetric nonzero pattern (70\% or more),
+ Rule 3: $(\sigma_1 \ge 0.5) \:\wedge\: (d \ge 0.9 \nu) \implies$ symmetric.
+ The matrix has a nearly symmetric nonzero pattern (50\% or more),
and a mostly-zero-free diagonal (90\% or more nonzero).
\item Rule 4:
Otherwise, the unsymmetric strategy is used.
@@ -151,7 +150,7 @@ Each strategy is described below:
\begin{itemize}
\item {\em unsymmetric}:
The column pre-ordering of $\m{S}$ is computed by a modified version of COLAMD
-\cite{DavisGilbertLarimoreNg00_algo,DavisGilbertLarimoreNg00,Larimore98}.
+\cite{DavisGilbertLarimoreNg00_algo,DavisGilbertLarimoreNg00}.
The method finds a symmetric permutation $\m{Q}$ of the matrix $\m{S}\tr\m{S}$
(without forming $\m{S}\tr\m{S}$ explicitly). This is a good choice for
$\m{Q}$, since the Cholesky factors of $\m{(SQ)\tr(SQ)}$ are an upper bound (in
@@ -230,14 +229,14 @@ diagonal entry is too small.
More details of the method, including experimental results, are
described in \cite{Davis03,Davis03_algo}, available at
-http://www.cise.ufl.edu/tech-reports.
+http://www.suitesparse.com.
%-------------------------------------------------------------------------------
\section{Availability}
%-------------------------------------------------------------------------------
In addition to appearing as a Collected Algorithm of the ACM,
-UMFPACK is available at \newline http://www.cise.ufl.edu/research/sparse.
+UMFPACK is available at \newline http://www.suitesparse.com.
It is included as a built-in routine in MATLAB.
Version 4.0 (in MATLAB 6.5)
does not have the symmetric strategy and it takes
@@ -250,11 +249,11 @@ Version 3.0 and following make
use of a modified version of COLAMD V2.0 by Timothy A.~Davis, Stefan
Larimore, John Gilbert, and Esmond Ng. The original COLAMD V2.1 is available in
as a built-in routine in MATLAB V6.0 (or later), and at
-http://www.cise.ufl.edu/research/sparse.
+http://www.suitesparse.com.
These codes are also available in Netlib \cite{netlib} at
http://www.netlib.org.
UMFPACK Versions 2.2.1 and earlier, co-authored with Iain Duff,
-are available at http://www.cise.ufl.edu/research/sparse and as
+are available as
MA38 (functionally equivalent to Version 2.2.1) in the Harwell
Subroutine Library.
@@ -268,6 +267,34 @@ an old version of AMD with a newer version of UMFPACK can fail.}
A detailed list of changes is in the {\tt ChangeLog} file.
%-------------------------------------------------------------------------------
+\subsection{Version 5.7.0}
+%-------------------------------------------------------------------------------
+
+Replaced memory manager functions and printf with functions
+in {\tt SuiteSparse\_config}.
+
+%-------------------------------------------------------------------------------
+\subsection{Version 5.6.0}
+%-------------------------------------------------------------------------------
+
+Replaced {\tt UFconfig} with {\tt SuiteSparse\_config}, for {\tt
+SuiteSparse\_timer}. The {\tt UF\_long} type is replaced with {\tt
+SuiteSparse\_long} to avoid potential name conflicts with the {\tt UF\_}
+prefix, but the former is still available for user programs.
+User programs may safely {\tt \#undef} the {\tt UF\_long} macro and
+use {\tt SuiteSparse\_long} instead. In future versions, {\tt UF\_long} will
+be removed completely from {\tt SuiteSparse\_config.h}.
+
+%-------------------------------------------------------------------------------
+\subsection{Version 5.5.0}
+%-------------------------------------------------------------------------------
+
+Added more user ordering options (interface to CHOLMOD and METIS orderings,
+and the ability to pass in a user ordering function).
+Minor change to how the 64-bit BLAS is used.
+Added an option to disable the search for singletons.
+
+%-------------------------------------------------------------------------------
\subsection{Version 5.4.0}
%-------------------------------------------------------------------------------
@@ -428,16 +455,9 @@ and with nonzero entries that are not confined in a narrow band.
It is also used for the {\tt [L,U,P,Q] = lu (A)} usage of {\tt lu}.
Type {\tt help lu} in MATLAB 6.5 or later for more details.
-To use the UMFPACK mexFunction, you must download and compile it,
-since the mexFunction itself is not part of MATLAB.
-The following discussion assumes that
-you have MATLAB Version 6.0 or later (which includes the BLAS, and the
-{\tt colamd} ordering routine). To compile both the UMFPACK and AMD
-mexFunctions, just type {\tt make} in the Unix system shell,
-while in the {\tt UMFPACK} directory.
-You can also type {\tt umfpack\_make} in MATLAB, if you are in the
-{\tt UMFPACK/MATLAB} directory, or if that directory is in your MATLAB path.
-This works on any system with MATLAB, including Windows.
+To compile both the UMFPACK and AMD mexFunctions, just type {\tt umfpack\_make}
+in MATLAB, while in the {\tt UMFPACK/MATLAB} directory.
+
See Section~\ref{Install} for more details on how to install UMFPACK.
Once installed, the UMFPACK mexFunction can analyze, factor, and solve linear
systems. Table~\ref{matlab} summarizes some of the more common uses
@@ -480,7 +500,7 @@ x = A \ b ;
& & \\
\begin{minipage}[t]{1.5in}
Solve $\m{Ax}=\m{b}$ using a different row and column pre-ordering
-(symmetric ordering).
+(symmetric strategy).
\end{minipage}
&
\begin{minipage}[t]{2.2in}
@@ -488,7 +508,7 @@ Solve $\m{Ax}=\m{b}$ using a different row and column pre-ordering
S = spones (A) ;
Q = symamd (S+S') ;
Control = umfpack ;
-Control (6) = 3 ;
+Control.strategy = 'symmetric' ;
x = umfpack (A,Q,'\',b,Control) ;
\end{verbatim}
\end{minipage}
@@ -689,9 +709,9 @@ include file. All but three of the routines come in four versions, with
different sizes of integers and for real or complex floating-point numbers:
\begin{enumerate}
\item {\tt umfpack\_di\_*}: real double precision, {\tt int} integers.
-\item {\tt umfpack\_dl\_*}: real double precision, {\tt UF\_long} integers.
+\item {\tt umfpack\_dl\_*}: real double precision, {\tt SuiteSparse\_long} integers.
\item {\tt umfpack\_zi\_*}: complex double precision, {\tt int} integers.
-\item {\tt umfpack\_zl\_*}: complex double precision, {\tt UF\_long} integers.
+\item {\tt umfpack\_zl\_*}: complex double precision, {\tt SuiteSparse\_long} integers.
\end{enumerate}
where {\tt *} denotes the specific name of one of the routines.
Routine names beginning with {\tt umf\_} are internal to the package,
@@ -701,7 +721,7 @@ The other three routines are the same for all four versions.
In addition, the C-callable AMD library distributed with UMFPACK
includes 4 user-callable routines (in two versions with {\tt int} and
-{\tt UF\_long} integers) and one include file. Refer to the AMD documentation
+{\tt SuiteSparse\_long} integers) and one include file. Refer to the AMD documentation
for more details.
Use only one version for any one problem; do not attempt to use one version
@@ -710,7 +730,7 @@ to analyze the matrix and another version to factorize the matrix, for example.
The notation {\tt umfpack\_di\_*} refers to all user-callable routines
for the real double precision and {\tt int} integer case. The notation
{\tt umfpack\_*\_numeric}, for example, refers all four versions
-(real/complex, int/UF\_long) of a single operation
+(real/complex, int/SuiteSparse\_long) of a single operation
(in this case numeric factorization).
%-------------------------------------------------------------------------------
@@ -719,7 +739,7 @@ for the real double precision and {\tt int} integer case. The notation
The {\tt umfpack\_di\_*} and {\tt umfpack\_zi\_*} routines use {\tt int} integer
arguments; those starting with {\tt umfpack\_dl\_} or {\tt umfpack\_zl\_}
-use {\tt UF\_long} integer arguments. If you compile UMFPACK in the standard
+use {\tt SuiteSparse\_long} integer arguments. If you compile UMFPACK in the standard
ILP32 mode (32-bit {\tt int}'s, {\tt long}'s, and pointers) then the versions
are essentially identical. You will be able to solve problems using up to 2GB
of memory. If you compile UMFPACK in the standard LP64 mode, the size of an
@@ -734,7 +754,7 @@ architectures, and are not portable. UMFPACK and AMD should be compiled
in the same mode.
If you compile UMFPACK and AMD in the LP64 mode,
be sure to add {\tt -DLP64} to the compilation command. See the examples in
-the {\tt UFconfig/UFconfig.mk} file.
+the {\tt SuiteSparse\_config/SuiteSparse\_config.mk} file.
%-------------------------------------------------------------------------------
\subsection{Real and complex floating-point}
@@ -832,12 +852,12 @@ with {\tt nz} entries. For the {\tt int} version of UMFPACK:
\end{verbatim}
}
-For the {\tt UF\_long} version of UMFPACK:
+For the {\tt SuiteSparse\_long} version of UMFPACK:
{\footnotesize
\begin{verbatim}
- UF_long Ap [n+1] ;
- UF_long Ai [nz] ;
+ SuiteSparse_long Ap [n+1] ;
+ SuiteSparse_long Ai [nz] ;
double Ax [nz] ;
\end{verbatim}
}
@@ -971,7 +991,64 @@ behavior. They are fully described in Section~\ref{Alternative}:
nearly always give about the same quality of results. There may be
cases where the automatic strategy fails to pick a good strategy. Also,
you can save some computing time if you know the right strategy for your
- set of matrix problems.
+ set of matrix problems. The default is \verb'UMFPACK_STRATEGY_AUTO',
+ in which UMFPACK selects the strategy by itself.
+ \verb'UMFPACK_STRATEGY_UNSYMMETRIC' gives the unsymmetric
+ strategy, which is to use a column pre-ordering (such as COLAMD)
+ and to give no preference to the diagonal during partial pivoting.
+ \verb'UMFPACK_STRATEGY_SYMMETRIC' gives the symmetric strategy,
+ which is to use a symmetric row and column ordering (such as AMD)
+ and to give strong preference to the diagonal during partial pivoting.
+
+ The parameter {\tt Control [UMFPACK\_ORDERING]} defines what ordering
+ method UMFPACK should use. The options are:
+
+ \begin{itemize}
+ \item \verb'UMFPACK_ORDERING_CHOLMOD' (0).
+ This is the method used by CHOLMOD. It first tries AMD or COLAMD
+ (depending on what strategy is used). If that method gives low
+ fill-in, it is used without trying METIS at all.
+ Otherwise METIS is tried (on $\m{A}^T\m{A}$ for the unsymmetric
+ strategy, or $\m{A}+\m{A}^T$ for the symmetric strategy),
+ and the ordering (AMD/COLAMD or METIS) giving the lowest fill-in is
+ used.
+
+ \item \verb'UMFPACK_ORDERING_DEFAULT'. This is the same as
+ \verb'UMFPACK_ORDERING_AMD'.
+
+ \item \verb'UMFPACK_ORDERING_AMD' (1). This is the default.
+ AMD is used for the symmetric strategy, on the pattern of
+ $\m{A}+\m{A}^T$. COLAMD is used on $\m{A}$ for the unsymmetric
+ strategy.
+
+ \item \verb'UMFPACK_ORDERING_GIVEN' (2). This is assumed if
+ a permutation is provided to \newline
+ {\tt umfpack\_*\_qsymbolic}.
+
+ \item \verb'UMFPACK_ORDERING_METIS' (3).
+ Use METIS (on $\m{A}^T\m{A}$ for the unsymmetric
+ strategy, or $\m{A}+\m{A}^T$ for the symmetric strategy).
+
+ \item \verb'UMFPACK_ORDERING_BEST' (4).
+ Try three methods and take the best. The three methods are
+ AMD/COLAMD, METIS, and NESDIS (CHOLMOD's nested dissection
+ ordering, based on METIS and CCAMD/CCOLAMD). This results the
+ highest analysis time, but the lowest numerical factorization time.
+
+ \item \verb'UMFPACK_ORDERING_NONE' (5).
+ The matrix is factorized as-is, except that singletons are still
+ removed.
+
+ \item \verb'UMFPACK_ORDERING_USER' (6). Use the user-ordering function
+ passed to \newline {\tt umfpack\_*\_fsymbolic}. Refer to
+ \verb'UMFPACK/Source/umf_cholmod.c' for an example.
+
+ \end{itemize}
+
+ To disable the singleton filter, set \verb'Control [UMFPACK_SINGLETONS]' to
+ 0. Disabling this search for singletons can slow UMFPACK down quite a bit
+ for some matrices, but it does ensure that $\m{L}$ is well-conditioned and
+ that any ill-conditioning of $\m{A}$ is captured only in $\m{U}$.
\item {\tt umfpack\_*\_qsymbolic}:
@@ -982,6 +1059,13 @@ behavior. They are fully described in Section~\ref{Alternative}:
A partitioning of $\m{A}+\m{A}\tr$ would be suitable for UMFPACK's
symmetric strategy.
+\item {\tt umfpack\_*\_fsymbolic}:
+
+ An alternative to {\tt umfpack\_*\_symbolic}.
+ Allows the user to pass a pointer to a function,
+ which is called to compute the ordering on the matrix
+ (or on a submatrix with singletons removed, if any exist).
+
\item {\tt umfpack\_*\_wsolve}:
An alternative to {\tt umfpack\_*\_solve} which does not dynamically
@@ -1011,12 +1095,12 @@ four arrays. For the {\tt int} version of UMFPACK:
\end{verbatim}
}
-For the {\tt UF\_long} version:
+For the {\tt SuiteSparse\_long} version:
{\footnotesize
\begin{verbatim}
- UF_long Ti [nz] ;
- UF_long Tj [nz] ;
+ SuiteSparse_long Ti [nz] ;
+ SuiteSparse_long Tj [nz] ;
double Tx [nz] ;
\end{verbatim}
}
@@ -1282,17 +1366,10 @@ printed (similar to the MATLAB commands
\subsection{Utility routines}
%-------------------------------------------------------------------------------
-UMFPACK v4.0 included a routine that returns the time used by the process,
-{\tt umfpack\_timer}. The routine uses either {\tt getrusage} (which is
-preferred), or the ANSI C {\tt clock} routine if that is not available.
-It is fully described in Section~\ref{Utility}. It is still available in
-UMFPACK v4.1 and following, but not used internally.
-Two new timing routines are provided in UMFPACK Version 4.1 and following,
-{\tt umfpack\_tic} and {\tt umfpack\_toc}. They use POSIX-compliant
-{\tt sysconf} and {\tt times} routines to find both the CPU time
-and wallclock time.
+Three timing routines are provided in UMFPACK Version 4.1 and following,
+{\tt umfpack\_tic}, {\tt umfpack\_toc}, and {\tt umfpack\_timer}.
These three routines are the only user-callable
-routine that is identical in all four {\tt int}/{\tt UF\_long}, real/complex
+routine that is identical in all four {\tt int}/{\tt SuiteSparse\_long}, real/complex
versions (there is no {\tt umfpack\_di\_timer} routine, for example).
%-------------------------------------------------------------------------------
@@ -1328,32 +1405,28 @@ indexing. Thus, {\tt Control(1)} in MATLAB is the same as
\hline
MATLAB & ANSI C & default & description \\
+\verb'struct' & & & \\
\hline
-{\tt Control(1)} & {\tt Control[UMFPACK\_PRL]} & 1 & printing level \\
-{\tt Control(2)} & {\tt Control[UMFPACK\_DENSE\_ROW]} & 0.2 & dense row parameter \\
-{\tt Control(3)} & {\tt Control[UMFPACK\_DENSE\_COL]} & 0.2 & dense column parameter \\
-{\tt Control(4)} & {\tt Control[UMFPACK\_PIVOT\_TOLERANCE]} & 0.1 & partial pivoting tolerance \\
-{\tt Control(5)} & {\tt Control[UMFPACK\_BLOCK\_SIZE]} & 32 & BLAS block size \\
-{\tt Control(6)} & {\tt Control[UMFPACK\_STRATEGY]} & 0 (auto) & select strategy \\
-{\tt Control(7)} & {\tt Control[UMFPACK\_ALLOC\_INIT]} & 0.7 & initial memory allocation \\
-{\tt Control(8)} & {\tt Control[UMFPACK\_IRSTEP]} & 2 & max iter. refinement steps \\
-{\tt Control(13)} & ignored & & \\
-{\tt Control(14)} & {\tt Control[UMFPACK\_FIXQ]} & 0 (auto) & fix or modify Q \\
-{\tt Control(15)} & {\tt Control[UMFPACK\_AMD\_DENSE]} & 10 & AMD dense row/column parameter \\
-{\tt Control(16)} & {\tt Control[UMFPACK\_SYM\_PIVOT\_TOLERANCE]} & 0.001 & for diagonal entries \\
-{\tt Control(17)} & {\tt Control[UMFPACK\_SCALE]} & 1 (sum) & row scaling (none, sum, or max) \\
-{\tt Control(18)} & {\tt Control[UMFPACK\_FRONT\_ALLOC\_INIT]} & 0.5 & frontal matrix allocation ratio \\
-{\tt Control(19)} & {\tt Control[UMFPACK\_DROPTOL]} & 0 & drop tolerance \\
-{\tt Control(20)} & {\tt Control[UMFPACK\_AGGRESSIVE]} & 1 (yes) & aggressive absorption \\
- & & & in AMD and COLAMD \\
+{\tt prl} & {\tt Control[UMFPACK\_PRL]} & 1 & printing level \\
+- & {\tt Control[UMFPACK\_DENSE\_ROW]} & 0.2 & dense row parameter \\
+- & {\tt Control[UMFPACK\_DENSE\_COL]} & 0.2 & dense column parameter \\
+{\tt tol} & {\tt Control[UMFPACK\_PIVOT\_TOLERANCE]} & 0.1 & partial pivoting tolerance \\
+- & {\tt Control[UMFPACK\_BLOCK\_SIZE]} & 32 & BLAS block size \\
+{\tt strategy} & {\tt Control[UMFPACK\_STRATEGY]} & 0 (auto) & select strategy \\
+{\tt ordering} & {\tt Control[UMFPACK\_ORDERING]} & 1 (AMD) & select ordering \\
+- & {\tt Control[UMFPACK\_ALLOC\_INIT]} & 0.7 & initial memory allocation \\
+{\tt irstep} & {\tt Control[UMFPACK\_IRSTEP]} & 2 & max iter. refinement steps \\
+% {\tt Control(13)} & ignored & & \\
+- & {\tt Control[UMFPACK\_FIXQ]} & 0 (auto) & fix or modify Q \\
+- & {\tt Control[UMFPACK\_AMD\_DENSE]} & 10 & AMD dense row/col param. \\
+{\tt symtol} & {\tt Control[UMFPACK\_SYM\_PIVOT\_TOLERANCE]} & 0.001 & for diagonal entries \\
+{\tt scale} & {\tt Control[UMFPACK\_SCALE]} & 1 (sum) & row scaling (none, sum, max) \\
+- & {\tt Control[UMFPACK\_FRONT\_ALLOC\_INIT]} & 0.5 & frontal matrix allocation ratio \\
+- & {\tt Control[UMFPACK\_DROPTOL]} & 0 & drop tolerance \\
+- & {\tt Control[UMFPACK\_AGGRESSIVE]} & 1 (yes) & aggressive absorption \\
+{\tt singletons} & {\tt Control[UMFPACK\_SINGLETONS]} & 1 (enable) & enable singleton filter \\
%
\hline
-\multicolumn{4}{l}{Can only be changed at compile time:} \\
-{\tt Control(9)} & {\tt Control[UMFPACK\_COMPILED\_WITH\_BLAS]} & - & true if BLAS is used \\
-{\tt Control(10)} & {\tt Control[UMFPACK\_COMPILED\_FOR\_MATLAB]} & - & true for mexFunction \\
-{\tt Control(11)} & {\tt Control[UMFPACK\_COMPILED\_WITH\_GETRUSAGE]} & - & 1 if {\tt getrusage} used \\
-{\tt Control(12)} & {\tt Control[UMFPACK\_COMPILED\_IN\_DEBUG\_MODE]} & - & true if debug mode enabled \\
-\hline
\end{tabular}
}
\end{table}
@@ -1375,7 +1448,9 @@ In AMD, a row/column of the square matrix $\m{S}+\m{S}\tr$ is
considered ``dense'' if it has more than $\max (16, \alpha \sqrt{n})$ entries.
These rows/columns are placed last in AMD's output ordering.
For more details on the control parameters, refer to the documentation of
-{\tt umfpack\_*\_qsymbolic}, {\tt umfpack\_*\_numeric}, {\tt umfpack\_*\_solve},
+{\tt umfpack\_*\_qsymbolic},
+{\tt umfpack\_*\_fsymbolic},
+{\tt umfpack\_*\_numeric}, {\tt umfpack\_*\_solve},
and the {\tt umfpack\_*\_report\_*} routines,
in Sections~\ref{Primary}~through~\ref{Report}, below.
@@ -1499,6 +1574,9 @@ In this case, no {\tt Symbolic} or {\tt Numeric} object was created.
be the wrong one, and an earlier end-of-file condition would then result
in this error.
+\item {\tt UMFPACK\_ERROR\_ordering\_failed}, (-18):
+ The ordering method failed.
+
\item {\tt UMFPACK\_ERROR\_internal\_error}, (-911):
An internal error has occurred, of unknown cause. This is either a bug
in UMFPACK, or the result of a memory overrun from your program.
@@ -1508,8 +1586,8 @@ In this case, no {\tt Symbolic} or {\tt Numeric} object was created.
A failed assertion might occur which
can give you a better indication as to what is going wrong. Be aware that
UMFPACK will be extraordinarily slow when running in debug mode.
- If all else fails, contact the developer (davis at cise.ufl.edu) with
- as many details as possible.
+ If all else fails, contact the developer (DrTimothyAldenDavis at gmail.com)
+ with as many details as possible.
\end{itemize}
@@ -1525,7 +1603,10 @@ user-callable C interface to UMFPACK. The only features that it does not use
are the support for the triplet form (MATLAB's sparse arrays are already in the
compressed column form) and the ability to reuse the {\tt Symbolic} object to
numerically factorize a matrix whose pattern is the same as a prior matrix
-analyzed by {\tt umfpack\_*\_symbolic} or {\tt umfpack\_*\_qsymbolic}. The
+analyzed by {\tt umfpack\_*\_symbolic},
+{\tt umfpack\_*\_qsymbolic} or
+{\tt umfpack\_*\_fsymbolic}.
+The
latter is an important feature, but the mexFunction does not return its opaque
{\tt Symbolic} and {\tt Numeric} objects to MATLAB. Instead, it gets the
contents of these objects after extracting them via the {\tt umfpack\_*\_get\_*}
@@ -1536,7 +1617,7 @@ The {\tt umf4.c} program for reading matrices in Harwell/Boeing format
({\tt readhb.f}, {\tt readhb\_nozeros.f}, and {\tt readhb\_size.f})
for reading in the sample Harwell/Boeing files in the {\tt UMFPACK/Demo/HB}
directory. More matrices are available at
-http://www.cise.ufl.edu/research/sparse/matrices.
+http://www.suitesparse.com.
Type {\tt make hb} in the {\tt UMFPACK/Demo/HB} directory
to compile and run this demo. This program was used for the experimental
results in \cite{Davis03}.
@@ -1551,15 +1632,15 @@ values, and calling sequences of the routines in one category. Variables with
the same name as those already listed in a prior category have the same size
and type.
-The real, {\tt UF\_long} integer {\tt umfpack\_dl\_*} routines are
+The real, {\tt SuiteSparse\_long} integer {\tt umfpack\_dl\_*} routines are
identical to the real, {\tt int} routines, except that {\tt \_di\_} is replaced
with {\tt \_dl\_} in the name, and all {\tt int} arguments become
-{\tt UF\_long}.
-Similarly, the complex, {\tt UF\_long} integer {\tt umfpack\_zl\_*} routines are
+{\tt SuiteSparse\_long}.
+Similarly, the complex, {\tt SuiteSparse\_long} integer {\tt umfpack\_zl\_*} routines are
identical to the complex, {\tt int} routines, except that {\tt \_zi\_} is
replaced
with {\tt \_zl\_} in the name, and all {\tt int} arguments become
-{\tt UF\_long}.
+{\tt SuiteSparse\_long}.
Only the real and complex {\tt int} versions are listed in the synopsis below.
The matrix $\m{A}$ is {\tt m}-by-{\tt n} with {\tt nz} entries.
@@ -1642,6 +1723,7 @@ double W [5*n] ;
umfpack_di_defaults (Control) ;
status = umfpack_di_qsymbolic (m, n, Ap, Ai, Ax, Qinit, &Symbolic, Control, Info) ;
+status = umfpack_di_fsymbolic (m, n, Ap, Ai, Ax, &user_ordering, user_params, &Symbolic, Control, Info) ;
status = umfpack_di_wsolve (sys, Ap, Ai, Ax, X, B, Numeric, Control, Info, Wi, W) ;
\end{verbatim}
}
@@ -1745,6 +1827,7 @@ double Wz [10*n] ;
umfpack_zi_defaults (Control) ;
status = umfpack_zi_qsymbolic (m, n, Ap, Ai, Ax, Az, Qinit, &Symbolic, Control, Info) ;
+status = umfpack_zi_fsymbolic (m, n, Ap, Ai, Ax, Az, &user_ordering, user_params, &Symbolic, Control, Info) ;
status = umfpack_zi_wsolve (sys, Ap, Ai, Ax, Az, Xx, Xz, Bx, Bz, Numeric, Control, Info, Wi, Wz) ;
\end{verbatim}
}
@@ -1845,7 +1928,7 @@ UMFPACK makes use of the AMD ordering package for its symmetric ordering
strategy. You may also use these four user-callable routines in your own C
programs. You need to include the {\tt amd.h} file only if you make direct
calls to the AMD routines themselves. The {\tt int} versions are summarized
-below; {\tt UF\_long} versions are also available. Refer to the AMD User Guide
+below; {\tt SuiteSparse\_long} versions are also available. Refer to the AMD User Guide
for more information, or to the file {\tt amd.h} which documents these routines.
{\footnotesize
@@ -2034,16 +2117,21 @@ the UMFPACK and AMD mexFunctions in MATLAB.
You will need to install both UMFPACK and AMD to use UMFPACK.
The {\tt UMFPACK} and {\tt AMD} subdirectories must be placed side-by-side
-within the same directory. AMD is a stand-alone package that
+within the same parent directory. AMD is a stand-alone package that
is required by UMFPACK. UMFPACK can be compiled without the
BLAS \cite{DaydeDuff99,ACM679a,ATLAS,GotoVandeGeijn02},
but your performance will be much less than what it should be.
-System-dependent configurations are in the {\tt UFconfig/UFconfig.mk}
+UMFPACK also requires CHOLMOD, CCAMD, CCOLAMD, COLAMD, and metis-4.0
+by default. You can remove this dependency by compiling with
+{\tt -DNCHOLMOD}. Add this to the {\tt UMFPACK\_CONFIG} definition
+in {\tt SuiteSparse\_config/SuiteSparse\_config.mk}.
+
+System-dependent configurations are in the {\tt SuiteSparse\_config/SuiteSparse\_config.mk}
file. The default
settings will work on most systems, except that UMFPACK will be compiled so
that it does not use the BLAS. Sample configurations are provided
-for Linux, Sun Solaris, SGI IRIX, IBM AIX, and the DEC/Compaq Alpha.
+for Linux, Mac, Sun Solaris, SGI IRIX, IBM AIX, and the DEC/Compaq Alpha.
To compile and install both packages,
go to the {\tt UMFPACK} directory and type {\tt make}. This will compile the
@@ -2056,31 +2144,30 @@ files in the distribution. Expect to see a few differences, such as
residual norms, compile-time control settings, and perhaps memory usage
differences.
-To use {\tt make} to compile the MATLAB mexFunctions for MATLAB
-and AMD, you can either type {\tt make mex} in the UMFPACK directory.
-You may first need to edit the {\tt UFconfig/UFconfig.mk} file to
-modify the definition of the {\tt MEX}, if you have a version of MATLAB
-older than Version 7.2. Remove the {\tt -largeArrayDims} definition.
-If you use the MATLAB command {\tt umfpack\_make} in the MATLAB directory,
-then this case is handled for you automatically.
+If you have trouble with {\tt make} for UMFPACK,
+try using the plain {\tt Makefile} instead of {\tt GNUmakefile}.
+Go to the UMFPACK/Lib directory and type {\tt make -f Makefile}.
+
+Use the MATLAB command {\tt umfpack\_make} in the MATLAB directory
+to compile UMFPACK and AMD for use in MATLAB.
If you have the GNU version of {\tt make}, the {\tt Lib/GNUmakefile} and
{\tt MATLAB/GNUmakefile} files are used. These are much more concise than
what the ``old'' version of {\tt make} can handle. If you do not have
GNU {\tt make}, the {\tt Lib/Makefile} and {\tt MATLAB/Makefile} files
are used instead. Each UMFPACK source file is compiled into four
-versions ({\tt double} / complex, and {\tt int} / {\tt UF\_long}). A proper
+versions ({\tt double} / complex, and {\tt int} / {\tt SuiteSparse\_long}). A proper
old-style {\tt Makefile} is cumbersome in this case, so these two
{\tt Makefile}'s have been constructed by brute force. They ignore
dependencies, and simply compile everything. I highly recommend using GNU
{\tt make} if you wish to modify UMFPACK.
If you compile UMFPACK and AMD and then later change the
-{\tt UFconfig/UFconfig.mk} file
+{\tt SuiteSparse\_config/SuiteSparse\_config.mk} file
then you should type {\tt make purge} and then {\tt make} to recompile.
Here are the various parameters that you can control in your
-{\tt UFconfig/UFconfig.mk} file:
+{\tt SuiteSparse\_config/SuiteSparse\_config.mk} file:
\begin{itemize}
\item {\tt CC = } your C compiler, such as {\tt cc}.
@@ -2091,9 +2178,6 @@ Here are the various parameters that you can control in your
\item {\tt LIB = } your libraries, such as {\tt -lm} or {\tt -lblas}.
\item {\tt RM =} the command to delete a file.
\item {\tt MV =} the command to rename a file.
-\item {\tt MEX =} the command to compile a MATLAB mexFunction.
- If you are using MATLAB 5, you need to add {\tt -DNBLAS} and
- {\tt -DNUTIL} to this command.
\item {\tt F77 =} the command to compile a Fortran program (optional).
\item {\tt F77FLAGS =} the Fortran compiler flags (optional).
\item {\tt F77LIB =} the Fortran libraries (optional).
@@ -2114,10 +2198,6 @@ most deal with how the BLAS are called:
Sun Solaris, SGI Irix, Red Hat Linux, Compaq Alpha, and
AIX (the IBM RS 6000).
-\item {\tt -DGETRUSAGE} if you have the {\tt getrusage} function.
-\item {\tt -DNPOSIX} if you do not have the POSIX-compliant
- {\tt sysconf} and {\tt times} routines used by
- {\tt umfpack\_tic} and {\tt umfpack\_toc}.
\item {\tt -DNRECIPROCAL} controls a trade-off between speed and accuracy.
If defined (or if the pivot value itself is less than $10^{-12}$),
then the pivot column is divided by the pivot value during numeric
@@ -2140,9 +2220,7 @@ most deal with how the BLAS are called:
zero is performed (a zero entry on the diagonal of $\m{U}$ is
treated as if it were equal to one). By default,
UMFPACK will divide by zero.
-\item {\tt -DNO\_TIMER} controls whether or not timing routines
- are to be called. If defined, no timers are used.
- Timers are included by default.
+
\end{itemize}
If a Fortran BLAS package is used you may see compiler warnings. The BLAS
@@ -2163,9 +2241,16 @@ a dense matrix (stored in sparse format) is 900 Mflops, as compared to
when {\tt A} is stored as a regular full matrix.
When you compile your program that uses the C-callable UMFPACK library,
-you need to link your program with both libraries
-({\tt UMFPACK/Lib/libumfpack.a} and {\tt AMD/Lib/libamd.a})
-and you need to tell your compiler to look in the
+you need to link your program with all libraries
+({\tt UMFPACK/Lib/libumfpack.a} and {\tt AMD/Lib/libamd.a},
+and unless you compile with \verb'-DNCHOLMOD' you also must link with
+{\tt CHOLMOD/Lib/libcholmod.a}, \newline
+{\tt COLAMD/Lib/libcolamd.a},
+{\tt CCOLAMD/Lib/libccolamd.a},
+{\tt CAMD/Lib/libcamd.a},
+and \newline
+{\tt metis-4.0/libmetis.a}).
+You need to tell your compiler to look in the
directories {\tt UMFPACK/Include} and {\tt AMD/Include} for include
files. See {\tt UMFPACK/Demo/Makefile} for an example.
You do not need to directly include any AMD include files in your
@@ -2176,11 +2261,11 @@ program, unless you directly call AMD routines. You only need the
statement, as described in Section~\ref{Synopsis}.
If you would like to compile both 32-bit and 64-bit versions of the libraries,
-you will need to do it in two steps. Modify your {\tt UFconfig/UFconfig.mk}
+you will need to do it in two steps. Modify your {\tt SuiteSparse\_config/SuiteSparse\_config.mk}
file, and select the 32-bit option. Type {\tt make} in the {\tt UMFPACK}
directory, which creates the {\tt UMFPACK/Lib/libumfpack.a} and
{\tt AMD/Lib/libamd.a} libraries. Rename those two files. Edit your
-{\tt UFconfig/UFconfig.mk} file and select the 64-bit option.
+{\tt SuiteSparse\_config/SuiteSparse\_config.mk} file and select the 64-bit option.
Type {\tt make purge},
and then {\tt make}, and you will create the 64-bit libraries.
You can use the same {\tt umfpack.h} include file for both 32-bit and
@@ -2200,13 +2285,11 @@ compilation of UMFPACK in Microsoft Visual Studio, for Windows.
\subsection{Installing the MATLAB interface}
%-------------------------------------------------------------------------------
-If all you want to do is use the UMFPACK mexFunction in MATLAB, you can skip
-the use of the {\tt make} command described above. Simply type
+Simply type
{\tt umfpack\_make} in MATLAB while in the {\tt UMFPACK/MATLAB} directory.
You can also type {\tt amd\_make} in the {\tt AMD/MATLAB} directory
to compile the stand-alone AMD mexFunction (this is not required to
-compile the UMFPACK mexFunction). This works on any computer with MATLAB,
-including Windows.
+compile the UMFPACK mexFunction).
If you are using Windows and the {\tt lcc} compiler bundled with
MATLAB 6.1, then you may need to copy the
@@ -2246,6 +2329,9 @@ You may need to modify the interface routines in the file
{\tt umf4\_f77wrapper.c} if you are using compilers for which this interface
has not been tested.
+In particular, I was not able to get C and Fortran to work together on
+the Mac (Snow Leopard).
+
%-------------------------------------------------------------------------------
\subsection{Known Issues}
%-------------------------------------------------------------------------------
@@ -2378,7 +2464,7 @@ let me know and I could consider including them:
The include files are the same for all four versions of
UMFPACK. The generic integer type is {\tt Int}, which is an {\tt int} or
-{\tt UF\_long}, depending on which version of UMFPACK you are using.
+{\tt SuiteSparse\_long}, depending on which version of UMFPACK you are using.
\subsection{umfpack\_*\_symbolic}
@@ -2439,7 +2525,7 @@ INCLUDE umfpack_defaults.h via sed
}
\newpage
-\subsection{umfpack\_*\_qsymbolic}
+\subsection{umfpack\_*\_qsymbolic and umfpack\_*\_fsymbolic}
{\footnotesize
\begin{verbatim}
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack.h
index a716e3f..62ef2f9 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -27,8 +26,7 @@
extern "C" {
#endif
-/* define UF_long */
-#include "UFconfig.h"
+#include "SuiteSparse_config.h"
/* -------------------------------------------------------------------------- */
/* size of Info and Control arrays */
@@ -97,10 +95,10 @@ extern "C" {
/* Version, copyright, and license */
/* -------------------------------------------------------------------------- */
-#define UMFPACK_VERSION "UMFPACK V5.4.0 (May 20, 2009)"
+#define UMFPACK_VERSION "UMFPACK V5.7.1 (Oct 10, 2014)"
#define UMFPACK_COPYRIGHT \
-"UMFPACK: Copyright (c) 2005-2009 by Timothy A. Davis. All Rights Reserved.\n"
+"UMFPACK: Copyright (c) 2005-2013 by Timothy A. Davis. All Rights Reserved.\n"
#define UMFPACK_LICENSE_PART1 \
"\nUMFPACK License:\n" \
@@ -140,7 +138,7 @@ extern "C" {
#define UMFPACK_LICENSE_PART3 \
"\n" \
-"Availability: http://www.cise.ufl.edu/research/sparse/umfpack\n" \
+"Availability: http://www.suitesparse.com" \
"\n"
/* UMFPACK Version 4.5 and later will include the following definitions.
@@ -163,11 +161,11 @@ extern "C" {
* above.
*/
-#define UMFPACK_DATE "May 20, 2009"
+#define UMFPACK_DATE "Oct 10, 2014"
#define UMFPACK_VER_CODE(main,sub) ((main) * 1000 + (sub))
#define UMFPACK_MAIN_VERSION 5
-#define UMFPACK_SUB_VERSION 4
-#define UMFPACK_SUBSUB_VERSION 0
+#define UMFPACK_SUB_VERSION 7
+#define UMFPACK_SUBSUB_VERSION 1
#define UMFPACK_VER UMFPACK_VER_CODE(UMFPACK_MAIN_VERSION,UMFPACK_SUB_VERSION)
/* -------------------------------------------------------------------------- */
@@ -188,7 +186,7 @@ extern "C" {
/* computed in UMFPACK_*symbolic: */
#define UMFPACK_SIZE_OF_INT 4 /* sizeof (int) */
-#define UMFPACK_SIZE_OF_LONG 5 /* sizeof (UF_long) */
+#define UMFPACK_SIZE_OF_LONG 5 /* sizeof (SuiteSparse_long) */
#define UMFPACK_SIZE_OF_POINTER 6 /* sizeof (void *) */
#define UMFPACK_SIZE_OF_ENTRY 7 /* sizeof (Entry), real or complex */
#define UMFPACK_NDENSE_ROW 8 /* number of dense rows */
@@ -200,7 +198,7 @@ extern "C" {
#define UMFPACK_SYMBOLIC_SIZE 14 /* size of Symbolic object, in Units */
#define UMFPACK_SYMBOLIC_TIME 15 /* time (sec.) for symbolic analysis */
#define UMFPACK_SYMBOLIC_WALLTIME 17 /* wall clock time for sym. analysis */
-#define UMFPACK_STRATEGY_USED 18 /* strategy used: sym, unsym, 2by2 */
+#define UMFPACK_STRATEGY_USED 18 /* strategy used: sym, unsym */
#define UMFPACK_ORDERING_USED 19 /* ordering used: colamd, amd, given */
#define UMFPACK_QFIXED 31 /* whether Q is fixed or refined */
#define UMFPACK_DIAG_PREFERRED 32 /* whether diagonal pivoting attempted*/
@@ -214,12 +212,7 @@ extern "C" {
#define UMFPACK_SYMMETRIC_NDENSE 38 /* # of "dense" rows/cols in S+S' */
#define UMFPACK_SYMMETRIC_DMAX 39 /* max nz in cols of L, for AMD */
-/* statistics for 2-by-2 strategy */
-#define UMFPACK_2BY2_NWEAK 51 /* number of weak diagonal entries*/
-#define UMFPACK_2BY2_UNMATCHED 52 /* # of weak diagonals not matched*/
-#define UMFPACK_2BY2_PATTERN_SYMMETRY 53 /* symmetry of pattern of P*S */
-#define UMFPACK_2BY2_NZ_PA_PLUS_PAT 54 /* nz in PS+(PS)' */
-#define UMFPACK_2BY2_NZDIAG 55 /* nz on diagonal of PS+(PS)' */
+/* 51:55 unused */
/* statistcs for singleton pruning */
#define UMFPACK_COL_SINGLETONS 56 /* # of column singletons */
@@ -290,13 +283,6 @@ extern "C" {
/* Unused parts of Info may be used in future versions of UMFPACK. */
/* -------------------------------------------------------------------------- */
-
-/* Info [UMFPACK_ORDERING_USED] is one of the following: */
-#define UMFPACK_ORDERING_COLAMD 0 /* COLAMD(A) */
-#define UMFPACK_ORDERING_AMD 1 /* AMD(A+A') */
-#define UMFPACK_ORDERING_GIVEN 2 /* Q is provided on input */
-
-/* -------------------------------------------------------------------------- */
/* contents of Control */
/* -------------------------------------------------------------------------- */
@@ -307,12 +293,12 @@ extern "C" {
#define UMFPACK_DENSE_ROW 1 /* dense row parameter */
#define UMFPACK_DENSE_COL 2 /* dense col parameter */
#define UMFPACK_BLOCK_SIZE 4 /* BLAS-3 block size */
-#define UMFPACK_STRATEGY 5 /* auto, symmetric, unsym., or 2by2 */
-#define UMFPACK_2BY2_TOLERANCE 12 /* 2-by-2 pivot tolerance */
+#define UMFPACK_STRATEGY 5 /* auto, symmetric, or unsym. */
+#define UMFPACK_ORDERING 10 /* ordering method to use */
#define UMFPACK_FIXQ 13 /* -1: no fixQ, 0: default, 1: fixQ */
#define UMFPACK_AMD_DENSE 14 /* for AMD ordering */
-#define UMFPACK_AGGRESSIVE 19 /* whether or not to use aggressive
- * absorption in AMD and COLAMD */
+#define UMFPACK_AGGRESSIVE 19 /* whether or not to use aggressive */
+#define UMFPACK_SINGLETONS 11 /* singleton filter on if true */
/* used in UMFPACK_numeric only: */
#define UMFPACK_PIVOT_TOLERANCE 3 /* threshold partial pivoting setting */
@@ -327,9 +313,8 @@ extern "C" {
/* compile-time settings - Control [8..11] cannot be changed at run time: */
#define UMFPACK_COMPILED_WITH_BLAS 8 /* uses the BLAS */
-#define UMFPACK_COMPILED_FOR_MATLAB 9 /* 1 if MATLAB mexFunction, etc. */
-#define UMFPACK_COMPILED_WITH_GETRUSAGE 10 /* uses getrusage timer, or not */
-#define UMFPACK_COMPILED_IN_DEBUG_MODE 11 /* debugging enabled (very slow!) */
+
+/* 9,12: unused */
/* -------------------------------------------------------------------------- */
@@ -337,9 +322,7 @@ extern "C" {
#define UMFPACK_STRATEGY_AUTO 0 /* use sym. or unsym. strategy */
#define UMFPACK_STRATEGY_UNSYMMETRIC 1 /* COLAMD(A), coletree postorder,
not prefer diag*/
-#define UMFPACK_STRATEGY_2BY2 2 /* AMD(PA+PA'), no coletree postorder,
- prefer diag(PA) where P is pseudo
- max transversal */
+#define UMFPACK_STRATEGY_OBSOLETE 2 /* 2-by-2 is no longer available */
#define UMFPACK_STRATEGY_SYMMETRIC 3 /* AMD(A+A'), no coletree postorder,
prefer diagonal */
@@ -348,6 +331,16 @@ extern "C" {
#define UMFPACK_SCALE_SUM 1 /* default: divide each row by sum (abs (row))*/
#define UMFPACK_SCALE_MAX 2 /* divide each row by max (abs (row)) */
+/* Control [UMFPACK_ORDERING] and Info [UMFPACK_ORDERING_USED] are one of: */
+#define UMFPACK_ORDERING_CHOLMOD 0 /* use CHOLMOD (AMD/COLAMD then METIS)*/
+#define UMFPACK_ORDERING_AMD 1 /* use AMD/COLAMD */
+#define UMFPACK_ORDERING_GIVEN 2 /* user-provided Qinit */
+#define UMFPACK_ORDERING_METIS 3 /* use METIS */
+#define UMFPACK_ORDERING_BEST 4 /* try many orderings, pick best */
+#define UMFPACK_ORDERING_NONE 5 /* natural ordering */
+#define UMFPACK_ORDERING_USER 6 /* user-provided function */
+/* AMD/COLAMD means: use AMD for symmetric strategy, COLAMD for unsymmetric */
+
/* -------------------------------------------------------------------------- */
/* default values of Control: */
/* -------------------------------------------------------------------------- */
@@ -356,7 +349,6 @@ extern "C" {
#define UMFPACK_DEFAULT_DENSE_ROW 0.2
#define UMFPACK_DEFAULT_DENSE_COL 0.2
#define UMFPACK_DEFAULT_PIVOT_TOLERANCE 0.1
-#define UMFPACK_DEFAULT_2BY2_TOLERANCE 0.01
#define UMFPACK_DEFAULT_SYM_PIVOT_TOLERANCE 0.001
#define UMFPACK_DEFAULT_BLOCK_SIZE 32
#define UMFPACK_DEFAULT_ALLOC_INIT 0.7
@@ -368,6 +360,8 @@ extern "C" {
#define UMFPACK_DEFAULT_FIXQ 0
#define UMFPACK_DEFAULT_AGGRESSIVE 1
#define UMFPACK_DEFAULT_DROPTOL 0
+#define UMFPACK_DEFAULT_ORDERING UMFPACK_ORDERING_AMD
+#define UMFPACK_DEFAULT_SINGLETONS TRUE
/* default values of Control may change in future versions of UMFPACK. */
@@ -399,6 +393,8 @@ extern "C" {
#define UMFPACK_ERROR_internal_error (-911) /* yes, call me if you get this! */
#define UMFPACK_ERROR_file_IO (-17)
+#define UMFPACK_ERROR_ordering_failed (-18)
+
/* -------------------------------------------------------------------------- */
/* solve codes */
/* -------------------------------------------------------------------------- */
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_col_to_triplet.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_col_to_triplet.h
index 948a65e..8fa096f 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_col_to_triplet.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_col_to_triplet.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_col_to_triplet
@@ -15,11 +14,11 @@ int umfpack_di_col_to_triplet
int Tj [ ]
) ;
-UF_long umfpack_dl_col_to_triplet
+SuiteSparse_long umfpack_dl_col_to_triplet
(
- UF_long n_col,
- const UF_long Ap [ ],
- UF_long Tj [ ]
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ SuiteSparse_long Tj [ ]
) ;
int umfpack_zi_col_to_triplet
@@ -29,11 +28,11 @@ int umfpack_zi_col_to_triplet
int Tj [ ]
) ;
-UF_long umfpack_zl_col_to_triplet
+SuiteSparse_long umfpack_zl_col_to_triplet
(
- UF_long n_col,
- const UF_long Ap [ ],
- UF_long Tj [ ]
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ SuiteSparse_long Tj [ ]
) ;
/*
@@ -43,10 +42,10 @@ double int Syntax:
int n_col, *Tj, *Ap, status ;
status = umfpack_di_col_to_triplet (n_col, Ap, Tj) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_col, *Tj, *Ap, status ;
+ SuiteSparse_long n_col, *Tj, *Ap, status ;
status = umfpack_dl_col_to_triplet (n_col, Ap, Tj) ;
complex int Syntax:
@@ -55,10 +54,10 @@ complex int Syntax:
int n_col, *Tj, *Ap, status ;
status = umfpack_zi_col_to_triplet (n_col, Ap, Tj) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_col, *Tj, *Ap, status ;
+ SuiteSparse_long n_col, *Tj, *Ap, status ;
status = umfpack_zl_col_to_triplet (n_col, Ap, Tj) ;
Purpose:
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_defaults.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_defaults.h
index a588d4f..e1a3a8b 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_defaults.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_defaults.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
void umfpack_di_defaults
@@ -35,7 +34,7 @@ double int Syntax:
double Control [UMFPACK_CONTROL] ;
umfpack_di_defaults (Control) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
double Control [UMFPACK_CONTROL] ;
@@ -47,7 +46,7 @@ complex int Syntax:
double Control [UMFPACK_CONTROL] ;
umfpack_zi_defaults (Control) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
double Control [UMFPACK_CONTROL] ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_free_numeric.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_free_numeric.h
index 986a6ab..c86d909 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_free_numeric.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_free_numeric.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
void umfpack_di_free_numeric
@@ -35,7 +34,7 @@ double int Syntax:
void *Numeric ;
umfpack_di_free_numeric (&Numeric) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
@@ -47,7 +46,7 @@ complex int Syntax:
void *Numeric ;
umfpack_zi_free_numeric (&Numeric) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_free_symbolic.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_free_symbolic.h
index ad3aeb6..8cb1eba 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_free_symbolic.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_free_symbolic.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
void umfpack_di_free_symbolic
@@ -35,7 +34,7 @@ double int Syntax:
void *Symbolic ;
umfpack_di_free_symbolic (&Symbolic) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic ;
@@ -47,7 +46,7 @@ complex int Syntax:
void *Symbolic ;
umfpack_zi_free_symbolic (&Symbolic) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_determinant.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_determinant.h
index 702c1f1..333d5fc 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_determinant.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_determinant.h
@@ -3,10 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
-/* UMFPACK_get_determinant contributed by David Bateman, Motorola, Paris. */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_get_determinant
@@ -17,7 +15,7 @@ int umfpack_di_get_determinant
double User_Info [UMFPACK_INFO]
) ;
-UF_long umfpack_dl_get_determinant
+SuiteSparse_long umfpack_dl_get_determinant
(
double *Mx,
double *Ex,
@@ -34,7 +32,7 @@ int umfpack_zi_get_determinant
double User_Info [UMFPACK_INFO]
) ;
-UF_long umfpack_zl_get_determinant
+SuiteSparse_long umfpack_zl_get_determinant
(
double *Mx,
double *Mz,
@@ -52,11 +50,11 @@ double int Syntax:
double Mx, Ex, Info [UMFPACK_INFO] ;
status = umfpack_di_get_determinant (&Mx, &Ex, Numeric, Info) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long status ;
+ SuiteSparse_long status ;
double Mx, Ex, Info [UMFPACK_INFO] ;
status = umfpack_dl_get_determinant (&Mx, &Ex, Numeric, Info) ;
@@ -72,7 +70,7 @@ complex int Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long status ;
+ SuiteSparse_long status ;
double *Mx, *Mz, *Ex, Info [UMFPACK_INFO] ;
status = umfpack_zl_get_determinant (&Mx, &Mz, &Ex, Numeric, Info) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_lunz.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_lunz.h
index 512cffa..58b9ff2 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_lunz.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_lunz.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_get_lunz
@@ -18,13 +17,13 @@ int umfpack_di_get_lunz
void *Numeric
) ;
-UF_long umfpack_dl_get_lunz
+SuiteSparse_long umfpack_dl_get_lunz
(
- UF_long *lnz,
- UF_long *unz,
- UF_long *n_row,
- UF_long *n_col,
- UF_long *nz_udiag,
+ SuiteSparse_long *lnz,
+ SuiteSparse_long *unz,
+ SuiteSparse_long *n_row,
+ SuiteSparse_long *n_col,
+ SuiteSparse_long *nz_udiag,
void *Numeric
) ;
@@ -38,13 +37,13 @@ int umfpack_zi_get_lunz
void *Numeric
) ;
-UF_long umfpack_zl_get_lunz
+SuiteSparse_long umfpack_zl_get_lunz
(
- UF_long *lnz,
- UF_long *unz,
- UF_long *n_row,
- UF_long *n_col,
- UF_long *nz_udiag,
+ SuiteSparse_long *lnz,
+ SuiteSparse_long *unz,
+ SuiteSparse_long *n_row,
+ SuiteSparse_long *n_col,
+ SuiteSparse_long *nz_udiag,
void *Numeric
) ;
@@ -57,11 +56,11 @@ double int Syntax:
status = umfpack_di_get_lunz (&lnz, &unz, &n_row, &n_col, &nz_udiag,
Numeric) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long status, lnz, unz, n_row, n_col, nz_udiag ;
+ SuiteSparse_long status, lnz, unz, n_row, n_col, nz_udiag ;
status = umfpack_dl_get_lunz (&lnz, &unz, &n_row, &n_col, &nz_udiag,
Numeric) ;
@@ -73,11 +72,11 @@ complex int Syntax:
status = umfpack_zi_get_lunz (&lnz, &unz, &n_row, &n_col, &nz_udiag,
Numeric) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long status, lnz, unz, n_row, n_col, nz_udiag ;
+ SuiteSparse_long status, lnz, unz, n_row, n_col, nz_udiag ;
status = umfpack_zl_get_lunz (&lnz, &unz, &n_row, &n_col, &nz_udiag,
Numeric) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_numeric.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_numeric.h
index 45ba0e6..708608d 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_numeric.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_numeric.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_get_numeric
@@ -24,18 +23,18 @@ int umfpack_di_get_numeric
void *Numeric
) ;
-UF_long umfpack_dl_get_numeric
+SuiteSparse_long umfpack_dl_get_numeric
(
- UF_long Lp [ ],
- UF_long Lj [ ],
+ SuiteSparse_long Lp [ ],
+ SuiteSparse_long Lj [ ],
double Lx [ ],
- UF_long Up [ ],
- UF_long Ui [ ],
+ SuiteSparse_long Up [ ],
+ SuiteSparse_long Ui [ ],
double Ux [ ],
- UF_long P [ ],
- UF_long Q [ ],
+ SuiteSparse_long P [ ],
+ SuiteSparse_long Q [ ],
double Dx [ ],
- UF_long *do_recip,
+ SuiteSparse_long *do_recip,
double Rs [ ],
void *Numeric
) ;
@@ -56,18 +55,18 @@ int umfpack_zi_get_numeric
void *Numeric
) ;
-UF_long umfpack_zl_get_numeric
+SuiteSparse_long umfpack_zl_get_numeric
(
- UF_long Lp [ ],
- UF_long Lj [ ],
+ SuiteSparse_long Lp [ ],
+ SuiteSparse_long Lj [ ],
double Lx [ ], double Lz [ ],
- UF_long Up [ ],
- UF_long Ui [ ],
+ SuiteSparse_long Up [ ],
+ SuiteSparse_long Ui [ ],
double Ux [ ], double Uz [ ],
- UF_long P [ ],
- UF_long Q [ ],
+ SuiteSparse_long P [ ],
+ SuiteSparse_long Q [ ],
double Dx [ ], double Dz [ ],
- UF_long *do_recip,
+ SuiteSparse_long *do_recip,
double Rs [ ],
void *Numeric
) ;
@@ -82,11 +81,11 @@ double int Syntax:
status = umfpack_di_get_numeric (Lp, Lj, Lx, Up, Ui, Ux, P, Q, Dx,
&do_recip, Rs, Numeric) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long *Lp, *Lj, *Up, *Ui, *P, *Q, status, do_recip ;
+ SuiteSparse_long *Lp, *Lj, *Up, *Ui, *P, *Q, status, do_recip ;
double *Lx, *Ux, *Dx, *Rs ;
status = umfpack_dl_get_numeric (Lp, Lj, Lx, Up, Ui, Ux, P, Q, Dx,
&do_recip, Rs, Numeric) ;
@@ -100,16 +99,16 @@ complex int Syntax:
status = umfpack_zi_get_numeric (Lp, Lj, Lx, Lz, Up, Ui, Ux, Uz, P, Q,
Dx, Dz, &do_recip, Rs, Numeric) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long *Lp, *Lj, *Up, *Ui, *P, *Q, status, do_recip ;
+ SuiteSparse_long *Lp, *Lj, *Up, *Ui, *P, *Q, status, do_recip ;
double *Lx, *Lz, *Ux, *Uz, *Dx, *Dz, *Rs ;
status = umfpack_zl_get_numeric (Lp, Lj, Lx, Lz, Up, Ui, Ux, Uz, P, Q,
Dx, Dz, &do_recip, Rs, Numeric) ;
-packed complex int/UF_long Syntax:
+packed complex int/SuiteSparse_long Syntax:
Same as above, except Lz, Uz, and Dz are all NULL.
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_symbolic.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_symbolic.h
index 21b7cc2..8ef3f70 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_symbolic.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_get_symbolic.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_get_symbolic
@@ -28,23 +27,23 @@ int umfpack_di_get_symbolic
void *Symbolic
) ;
-UF_long umfpack_dl_get_symbolic
+SuiteSparse_long umfpack_dl_get_symbolic
(
- UF_long *n_row,
- UF_long *n_col,
- UF_long *n1,
- UF_long *nz,
- UF_long *nfr,
- UF_long *nchains,
- UF_long P [ ],
- UF_long Q [ ],
- UF_long Front_npivcol [ ],
- UF_long Front_parent [ ],
- UF_long Front_1strow [ ],
- UF_long Front_leftmostdesc [ ],
- UF_long Chain_start [ ],
- UF_long Chain_maxrows [ ],
- UF_long Chain_maxcols [ ],
+ SuiteSparse_long *n_row,
+ SuiteSparse_long *n_col,
+ SuiteSparse_long *n1,
+ SuiteSparse_long *nz,
+ SuiteSparse_long *nfr,
+ SuiteSparse_long *nchains,
+ SuiteSparse_long P [ ],
+ SuiteSparse_long Q [ ],
+ SuiteSparse_long Front_npivcol [ ],
+ SuiteSparse_long Front_parent [ ],
+ SuiteSparse_long Front_1strow [ ],
+ SuiteSparse_long Front_leftmostdesc [ ],
+ SuiteSparse_long Chain_start [ ],
+ SuiteSparse_long Chain_maxrows [ ],
+ SuiteSparse_long Chain_maxcols [ ],
void *Symbolic
) ;
@@ -68,23 +67,23 @@ int umfpack_zi_get_symbolic
void *Symbolic
) ;
-UF_long umfpack_zl_get_symbolic
+SuiteSparse_long umfpack_zl_get_symbolic
(
- UF_long *n_row,
- UF_long *n_col,
- UF_long *n1,
- UF_long *nz,
- UF_long *nfr,
- UF_long *nchains,
- UF_long P [ ],
- UF_long Q [ ],
- UF_long Front_npivcol [ ],
- UF_long Front_parent [ ],
- UF_long Front_1strow [ ],
- UF_long Front_leftmostdesc [ ],
- UF_long Chain_start [ ],
- UF_long Chain_maxrows [ ],
- UF_long Chain_maxcols [ ],
+ SuiteSparse_long *n_row,
+ SuiteSparse_long *n_col,
+ SuiteSparse_long *n1,
+ SuiteSparse_long *nz,
+ SuiteSparse_long *nfr,
+ SuiteSparse_long *nchains,
+ SuiteSparse_long P [ ],
+ SuiteSparse_long Q [ ],
+ SuiteSparse_long Front_npivcol [ ],
+ SuiteSparse_long Front_parent [ ],
+ SuiteSparse_long Front_1strow [ ],
+ SuiteSparse_long Front_leftmostdesc [ ],
+ SuiteSparse_long Chain_start [ ],
+ SuiteSparse_long Chain_maxrows [ ],
+ SuiteSparse_long Chain_maxcols [ ],
void *Symbolic
) ;
@@ -102,10 +101,10 @@ double int Syntax:
Front_leftmostdesc, Chain_start, Chain_maxrows, Chain_maxcols,
Symbolic) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status, n_row, n_col, nz, nfr, nchains, *P, *Q,
+ SuiteSparse_long status, n_row, n_col, nz, nfr, nchains, *P, *Q,
*Front_npivcol, *Front_parent, *Front_1strow, *Front_leftmostdesc,
*Chain_start, *Chain_maxrows, *Chain_maxcols ;
void *Symbolic ;
@@ -126,10 +125,10 @@ complex int Syntax:
Front_leftmostdesc, Chain_start, Chain_maxrows, Chain_maxcols,
Symbolic) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status, n_row, n_col, nz, nfr, nchains, *P, *Q,
+ SuiteSparse_long status, n_row, n_col, nz, nfr, nchains, *P, *Q,
*Front_npivcol, *Front_parent, *Front_1strow, *Front_leftmostdesc,
*Chain_start, *Chain_maxrows, *Chain_maxcols ;
void *Symbolic ;
@@ -214,11 +213,9 @@ Arguments:
become a pivot row. If P [k] = i, row i typically will not be the kth
pivot row.
- For the symmetric strategy, P = Q. For the 2-by-2 strategy, P is the
- row permutation that places large entries on the diagonal of P*A*Q.
- If no pivoting occurs during numerical factorization, P [k] = i also
- defines the final permutation of umfpack_*_numeric, for either the
- symmetric or 2-by-2 strategies.
+ For the symmetric strategy, P = Q. If no pivoting occurs during
+ numerical factorization, P [k] = i also defines the final permutation
+ of umfpack_*_numeric, for the symmetric strategy.
Int Q [n_col] ; Output argument.
@@ -227,7 +224,7 @@ Arguments:
not necessarily the same as the final column permutation Q, computed by
umfpack_*_numeric. The numeric factorization may reorder the pivot
columns within each frontal matrix to reduce fill-in. If the matrix is
- structurally singular, and if the symmetric or 2-by-2 strategies or
+ structurally singular, and if the symmetric strategy is
used (or if Control [UMFPACK_FIXQ] > 0), then this Q will be the same
as the final column permutation computed in umfpack_*_numeric.
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_global.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_global.h
index 51c64dd..ba5db82 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_global.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_global.h
@@ -3,20 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
-/* prototypes for global variables, and basic operators for complex values */
-
-#ifndef EXTERN
-#define EXTERN extern
-#endif
-
-EXTERN double (*umfpack_hypot) (double, double) ;
-EXTERN int (*umfpack_divcomplex) (double, double, double, double, double *, double *) ;
-
-double umf_hypot (double x, double y) ;
-int umf_divcomplex (double, double, double, double, double *, double *) ;
-
+ /* moved to SuiteSparse_config */
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_load_numeric.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_load_numeric.h
index 0b84c99..1696b9a 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_load_numeric.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_load_numeric.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_load_numeric
@@ -14,7 +13,7 @@ int umfpack_di_load_numeric
char *filename
) ;
-UF_long umfpack_dl_load_numeric
+SuiteSparse_long umfpack_dl_load_numeric
(
void **Numeric,
char *filename
@@ -26,7 +25,7 @@ int umfpack_zi_load_numeric
char *filename
) ;
-UF_long umfpack_zl_load_numeric
+SuiteSparse_long umfpack_zl_load_numeric
(
void **Numeric,
char *filename
@@ -41,10 +40,10 @@ double int Syntax:
void *Numeric ;
status = umfpack_di_load_numeric (&Numeric, filename) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status ;
+ SuiteSparse_long status ;
char *filename ;
void *Numeric ;
status = umfpack_dl_load_numeric (&Numeric, filename) ;
@@ -57,10 +56,10 @@ complex int Syntax:
void *Numeric ;
status = umfpack_zi_load_numeric (&Numeric, filename) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status ;
+ SuiteSparse_long status ;
char *filename ;
void *Numeric ;
status = umfpack_zl_load_numeric (&Numeric, filename) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_load_symbolic.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_load_symbolic.h
index 8bd5728..e860029 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_load_symbolic.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_load_symbolic.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_load_symbolic
@@ -14,7 +13,7 @@ int umfpack_di_load_symbolic
char *filename
) ;
-UF_long umfpack_dl_load_symbolic
+SuiteSparse_long umfpack_dl_load_symbolic
(
void **Symbolic,
char *filename
@@ -26,7 +25,7 @@ int umfpack_zi_load_symbolic
char *filename
) ;
-UF_long umfpack_zl_load_symbolic
+SuiteSparse_long umfpack_zl_load_symbolic
(
void **Symbolic,
char *filename
@@ -41,10 +40,10 @@ double int Syntax:
void *Symbolic ;
status = umfpack_di_load_symbolic (&Symbolic, filename) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status ;
+ SuiteSparse_long status ;
char *filename ;
void *Symbolic ;
status = umfpack_dl_load_symbolic (&Symbolic, filename) ;
@@ -57,10 +56,10 @@ complex int Syntax:
void *Symbolic ;
status = umfpack_zi_load_symbolic (&Symbolic, filename) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status ;
+ SuiteSparse_long status ;
char *filename ;
void *Symbolic ;
status = umfpack_zl_load_symbolic (&Symbolic, filename) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_numeric.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_numeric.h
index d871ef1..a12447a 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_numeric.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_numeric.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_numeric
@@ -19,10 +18,10 @@ int umfpack_di_numeric
double Info [UMFPACK_INFO]
) ;
-UF_long umfpack_dl_numeric
+SuiteSparse_long umfpack_dl_numeric
(
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ],
void *Symbolic,
void **Numeric,
@@ -41,10 +40,10 @@ int umfpack_zi_numeric
double Info [UMFPACK_INFO]
) ;
-UF_long umfpack_zl_numeric
+SuiteSparse_long umfpack_zl_numeric
(
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ], const double Az [ ],
void *Symbolic,
void **Numeric,
@@ -61,11 +60,11 @@ double int Syntax:
double *Ax, Control [UMFPACK_CONTROL], Info [UMFPACK_INFO] ;
status = umfpack_di_numeric (Ap, Ai, Ax, Symbolic, &Numeric, Control, Info);
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic, *Numeric ;
- UF_long *Ap, *Ai, status ;
+ SuiteSparse_long *Ap, *Ai, status ;
double *Ax, Control [UMFPACK_CONTROL], Info [UMFPACK_INFO] ;
status = umfpack_dl_numeric (Ap, Ai, Ax, Symbolic, &Numeric, Control, Info);
@@ -78,11 +77,11 @@ complex int Syntax:
status = umfpack_zi_numeric (Ap, Ai, Ax, Az, Symbolic, &Numeric,
Control, Info) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic, *Numeric ;
- UF_long *Ap, *Ai, status ;
+ SuiteSparse_long *Ap, *Ai, status ;
double *Ax, *Az, Control [UMFPACK_CONTROL], Info [UMFPACK_INFO] ;
status = umfpack_zl_numeric (Ap, Ai, Ax, Az, Symbolic, &Numeric,
Control, Info) ;
@@ -179,8 +178,8 @@ Arguments:
sqrt (a_real^2 + a_imag^2)).
Control [UMFPACK_SYM_PIVOT_TOLERANCE]:
- If diagonal pivoting is attempted (the symmetric or symmetric-2by2
- strategies are used) then this parameter is used to control when the
+ If diagonal pivoting is attempted (the symmetric
+ strategy is used) then this parameter is used to control when the
diagonal entry is selected in a given pivot column. The absolute
value of the entry must be >= Control [UMFPACK_SYM_PIVOT_TOLERANCE]
times the largest absolute value in the column. A value of zero
@@ -525,7 +524,7 @@ Arguments:
grew larger than its current working array.
Info [UMFPACK_NOFF_DIAG]: number of off-diagonal pivots selected, if the
- symmetric or 2-by-2 strategies are used.
+ symmetric strategy is used.
Info [UMFPACK_NZDROPPED]: the number of entries smaller in absolute
value than Control [UMFPACK_DROPTOL] that were dropped from L and U.
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_qsymbolic.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_qsymbolic.h
index 00f9cd4..f2390a7 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_qsymbolic.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_qsymbolic.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_qsymbolic
@@ -21,14 +20,14 @@ int umfpack_di_qsymbolic
double Info [UMFPACK_INFO]
) ;
-UF_long umfpack_dl_qsymbolic
+SuiteSparse_long umfpack_dl_qsymbolic
(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ],
- const UF_long Qinit [ ],
+ const SuiteSparse_long Qinit [ ],
void **Symbolic,
const double Control [UMFPACK_CONTROL],
double Info [UMFPACK_INFO]
@@ -47,14 +46,99 @@ int umfpack_zi_qsymbolic
double Info [UMFPACK_INFO]
) ;
-UF_long umfpack_zl_qsymbolic
+SuiteSparse_long umfpack_zl_qsymbolic
(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ], const double Az [ ],
- const UF_long Qinit [ ],
+ const SuiteSparse_long Qinit [ ],
+ void **Symbolic,
+ const double Control [UMFPACK_CONTROL],
+ double Info [UMFPACK_INFO]
+) ;
+
+int umfpack_di_fsymbolic
+(
+ int n_row,
+ int n_col,
+ const int Ap [ ],
+ const int Ai [ ],
+ const double Ax [ ],
+
+ /* user-provided ordering function */
+ int (*user_ordering) /* TRUE if OK, FALSE otherwise */
+ (
+ /* inputs, not modified on output */
+ int, /* nrow */
+ int, /* ncol */
+ int, /* sym: if TRUE and nrow==ncol do A+A', else do A'A */
+ int *, /* Ap, size ncol+1 */
+ int *, /* Ai, size nz */
+ /* output */
+ int *, /* size ncol, fill-reducing permutation */
+ /* input/output */
+ void *, /* user_params (ignored by UMFPACK) */
+ double * /* user_info[0..2], optional output for symmetric case.
+ user_info[0]: max column count for L=chol(A+A')
+ user_info[1]: nnz (L)
+ user_info[2]: flop count for chol(A+A'), if A real */
+ ),
+ void *user_params, /* passed to user_ordering function */
+
+ void **Symbolic,
+ const double Control [UMFPACK_CONTROL],
+ double Info [UMFPACK_INFO]
+) ;
+
+SuiteSparse_long umfpack_dl_fsymbolic
+(
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
+ const double Ax [ ],
+
+ int (*user_ordering) (SuiteSparse_long, SuiteSparse_long, SuiteSparse_long,
+ SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *, void *,
+ double *),
+ void *user_params,
+
+ void **Symbolic,
+ const double Control [UMFPACK_CONTROL],
+ double Info [UMFPACK_INFO]
+) ;
+
+int umfpack_zi_fsymbolic
+(
+ int n_row,
+ int n_col,
+ const int Ap [ ],
+ const int Ai [ ],
+ const double Ax [ ], const double Az [ ],
+
+ int (*user_ordering) (int, int, int, int *, int *, int *, void *, double *),
+ void *user_params,
+
+ void **Symbolic,
+ const double Control [UMFPACK_CONTROL],
+ double Info [UMFPACK_INFO]
+) ;
+
+SuiteSparse_long umfpack_zl_fsymbolic
+(
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
+ const double Ax [ ], const double Az [ ],
+
+ int (*user_ordering) (SuiteSparse_long, SuiteSparse_long, SuiteSparse_long,
+ SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *, void *,
+ double *),
+ void *user_params,
+
void **Symbolic,
const double Control [UMFPACK_CONTROL],
double Info [UMFPACK_INFO]
@@ -70,11 +154,11 @@ double int Syntax:
status = umfpack_di_qsymbolic (n_row, n_col, Ap, Ai, Ax, Qinit,
&Symbolic, Control, Info) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic ;
- UF_long n_row, n_col, *Ap, *Ai, *Qinit, status ;
+ SuiteSparse_long n_row, n_col, *Ap, *Ai, *Qinit, status ;
double Control [UMFPACK_CONTROL], Info [UMFPACK_INFO], *Ax ;
status = umfpack_dl_qsymbolic (n_row, n_col, Ap, Ai, Ax, Qinit,
&Symbolic, Control, Info) ;
@@ -88,11 +172,11 @@ complex int Syntax:
status = umfpack_zi_qsymbolic (n_row, n_col, Ap, Ai, Ax, Az, Qinit,
&Symbolic, Control, Info) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic ;
- UF_long n_row, n_col, *Ap, *Ai, *Qinit, status ;
+ SuiteSparse_long n_row, n_col, *Ap, *Ai, *Qinit, status ;
double Control [UMFPACK_CONTROL], Info [UMFPACK_INFO], *Ax, *Az ;
status = umfpack_zl_qsymbolic (n_row, n_col, Ap, Ai, Ax, Az, Qinit,
&Symbolic, Control, Info) ;
@@ -112,10 +196,11 @@ Purpose:
can differ from the final Q found in umfpack_*_numeric. The unsymmetric
strategy will perform a column etree postordering done in
umfpack_*_qsymbolic and sparsity-preserving modifications are made within
- each frontal matrix during umfpack_*_numeric. The symmetric and 2-by-2
- strategies will preserve Qinit, unless the matrix is structurally singular.
+ each frontal matrix during umfpack_*_numeric. The symmetric
+ strategy will preserve Qinit, unless the matrix is structurally singular.
- See umfpack_*_symbolic for more information.
+ See umfpack_*_symbolic for more information. Note that Ax and Ax are
+ optional. The may be NULL.
*** WARNING *** A poor choice of Qinit can easily cause umfpack_*_numeric
to use a huge amount of memory and do a lot of work. The "default" symbolic
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_control.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_control.h
index 361a353..00eae25 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_control.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_control.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
void umfpack_di_report_control
@@ -35,7 +34,7 @@ double int Syntax:
double Control [UMFPACK_CONTROL] ;
umfpack_di_report_control (Control) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
double Control [UMFPACK_CONTROL] ;
@@ -47,7 +46,7 @@ complex int Syntax:
double Control [UMFPACK_CONTROL] ;
umfpack_zi_report_control (Control) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
double Control [UMFPACK_CONTROL] ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_info.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_info.h
index 5822721..23a4ddd 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_info.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_info.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
void umfpack_di_report_info
@@ -39,7 +38,7 @@ double int Syntax:
double Control [UMFPACK_CONTROL], Info [UMFPACK_INFO] ;
umfpack_di_report_info (Control, Info) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
double Control [UMFPACK_CONTROL], Info [UMFPACK_INFO] ;
@@ -51,7 +50,7 @@ complex int Syntax:
double Control [UMFPACK_CONTROL], Info [UMFPACK_INFO] ;
umfpack_zi_report_info (Control, Info) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
double Control [UMFPACK_CONTROL], Info [UMFPACK_INFO] ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_matrix.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_matrix.h
index 0d17e2d..599dbf8 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_matrix.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_matrix.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_report_matrix
@@ -19,14 +18,14 @@ int umfpack_di_report_matrix
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_dl_report_matrix
+SuiteSparse_long umfpack_dl_report_matrix
(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ],
- UF_long col_form,
+ SuiteSparse_long col_form,
const double Control [UMFPACK_CONTROL]
) ;
@@ -41,14 +40,14 @@ int umfpack_zi_report_matrix
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_zl_report_matrix
+SuiteSparse_long umfpack_zl_report_matrix
(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ], const double Az [ ],
- UF_long col_form,
+ SuiteSparse_long col_form,
const double Control [UMFPACK_CONTROL]
) ;
@@ -62,10 +61,10 @@ double int Syntax:
or:
status = umfpack_di_report_matrix (n_row, n_col, Ap, Ai, Ax, 0, Control) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_row, n_col, *Ap, *Ai, status ;
+ SuiteSparse_long n_row, n_col, *Ap, *Ai, status ;
double *Ax, Control [UMFPACK_CONTROL] ;
status = umfpack_dl_report_matrix (n_row, n_col, Ap, Ai, Ax, 1, Control) ;
or:
@@ -82,10 +81,10 @@ or:
status = umfpack_zi_report_matrix (n_row, n_col, Ap, Ai, Ax, Az, 0,
Control) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_row, n_col, *Ap, *Ai, status ;
+ SuiteSparse_long n_row, n_col, *Ap, *Ai, status ;
double *Ax, Control [UMFPACK_CONTROL] ;
status = umfpack_zl_report_matrix (n_row, n_col, Ap, Ai, Ax, Az, 1,
Control) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_numeric.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_numeric.h
index ff4eb11..db3ad30 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_numeric.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_numeric.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_report_numeric
@@ -14,7 +13,7 @@ int umfpack_di_report_numeric
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_dl_report_numeric
+SuiteSparse_long umfpack_dl_report_numeric
(
void *Numeric,
const double Control [UMFPACK_CONTROL]
@@ -26,7 +25,7 @@ int umfpack_zi_report_numeric
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_zl_report_numeric
+SuiteSparse_long umfpack_zl_report_numeric
(
void *Numeric,
const double Control [UMFPACK_CONTROL]
@@ -41,12 +40,12 @@ double int Syntax:
int status ;
status = umfpack_di_report_numeric (Numeric, Control) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
double Control [UMFPACK_CONTROL] ;
- UF_long status ;
+ SuiteSparse_long status ;
status = umfpack_dl_report_numeric (Numeric, Control) ;
complex int Syntax:
@@ -57,12 +56,12 @@ complex int Syntax:
int status ;
status = umfpack_zi_report_numeric (Numeric, Control) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
double Control [UMFPACK_CONTROL] ;
- UF_long status ;
+ SuiteSparse_long status ;
status = umfpack_zl_report_numeric (Numeric, Control) ;
Purpose:
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_perm.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_perm.h
index 4810e32..e1abfc0 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_perm.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_perm.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_report_perm
@@ -15,10 +14,10 @@ int umfpack_di_report_perm
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_dl_report_perm
+SuiteSparse_long umfpack_dl_report_perm
(
- UF_long np,
- const UF_long Perm [ ],
+ SuiteSparse_long np,
+ const SuiteSparse_long Perm [ ],
const double Control [UMFPACK_CONTROL]
) ;
@@ -29,10 +28,10 @@ int umfpack_zi_report_perm
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_zl_report_perm
+SuiteSparse_long umfpack_zl_report_perm
(
- UF_long np,
- const UF_long Perm [ ],
+ SuiteSparse_long np,
+ const SuiteSparse_long Perm [ ],
const double Control [UMFPACK_CONTROL]
) ;
@@ -44,10 +43,10 @@ double int Syntax:
double Control [UMFPACK_CONTROL] ;
status = umfpack_di_report_perm (np, Perm, Control) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long np, *Perm, status ;
+ SuiteSparse_long np, *Perm, status ;
double Control [UMFPACK_CONTROL] ;
status = umfpack_dl_report_perm (np, Perm, Control) ;
@@ -58,10 +57,10 @@ complex int Syntax:
double Control [UMFPACK_CONTROL] ;
status = umfpack_zi_report_perm (np, Perm, Control) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long np, *Perm, status ;
+ SuiteSparse_long np, *Perm, status ;
double Control [UMFPACK_CONTROL] ;
status = umfpack_zl_report_perm (np, Perm, Control) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_status.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_status.h
index 24376ae..58d82d4 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_status.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_status.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
void umfpack_di_report_status
@@ -17,7 +16,7 @@ void umfpack_di_report_status
void umfpack_dl_report_status
(
const double Control [UMFPACK_CONTROL],
- UF_long status
+ SuiteSparse_long status
) ;
void umfpack_zi_report_status
@@ -29,7 +28,7 @@ void umfpack_zi_report_status
void umfpack_zl_report_status
(
const double Control [UMFPACK_CONTROL],
- UF_long status
+ SuiteSparse_long status
) ;
/*
@@ -40,11 +39,11 @@ double int Syntax:
int status ;
umfpack_di_report_status (Control, status) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
double Control [UMFPACK_CONTROL] ;
- UF_long status ;
+ SuiteSparse_long status ;
umfpack_dl_report_status (Control, status) ;
complex int Syntax:
@@ -54,11 +53,11 @@ complex int Syntax:
int status ;
umfpack_zi_report_status (Control, status) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
double Control [UMFPACK_CONTROL] ;
- UF_long status ;
+ SuiteSparse_long status ;
umfpack_zl_report_status (Control, status) ;
Purpose:
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_symbolic.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_symbolic.h
index eb61182..6415ff5 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_symbolic.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_symbolic.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_report_symbolic
@@ -14,7 +13,7 @@ int umfpack_di_report_symbolic
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_dl_report_symbolic
+SuiteSparse_long umfpack_dl_report_symbolic
(
void *Symbolic,
const double Control [UMFPACK_CONTROL]
@@ -26,7 +25,7 @@ int umfpack_zi_report_symbolic
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_zl_report_symbolic
+SuiteSparse_long umfpack_zl_report_symbolic
(
void *Symbolic,
const double Control [UMFPACK_CONTROL]
@@ -41,12 +40,12 @@ double int Syntax:
int status ;
status = umfpack_di_report_symbolic (Symbolic, Control) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic ;
double Control [UMFPACK_CONTROL] ;
- UF_long status ;
+ SuiteSparse_long status ;
status = umfpack_dl_report_symbolic (Symbolic, Control) ;
complex int Syntax:
@@ -57,12 +56,12 @@ complex int Syntax:
int status ;
status = umfpack_zi_report_symbolic (Symbolic, Control) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic ;
double Control [UMFPACK_CONTROL] ;
- UF_long status ;
+ SuiteSparse_long status ;
status = umfpack_zl_report_symbolic (Symbolic, Control) ;
Purpose:
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_triplet.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_triplet.h
index 4e7a605..01b3680 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_triplet.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_triplet.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_report_triplet
@@ -19,13 +18,13 @@ int umfpack_di_report_triplet
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_dl_report_triplet
+SuiteSparse_long umfpack_dl_report_triplet
(
- UF_long n_row,
- UF_long n_col,
- UF_long nz,
- const UF_long Ti [ ],
- const UF_long Tj [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ SuiteSparse_long nz,
+ const SuiteSparse_long Ti [ ],
+ const SuiteSparse_long Tj [ ],
const double Tx [ ],
const double Control [UMFPACK_CONTROL]
) ;
@@ -41,13 +40,13 @@ int umfpack_zi_report_triplet
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_zl_report_triplet
+SuiteSparse_long umfpack_zl_report_triplet
(
- UF_long n_row,
- UF_long n_col,
- UF_long nz,
- const UF_long Ti [ ],
- const UF_long Tj [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ SuiteSparse_long nz,
+ const SuiteSparse_long Ti [ ],
+ const SuiteSparse_long Tj [ ],
const double Tx [ ], const double Tz [ ],
const double Control [UMFPACK_CONTROL]
) ;
@@ -60,10 +59,10 @@ double int Syntax:
double *Tx, Control [UMFPACK_CONTROL] ;
status = umfpack_di_report_triplet (n_row, n_col, nz, Ti, Tj, Tx, Control) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_row, n_col, nz, *Ti, *Tj, status ;
+ SuiteSparse_long n_row, n_col, nz, *Ti, *Tj, status ;
double *Tx, Control [UMFPACK_CONTROL] ;
status = umfpack_dl_report_triplet (n_row, n_col, nz, Ti, Tj, Tx, Control) ;
@@ -75,10 +74,10 @@ complex int Syntax:
status = umfpack_zi_report_triplet (n_row, n_col, nz, Ti, Tj, Tx, Tz,
Control) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_row, n_col, nz, *Ti, *Tj, status ;
+ SuiteSparse_long n_row, n_col, nz, *Ti, *Tj, status ;
double *Tx, *Tz, Control [UMFPACK_CONTROL] ;
status = umfpack_zl_report_triplet (n_row, n_col, nz, Ti, Tj, Tx, Tz,
Control) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_vector.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_vector.h
index 2c4c386..4663107 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_vector.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_report_vector.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_report_vector
@@ -15,9 +14,9 @@ int umfpack_di_report_vector
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_dl_report_vector
+SuiteSparse_long umfpack_dl_report_vector
(
- UF_long n,
+ SuiteSparse_long n,
const double X [ ],
const double Control [UMFPACK_CONTROL]
) ;
@@ -29,9 +28,9 @@ int umfpack_zi_report_vector
const double Control [UMFPACK_CONTROL]
) ;
-UF_long umfpack_zl_report_vector
+SuiteSparse_long umfpack_zl_report_vector
(
- UF_long n,
+ SuiteSparse_long n,
const double Xx [ ], const double Xz [ ],
const double Control [UMFPACK_CONTROL]
) ;
@@ -44,10 +43,10 @@ double int Syntax:
double *X, Control [UMFPACK_CONTROL] ;
status = umfpack_di_report_vector (n, X, Control) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n, status ;
+ SuiteSparse_long n, status ;
double *X, Control [UMFPACK_CONTROL] ;
status = umfpack_dl_report_vector (n, X, Control) ;
@@ -58,10 +57,10 @@ complex int Syntax:
double *Xx, *Xz, Control [UMFPACK_CONTROL] ;
status = umfpack_zi_report_vector (n, Xx, Xz, Control) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n, status ;
+ SuiteSparse_long n, status ;
double *Xx, *Xz, Control [UMFPACK_CONTROL] ;
status = umfpack_zl_report_vector (n, Xx, Xz, Control) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_save_numeric.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_save_numeric.h
index 708e581..af742db 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_save_numeric.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_save_numeric.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_save_numeric
@@ -14,7 +13,7 @@ int umfpack_di_save_numeric
char *filename
) ;
-UF_long umfpack_dl_save_numeric
+SuiteSparse_long umfpack_dl_save_numeric
(
void *Numeric,
char *filename
@@ -26,7 +25,7 @@ int umfpack_zi_save_numeric
char *filename
) ;
-UF_long umfpack_zl_save_numeric
+SuiteSparse_long umfpack_zl_save_numeric
(
void *Numeric,
char *filename
@@ -41,10 +40,10 @@ double int Syntax:
void *Numeric ;
status = umfpack_di_save_numeric (Numeric, filename) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status ;
+ SuiteSparse_long status ;
char *filename ;
void *Numeric ;
status = umfpack_dl_save_numeric (Numeric, filename) ;
@@ -57,10 +56,10 @@ complex int Syntax:
void *Numeric ;
status = umfpack_zi_save_numeric (Numeric, filename) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status ;
+ SuiteSparse_long status ;
char *filename ;
void *Numeric ;
status = umfpack_zl_save_numeric (Numeric, filename) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_save_symbolic.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_save_symbolic.h
index 2dffdd6..79c08a1 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_save_symbolic.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_save_symbolic.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_save_symbolic
@@ -14,7 +13,7 @@ int umfpack_di_save_symbolic
char *filename
) ;
-UF_long umfpack_dl_save_symbolic
+SuiteSparse_long umfpack_dl_save_symbolic
(
void *Symbolic,
char *filename
@@ -26,7 +25,7 @@ int umfpack_zi_save_symbolic
char *filename
) ;
-UF_long umfpack_zl_save_symbolic
+SuiteSparse_long umfpack_zl_save_symbolic
(
void *Symbolic,
char *filename
@@ -41,10 +40,10 @@ double int Syntax:
void *Symbolic ;
status = umfpack_di_save_symbolic (Symbolic, filename) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status ;
+ SuiteSparse_long status ;
char *filename ;
void *Symbolic ;
status = umfpack_dl_save_symbolic (Symbolic, filename) ;
@@ -57,10 +56,10 @@ complex int Syntax:
void *Symbolic ;
status = umfpack_zi_save_symbolic (Symbolic, filename) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long status ;
+ SuiteSparse_long status ;
char *filename ;
void *Symbolic ;
status = umfpack_zl_save_symbolic (Symbolic, filename) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_scale.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_scale.h
index 62fc32a..7cc163f 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_scale.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_scale.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_scale
@@ -15,7 +14,7 @@ int umfpack_di_scale
void *Numeric
) ;
-UF_long umfpack_dl_scale
+SuiteSparse_long umfpack_dl_scale
(
double X [ ],
const double B [ ],
@@ -29,7 +28,7 @@ int umfpack_zi_scale
void *Numeric
) ;
-UF_long umfpack_zl_scale
+SuiteSparse_long umfpack_zl_scale
(
double Xx [ ], double Xz [ ],
const double Bx [ ], const double Bz [ ],
@@ -44,7 +43,7 @@ double int Syntax:
double *B, *X ;
status = umfpack_di_scale (X, B, Numeric) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
@@ -58,7 +57,7 @@ complex int Syntax:
double *Bx, *Bz, *Xx, *Xz ;
status = umfpack_zi_scale (Xx, Xz, Bx, Bz, Numeric) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_solve.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_solve.h
index 0932091..fe22b67 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_solve.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_solve.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_solve
@@ -21,11 +20,11 @@ int umfpack_di_solve
double Info [UMFPACK_INFO]
) ;
-UF_long umfpack_dl_solve
+SuiteSparse_long umfpack_dl_solve
(
- UF_long sys,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long sys,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ],
double X [ ],
const double B [ ],
@@ -47,11 +46,11 @@ int umfpack_zi_solve
double Info [UMFPACK_INFO]
) ;
-UF_long umfpack_zl_solve
+SuiteSparse_long umfpack_zl_solve
(
- UF_long sys,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long sys,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ], const double Az [ ],
double Xx [ ], double Xz [ ],
const double Bx [ ], const double Bz [ ],
@@ -69,11 +68,11 @@ double int Syntax:
double *B, *X, *Ax, Info [UMFPACK_INFO], Control [UMFPACK_CONTROL] ;
status = umfpack_di_solve (sys, Ap, Ai, Ax, X, B, Numeric, Control, Info) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long status, *Ap, *Ai, sys ;
+ SuiteSparse_long status, *Ap, *Ai, sys ;
double *B, *X, *Ax, Info [UMFPACK_INFO], Control [UMFPACK_CONTROL] ;
status = umfpack_dl_solve (sys, Ap, Ai, Ax, X, B, Numeric, Control, Info) ;
@@ -87,11 +86,11 @@ complex int Syntax:
status = umfpack_zi_solve (sys, Ap, Ai, Ax, Az, Xx, Xz, Bx, Bz, Numeric,
Control, Info) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long status, *Ap, *Ai, sys ;
+ SuiteSparse_long status, *Ap, *Ai, sys ;
double *Bx, *Bz, *Xx, *Xz, *Ax, *Az, Info [UMFPACK_INFO],
Control [UMFPACK_CONTROL] ;
status = umfpack_zl_solve (sys, Ap, Ai, Ax, Az, Xx, Xz, Bx, Bz, Numeric,
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_symbolic.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_symbolic.h
index 9023ff3..3cf8216 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_symbolic.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_symbolic.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_symbolic
@@ -20,12 +19,12 @@ int umfpack_di_symbolic
double Info [UMFPACK_INFO]
) ;
-UF_long umfpack_dl_symbolic
+SuiteSparse_long umfpack_dl_symbolic
(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ],
void **Symbolic,
const double Control [UMFPACK_CONTROL],
@@ -44,12 +43,12 @@ int umfpack_zi_symbolic
double Info [UMFPACK_INFO]
) ;
-UF_long umfpack_zl_symbolic
+SuiteSparse_long umfpack_zl_symbolic
(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ], const double Az [ ],
void **Symbolic,
const double Control [UMFPACK_CONTROL],
@@ -66,11 +65,11 @@ double int Syntax:
status = umfpack_di_symbolic (n_row, n_col, Ap, Ai, Ax,
&Symbolic, Control, Info) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic ;
- UF_long n_row, n_col, *Ap, *Ai, status ;
+ SuiteSparse_long n_row, n_col, *Ap, *Ai, status ;
double Control [UMFPACK_CONTROL], Info [UMFPACK_INFO], *Ax ;
status = umfpack_dl_symbolic (n_row, n_col, Ap, Ai, Ax,
&Symbolic, Control, Info) ;
@@ -84,11 +83,11 @@ complex int Syntax:
status = umfpack_zi_symbolic (n_row, n_col, Ap, Ai, Ax, Az,
&Symbolic, Control, Info) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Symbolic ;
- UF_long n_row, n_col, *Ap, *Ai, status ;
+ SuiteSparse_long n_row, n_col, *Ap, *Ai, status ;
double Control [UMFPACK_CONTROL], Info [UMFPACK_INFO], *Ax, *Az ;
status = umfpack_zl_symbolic (n_row, n_col, Ap, Ai, Ax, Az,
&Symbolic, Control, Info) ;
@@ -101,10 +100,11 @@ Purpose:
Given nonzero pattern of a sparse matrix A in column-oriented form,
umfpack_*_symbolic performs a column pre-ordering to reduce fill-in
- (using COLAMD or AMD) and a symbolic factorization. This is required
+ (using COLAMD, AMD or METIS) and a symbolic factorization. This is required
before the matrix can be numerically factorized with umfpack_*_numeric.
- If you wish to bypass the COLAMD or AMD pre-ordering and provide your own
- ordering, use umfpack_*_qsymbolic instead.
+ If you wish to bypass the COLAMD/AMD/METIS pre-ordering and provide your own
+ ordering, use umfpack_*_qsymbolic instead. If you wish to pass in a
+ pointer to a user-provided ordering function, use umfpack_*_fsymbolic.
Since umfpack_*_symbolic and umfpack_*_qsymbolic are very similar, options
for both routines are discussed below.
@@ -147,20 +147,18 @@ Arguments:
and sum up the duplicate entries. See umfpack_*_report_matrix for how
to print the matrix A.
- double Ax [nz] ; Optional input argument, not modified.
+ double Ax [nz] ; Optional input argument, not modified. May be NULL.
Size 2*nz for packed complex case.
The numerical values of the sparse matrix A. The nonzero pattern (row
indices) for column j is stored in Ai [(Ap [j]) ... (Ap [j+1]-1)], and
the corresponding numerical values are stored in
- Ax [(Ap [j]) ... (Ap [j+1]-1)]. Used only by the 2-by-2 strategy to
- determine whether entries are "large" or "small". You do not have to
- pass the same numerical values to umfpack_*_numeric. If Ax is not
- present (a (double *) NULL pointer), then any entry in A is assumed to
- be "large".
+ Ax [(Ap [j]) ... (Ap [j+1]-1)]. Used only for gathering statistics
+ about how many nonzeros are placed on the diagonal by the fill-reducing
+ ordering.
double Az [nz] ; Optional input argument, not modified, for complex
- versions.
+ versions. May be NULL.
For the complex versions, this holds the imaginary part of A. The
imaginary part of column j is held in Az [(Ap [j]) ... (Ap [j+1]-1)].
@@ -169,7 +167,7 @@ Arguments:
and imaginary parts are contained in Ax[0..2*nz-1], with Ax[2*k]
and Ax[2*k+1] being the real and imaginary part of the kth entry.
- Used by the 2-by-2 strategy only. See the description of Ax, above.
+ Used for statistics only. See the description of Ax, above.
void **Symbolic ; Output argument.
@@ -226,8 +224,17 @@ Arguments:
[UMFPACK_PIVOT_TOLERANCE] (default 0.1) times the largest entry
in its column.
- UMFPACK_STRATEGY_2BY2: disabled (exists in earlier versions)
- If requested, the symmetric strategy is used instead.
+ Control [UMFPACK_ORDERING]: The ordering method to use:
+ UMFPACK_ORDERING_CHOLMOD try AMD/COLAMD, then METIS if needed
+ UMFPACK_ORDERING_AMD just AMD or COLAMD
+ UMFPACK_ORDERING_GIVEN just Qinit (umfpack_*_qsymbolic only)
+ UMFPACK_ORDERING_NONE no fill-reducing ordering
+ UMFPACK_ORDERING_METIS just METIS(A+A') or METIS(A'A)
+ UMFPACK_ORDERING_BEST try AMD/COLAMD, METIS, and NESDIS
+ UMFPACK_ORDERING_USER just user function (*_fsymbolic only)
+
+ Control [UMFPACK_SINGLETONS]: If false (0), then singletons are
+ not removed prior to factorization. Default: true (1).
Control [UMFPACK_DENSE_COL]:
If COLAMD is used, columns with more than
@@ -253,11 +260,6 @@ Arguments:
Assuming the block size is large enough (8 or so), this parameter
has a modest effect on performance.
- Control [UMFPACK_2BY2_TOLERANCE]: no longer used
-
- Control [UMFPACK_SCALE]: See umfpack_numeric.h for a description.
- Only affects the 2-by-2 strategy. Default: UMFPACK_SCALE_SUM.
-
Control [UMFPACK_FIXQ]: If > 0, then the pre-ordering Q is not modified
during numeric factorization. If < 0, then Q may be modified. If
zero, then this is controlled automatically (the unsymmetric
@@ -309,7 +311,7 @@ Arguments:
UMFPACK_ERROR_internal_error
Something very serious went wrong. This is a bug.
- Please contact the author (davis at cise.ufl.edu).
+ Please contact the author (DrTimothyAldenDavis at gmail.com).
Info [UMFPACK_NROW]: the value of the input argument n_row.
@@ -323,7 +325,7 @@ Arguments:
Info [UMFPACK_SIZE_OF_INT]: the number of bytes in an int.
- Info [UMFPACK_SIZE_OF_LONG]: the number of bytes in a UF_long.
+ Info [UMFPACK_SIZE_OF_LONG]: the number of bytes in a SuiteSparse_long.
Info [UMFPACK_SIZE_OF_POINTER]: the number of bytes in a void *
pointer.
@@ -391,7 +393,7 @@ Arguments:
umfpack_*_symbolic (Info [UMFPACK_SYMBOLIC_PEAK_MEMORY]). The
count includes the size of both the Symbolic and Numeric objects
themselves. It can be a very loose upper bound, particularly when
- the symmetric or 2-by-2 strategies are used.
+ the symmetric strategy is used.
Info [UMFPACK_FLOPS_ESTIMATE]: an estimate of the total floating-point
operations required to factorize the matrix. This is a "true"
@@ -440,8 +442,11 @@ Arguments:
UMFPACK_STRATEGY_SYMMETRIC or UMFPACK_STRATEGY_UNSYMMETRIC
Info [UMFPACK_ORDERING_USED]: The ordering method used:
- UMFPACK_ORDERING_COLAMD or UMFPACK_ORDERING_AMD. It can be
- UMFPACK_ORDERING_GIVEN for umfpack_*_qsymbolic.
+ UMFPACK_ORDERING_AMD
+ UMFPACK_ORDERING_GIVEN
+ UMFPACK_ORDERING_NONE
+ UMFPACK_ORDERING_METIS
+ UMFPACK_ORDERING_USER
Info [UMFPACK_QFIXED]: 1 if the column pre-ordering will be refined
during numerical factorization, 0 if not.
@@ -493,7 +498,7 @@ Arguments:
pattern of the matrix is symmetric, this is normally a lower bound
on the floating-point operation count in the actual numerical
factorization, for matrices that fit the criteria for the symmetric
- or 2-by-2 strategies
+ strategy.
Info [UMFPACK_SYMMETRIC_NDENSE]: The number of "dense" rows/columns of
S+S' that were ignored during the AMD ordering. These are placed
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_tictoc.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_tictoc.h
index da10426..b79f7c2 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_tictoc.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_tictoc.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
void umfpack_tic (double stats [2]) ;
@@ -24,10 +23,8 @@ Syntax (for all versions: di, dl, zi, and zl):
Purpose:
- umfpack_tic returns the CPU time and wall clock time used by the process.
- The CPU time includes both "user" and "system" time (the latter is time
- spent by the system on behalf of the process, and is thus charged to the
- process). umfpack_toc returns the CPU time and wall clock time since the
+ umfpack_tic returns the wall clock time.
+ umfpack_toc returns the wall clock time since the
last call to umfpack_tic with the same stats array.
Typical usage:
@@ -36,25 +33,13 @@ Purpose:
... do some work ...
umfpack_toc (stats) ;
- then stats [1] contains the time in seconds used by the code between
- umfpack_tic and umfpack_toc, and stats [0] contains the wall clock time
- elapsed between the umfpack_tic and umfpack_toc. These two routines act
- just like tic and toc in MATLAB, except that the both process time and
- wall clock time are returned.
-
- This routine normally uses the sysconf and times routines in the POSIX
- standard. If -DNPOSIX is defined at compile time, then the ANSI C clock
- routine is used instead, and only the CPU time is returned (stats [0]
- is set to zero).
-
- umfpack_tic and umfpack_toc are the routines used internally in UMFPACK
- to time the symbolic analysis, numerical factorization, and the forward/
- backward solve.
+ then stats [0] contains the elapsed wall clock time in seconds between
+ umfpack_tic and umfpack_toc.
Arguments:
double stats [2]:
stats [0]: wall clock time, in seconds
- stats [1]: CPU time, in seconds
+ stats [1]: (same; was CPU time in prior versions)
*/
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_timer.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_timer.h
index 413a177..44e16df 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_timer.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_timer.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
double umfpack_timer ( void ) ;
@@ -19,19 +18,7 @@ Syntax (for all versions: di, dl, zi, and zl):
Purpose:
- Returns the CPU time used by the process. Includes both "user" and "system"
- time (the latter is time spent by the system on behalf of the process, and
- is thus charged to the process). It does not return the wall clock time.
- See umfpack_tic and umfpack_toc (the file umfpack_tictoc.h) for the timer
- used internally by UMFPACK.
-
- This routine uses the Unix getrusage routine, if available. It is less
- subject to overflow than the ANSI C clock routine. If getrusage is not
- available, the portable ANSI C clock routine is used instead.
- Unfortunately, clock ( ) overflows if the CPU time exceeds 2147 seconds
- (about 36 minutes) when sizeof (clock_t) is 4 bytes. If you have getrusage,
- be sure to compile UMFPACK with the -DGETRUSAGE flag set; see umf_config.h
- and the User Guide for details. Even the getrusage routine can overlow.
+ Returns the current wall clock time on POSIX C 1993 systems.
Arguments:
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_transpose.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_transpose.h
index b12bb0b..3cdfd2e 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_transpose.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_transpose.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_transpose
@@ -22,17 +21,17 @@ int umfpack_di_transpose
double Rx [ ]
) ;
-UF_long umfpack_dl_transpose
+SuiteSparse_long umfpack_dl_transpose
(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ],
- const UF_long P [ ],
- const UF_long Q [ ],
- UF_long Rp [ ],
- UF_long Ri [ ],
+ const SuiteSparse_long P [ ],
+ const SuiteSparse_long Q [ ],
+ SuiteSparse_long Rp [ ],
+ SuiteSparse_long Ri [ ],
double Rx [ ]
) ;
@@ -51,19 +50,19 @@ int umfpack_zi_transpose
int do_conjugate
) ;
-UF_long umfpack_zl_transpose
+SuiteSparse_long umfpack_zl_transpose
(
- UF_long n_row,
- UF_long n_col,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ], const double Az [ ],
- const UF_long P [ ],
- const UF_long Q [ ],
- UF_long Rp [ ],
- UF_long Ri [ ],
+ const SuiteSparse_long P [ ],
+ const SuiteSparse_long Q [ ],
+ SuiteSparse_long Rp [ ],
+ SuiteSparse_long Ri [ ],
double Rx [ ], double Rz [ ],
- UF_long do_conjugate
+ SuiteSparse_long do_conjugate
) ;
/*
@@ -74,10 +73,10 @@ double int Syntax:
double *Ax, *Rx ;
status = umfpack_di_transpose (n_row, n_col, Ap, Ai, Ax, P, Q, Rp, Ri, Rx) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_row, n_col, status, *Ap, *Ai, *P, *Q, *Rp, *Ri ;
+ SuiteSparse_long n_row, n_col, status, *Ap, *Ai, *P, *Q, *Rp, *Ri ;
double *Ax, *Rx ;
status = umfpack_dl_transpose (n_row, n_col, Ap, Ai, Ax, P, Q, Rp, Ri, Rx) ;
@@ -89,10 +88,10 @@ complex int Syntax:
status = umfpack_zi_transpose (n_row, n_col, Ap, Ai, Ax, Az, P, Q,
Rp, Ri, Rx, Rz, do_conjugate) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_row, n_col, status, *Ap, *Ai, *P, *Q, *Rp, *Ri, do_conjugate ;
+ SuiteSparse_long n_row, n_col, status, *Ap, *Ai, *P, *Q, *Rp, *Ri, do_conjugate ;
double *Ax, *Az, *Rx, *Rz ;
status = umfpack_zl_transpose (n_row, n_col, Ap, Ai, Ax, Az, P, Q,
Rp, Ri, Rx, Rz, do_conjugate) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_triplet_to_col.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_triplet_to_col.h
index cb45278..308dc34 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_triplet_to_col.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_triplet_to_col.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_triplet_to_col
@@ -22,18 +21,18 @@ int umfpack_di_triplet_to_col
int Map [ ]
) ;
-UF_long umfpack_dl_triplet_to_col
+SuiteSparse_long umfpack_dl_triplet_to_col
(
- UF_long n_row,
- UF_long n_col,
- UF_long nz,
- const UF_long Ti [ ],
- const UF_long Tj [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ SuiteSparse_long nz,
+ const SuiteSparse_long Ti [ ],
+ const SuiteSparse_long Tj [ ],
const double Tx [ ],
- UF_long Ap [ ],
- UF_long Ai [ ],
+ SuiteSparse_long Ap [ ],
+ SuiteSparse_long Ai [ ],
double Ax [ ],
- UF_long Map [ ]
+ SuiteSparse_long Map [ ]
) ;
int umfpack_zi_triplet_to_col
@@ -50,18 +49,18 @@ int umfpack_zi_triplet_to_col
int Map [ ]
) ;
-UF_long umfpack_zl_triplet_to_col
+SuiteSparse_long umfpack_zl_triplet_to_col
(
- UF_long n_row,
- UF_long n_col,
- UF_long nz,
- const UF_long Ti [ ],
- const UF_long Tj [ ],
+ SuiteSparse_long n_row,
+ SuiteSparse_long n_col,
+ SuiteSparse_long nz,
+ const SuiteSparse_long Ti [ ],
+ const SuiteSparse_long Tj [ ],
const double Tx [ ], const double Tz [ ],
- UF_long Ap [ ],
- UF_long Ai [ ],
+ SuiteSparse_long Ap [ ],
+ SuiteSparse_long Ai [ ],
double Ax [ ], double Az [ ],
- UF_long Map [ ]
+ SuiteSparse_long Map [ ]
) ;
/*
@@ -73,10 +72,10 @@ double int Syntax:
status = umfpack_di_triplet_to_col (n_row, n_col, nz, Ti, Tj, Tx,
Ap, Ai, Ax, Map) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_row, n_col, nz, *Ti, *Tj, *Ap, *Ai, status, *Map ;
+ SuiteSparse_long n_row, n_col, nz, *Ti, *Tj, *Ap, *Ai, status, *Map ;
double *Tx, *Ax ;
status = umfpack_dl_triplet_to_col (n_row, n_col, nz, Ti, Tj, Tx,
Ap, Ai, Ax, Map) ;
@@ -89,10 +88,10 @@ complex int Syntax:
status = umfpack_zi_triplet_to_col (n_row, n_col, nz, Ti, Tj, Tx, Tz,
Ap, Ai, Ax, Az, Map) ;
-UF_long Syntax:
+SuiteSparse_long Syntax:
#include "umfpack.h"
- UF_long n_row, n_col, nz, *Ti, *Tj, *Ap, *Ai, status, *Map ;
+ SuiteSparse_long n_row, n_col, nz, *Ti, *Tj, *Ap, *Ai, status, *Map ;
double *Tx, *Tz, *Ax, *Az ;
status = umfpack_zl_triplet_to_col (n_row, n_col, nz, Ti, Tj, Tx, Tz,
Ap, Ai, Ax, Az, Map) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Include/umfpack_wsolve.h b/src/C/SuiteSparse/UMFPACK/Include/umfpack_wsolve.h
index 38d15ba..cc64101 100644
--- a/src/C/SuiteSparse/UMFPACK/Include/umfpack_wsolve.h
+++ b/src/C/SuiteSparse/UMFPACK/Include/umfpack_wsolve.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
int umfpack_di_wsolve
@@ -23,18 +22,18 @@ int umfpack_di_wsolve
double W [ ]
) ;
-UF_long umfpack_dl_wsolve
+SuiteSparse_long umfpack_dl_wsolve
(
- UF_long sys,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long sys,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ],
double X [ ],
const double B [ ],
void *Numeric,
const double Control [UMFPACK_CONTROL],
double Info [UMFPACK_INFO],
- UF_long Wi [ ],
+ SuiteSparse_long Wi [ ],
double W [ ]
) ;
@@ -53,18 +52,18 @@ int umfpack_zi_wsolve
double W [ ]
) ;
-UF_long umfpack_zl_wsolve
+SuiteSparse_long umfpack_zl_wsolve
(
- UF_long sys,
- const UF_long Ap [ ],
- const UF_long Ai [ ],
+ SuiteSparse_long sys,
+ const SuiteSparse_long Ap [ ],
+ const SuiteSparse_long Ai [ ],
const double Ax [ ], const double Az [ ],
double Xx [ ], double Xz [ ],
const double Bx [ ], const double Bz [ ],
void *Numeric,
const double Control [UMFPACK_CONTROL],
double Info [UMFPACK_INFO],
- UF_long Wi [ ],
+ SuiteSparse_long Wi [ ],
double W [ ]
) ;
@@ -78,11 +77,11 @@ double int Syntax:
status = umfpack_di_wsolve (sys, Ap, Ai, Ax, X, B, Numeric,
Control, Info, Wi, W) ;
-double UF_long Syntax:
+double SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long status, *Ap, *Ai, *Wi, sys ;
+ SuiteSparse_long status, *Ap, *Ai, *Wi, sys ;
double *B, *X, *Ax, *W, Info [UMFPACK_INFO], Control [UMFPACK_CONTROL] ;
status = umfpack_dl_wsolve (sys, Ap, Ai, Ax, X, B, Numeric,
Control, Info, Wi, W) ;
@@ -97,11 +96,11 @@ complex int Syntax:
status = umfpack_zi_wsolve (sys, Ap, Ai, Ax, Az, Xx, Xz, Bx, Bz, Numeric,
Control, Info, Wi, W) ;
-complex UF_long Syntax:
+complex SuiteSparse_long Syntax:
#include "umfpack.h"
void *Numeric ;
- UF_long status, *Ap, *Ai, *Wi, sys ;
+ SuiteSparse_long status, *Ap, *Ai, *Wi, sys ;
double *Bx, *Bz, *Xx, *Xz, *Ax, *Az, *W,
Info [UMFPACK_INFO], Control [UMFPACK_CONTROL] ;
status = umfpack_zl_wsolve (sys, Ap, Ai, Ax, Az, Xx, Xz, Bx, Bz, Numeric,
diff --git a/src/C/SuiteSparse/UMFPACK/Lib/GNUmakefile b/src/C/SuiteSparse/UMFPACK/Lib/GNUmakefile
index c6ec318..c5d7235 100644
--- a/src/C/SuiteSparse/UMFPACK/Lib/GNUmakefile
+++ b/src/C/SuiteSparse/UMFPACK/Lib/GNUmakefile
@@ -2,12 +2,19 @@
# UMFPACK Makefile for compiling on Unix systems (for GNU Make)
#-------------------------------------------------------------------------------
-default: ../Lib/libumfpack.a
+default: libumfpack.a
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
-C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) \
- -I../Include -I../Source -I../../AMD/Include -I../../UFconfig
+# UMFPACK can use CHOLMOD by default as an ordering option
+ifneq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
+ I = -I../Include -I../Source -I../../AMD/Include -I../../SuiteSparse_config
+else
+ I = -I../Include -I../Source -I../../AMD/Include \
+ -I../../SuiteSparse_config -I../../CHOLMOD/Include
+endif
+
+C = $(CC) $(CF) $(UMFPACK_CONFIG) $(I)
#-------------------------------------------------------------------------------
# source files
@@ -23,24 +30,26 @@ UMFCH = umf_assemble umf_blas3_update umf_build_tuples umf_create_element \
umf_report_vector umf_row_search umf_scale_column \
umf_set_stats umf_solve umf_symbolic_usage umf_transpose \
umf_tuple_lengths umf_usolve umf_utsolve umf_valid_numeric \
- umf_valid_symbolic umf_grow_front umf_start_front umf_2by2 \
+ umf_valid_symbolic umf_grow_front umf_start_front \
umf_store_lu umf_scale
-# non-user-callable umf_*.[ch] files, int/UF_long versions only (no real/complex):
+# non-user-callable umf_*.[ch] files, int/SuiteSparse_long versions only
+# (no real/complex):
UMFINT = umf_analyze umf_apply_order umf_colamd umf_free umf_fsize \
umf_is_permutation umf_malloc umf_realloc umf_report_perm \
- umf_singletons
+ umf_singletons umf_cholmod
# non-user-callable, created from umf_ltsolve.c, umf_utsolve.c,
-# umf_triplet.c, and umf_assemble.c , with int/UF_long and real/complex versions:
+# umf_triplet.c, and umf_assemble.c , with int/SuiteSparse_long
+# and real/complex versions:
UMF_CREATED = umf_lhsolve umf_uhsolve umf_triplet_map_nox \
umf_triplet_nomap_x umf_triplet_nomap_nox umf_triplet_map_x \
umf_assemble_fixq umf_store_lu_drop
-# non-user-callable, int/UF_long and real/complex versions:
+# non-user-callable, int/SuiteSparse_long and real/complex versions:
UMF = $(UMF_CREATED) $(UMFCH)
-# user-callable umfpack_*.[ch] files (int/UF_long and real/complex):
+# user-callable umfpack_*.[ch] files (int/SuiteSparse_long and real/complex):
UMFPACK = umfpack_col_to_triplet umfpack_defaults umfpack_free_numeric \
umfpack_free_symbolic umfpack_get_numeric umfpack_get_lunz \
umfpack_get_symbolic umfpack_get_determinant umfpack_numeric \
@@ -53,19 +62,20 @@ UMFPACK = umfpack_col_to_triplet umfpack_defaults umfpack_free_numeric \
umfpack_load_symbolic umfpack_save_symbolic
# user-callable, created from umfpack_solve.c (umfpack_wsolve.h exists, though):
-# with int/UF_long and real/complex versions:
+# with int/SuiteSparse_long and real/complex versions:
UMFPACKW = umfpack_wsolve
USER = $(UMFPACKW) $(UMFPACK)
-# user-callable, only one version for int/UF_long, real/complex, *.[ch] files:
-GENERIC = umfpack_timer umfpack_tictoc umfpack_global
+# user-callable, only one version for int/SuiteSparse_long,
+# real/complex, *.[ch] files:
+GENERIC = umfpack_timer umfpack_tictoc
#-------------------------------------------------------------------------------
# include files:
#-------------------------------------------------------------------------------
-INC = ../Include/umfpack.h ../../UFconfig/UFconfig.h \
+INC = ../Include/umfpack.h ../../SuiteSparse_config/SuiteSparse_config.h \
../Source/umf_config.h ../Source/umf_version.h \
../Source/umf_internal.h ../Source/umf_triplet.h \
$(addprefix ../Source/, $(addsuffix .h,$(UMFCH))) \
@@ -87,7 +97,7 @@ LL = $(addsuffix .o, $(subst umf_,umf_l_,$(UMFINT)))
GN = $(addsuffix .o, $(subst umfpack_,umfpack_gn_,$(GENERIC)))
#-------------------------------------------------------------------------------
-# compile each int and UF_long routine (with no real/complex version)
+# compile each int and SuiteSparse_long routine (with no real/complex version)
#-------------------------------------------------------------------------------
umf_i_%.o: ../Source/umf_%.c $(INC)
@@ -240,12 +250,12 @@ umfpack_gn_%.o: ../Source/umfpack_%.c $(INC)
$(C) -c $< -o $@
#-------------------------------------------------------------------------------
-# Create the ../Lib/libumfpack.a library
+# Create the libumfpack.a library
#-------------------------------------------------------------------------------
-../Lib/libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
- $(AR) ../Lib/libumfpack.a $^
- - $(RANLIB) ../Lib/libumfpack.a
+libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
+ $(ARCHIVE) libumfpack.a $^
+ - $(RANLIB) libumfpack.a
so: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
gcc -shared -Wl,-soname,libumfpack.so -o libumfpack.so $^
@@ -255,7 +265,7 @@ so: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
#-------------------------------------------------------------------------------
purge: clean
- - $(RM) ../Lib/libumfpack.a
+ - $(RM) libumfpack.a
clean:
- $(RM) $(CLEAN)
diff --git a/src/C/SuiteSparse/UMFPACK/Lib/Makefile b/src/C/SuiteSparse/UMFPACK/Lib/Makefile
index 8444719..f9cb0ea 100644
--- a/src/C/SuiteSparse/UMFPACK/Lib/Makefile
+++ b/src/C/SuiteSparse/UMFPACK/Lib/Makefile
@@ -8,16 +8,17 @@
default: everything
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
-C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
- -I../Source
+C = $(CC) $(CF) $(UMFPACK_CONFIG) \
+ -I../Include -I../Source -I../../AMD/Include -I../../SuiteSparse_config \
+ -I../../CHOLMOD/Include
everything:
- $(C) -c ../Source/umfpack_global.c -o umfpack_gn_global.o
$(C) -DDINT -c ../Source/umf_analyze.c -o umf_i_analyze.o
$(C) -DDINT -c ../Source/umf_apply_order.c -o umf_i_apply_order.o
$(C) -DDINT -c ../Source/umf_colamd.c -o umf_i_colamd.o
+ $(C) -DDINT -c ../Source/umf_cholmod.c -o umf_i_cholmod.o
$(C) -DDINT -c ../Source/umf_free.c -o umf_i_free.o
$(C) -DDINT -c ../Source/umf_fsize.c -o umf_i_fsize.o
$(C) -DDINT -c ../Source/umf_is_permutation.c -o umf_i_is_permutation.o
@@ -28,6 +29,7 @@ everything:
$(C) -DDLONG -c ../Source/umf_analyze.c -o umf_l_analyze.o
$(C) -DDLONG -c ../Source/umf_apply_order.c -o umf_l_apply_order.o
$(C) -DDLONG -c ../Source/umf_colamd.c -o umf_l_colamd.o
+ $(C) -DDLONG -c ../Source/umf_cholmod.c -o umf_l_cholmod.o
$(C) -DDLONG -c ../Source/umf_free.c -o umf_l_free.o
$(C) -DDLONG -c ../Source/umf_fsize.c -o umf_l_fsize.o
$(C) -DDLONG -c ../Source/umf_is_permutation.c -o umf_l_is_permutation.o
@@ -79,7 +81,6 @@ everything:
$(C) -DDINT -c ../Source/umf_valid_symbolic.c -o umf_di_valid_symbolic.o
$(C) -DDINT -c ../Source/umf_grow_front.c -o umf_di_grow_front.o
$(C) -DDINT -c ../Source/umf_start_front.c -o umf_di_start_front.o
- $(C) -DDINT -c ../Source/umf_2by2.c -o umf_di_2by2.o
$(C) -DDINT -c ../Source/umf_store_lu.c -o umf_di_store_lu.o
$(C) -DDINT -c ../Source/umf_scale.c -o umf_di_scale.o
$(C) -DDINT -DWSOLVE -c ../Source/umfpack_solve.c -o umfpack_di_wsolve.o
@@ -153,7 +154,6 @@ everything:
$(C) -DDLONG -c ../Source/umf_valid_symbolic.c -o umf_dl_valid_symbolic.o
$(C) -DDLONG -c ../Source/umf_grow_front.c -o umf_dl_grow_front.o
$(C) -DDLONG -c ../Source/umf_start_front.c -o umf_dl_start_front.o
- $(C) -DDLONG -c ../Source/umf_2by2.c -o umf_dl_2by2.o
$(C) -DDLONG -c ../Source/umf_store_lu.c -o umf_dl_store_lu.o
$(C) -DDLONG -c ../Source/umf_scale.c -o umf_dl_scale.o
$(C) -DDLONG -DWSOLVE -c ../Source/umfpack_solve.c -o umfpack_dl_wsolve.o
@@ -227,7 +227,6 @@ everything:
$(C) -DZINT -c ../Source/umf_valid_symbolic.c -o umf_zi_valid_symbolic.o
$(C) -DZINT -c ../Source/umf_grow_front.c -o umf_zi_grow_front.o
$(C) -DZINT -c ../Source/umf_start_front.c -o umf_zi_start_front.o
- $(C) -DZINT -c ../Source/umf_2by2.c -o umf_zi_2by2.o
$(C) -DZINT -c ../Source/umf_store_lu.c -o umf_zi_store_lu.o
$(C) -DZINT -c ../Source/umf_scale.c -o umf_zi_scale.o
$(C) -DZINT -DWSOLVE -c ../Source/umfpack_solve.c -o umfpack_zi_wsolve.o
@@ -301,7 +300,6 @@ everything:
$(C) -DZLONG -c ../Source/umf_valid_symbolic.c -o umf_zl_valid_symbolic.o
$(C) -DZLONG -c ../Source/umf_grow_front.c -o umf_zl_grow_front.o
$(C) -DZLONG -c ../Source/umf_start_front.c -o umf_zl_start_front.o
- $(C) -DZLONG -c ../Source/umf_2by2.c -o umf_zl_2by2.o
$(C) -DZLONG -c ../Source/umf_store_lu.c -o umf_zl_store_lu.o
$(C) -DZLONG -c ../Source/umf_scale.c -o umf_zl_scale.o
$(C) -DZLONG -DWSOLVE -c ../Source/umfpack_solve.c -o umfpack_zl_wsolve.o
@@ -333,13 +331,14 @@ everything:
$(C) -DZLONG -c ../Source/umfpack_save_numeric.c -o umfpack_zl_save_numeric.o
$(C) -DZLONG -c ../Source/umfpack_load_symbolic.c -o umfpack_zl_load_symbolic.o
$(C) -DZLONG -c ../Source/umfpack_save_symbolic.c -o umfpack_zl_save_symbolic.o
- $(AR) ../Lib/libumfpack.a \
- umfpack_gn_global.o \
+ $(ARCHIVE) ../Lib/libumfpack.a \
umf_i_analyze.o umf_i_apply_order.o umf_i_colamd.o umf_i_free.o \
- umf_i_fsize.o umf_i_is_permutation.o umf_i_malloc.o umf_i_realloc.o \
+ umf_i_cholmod.o umf_i_fsize.o umf_i_is_permutation.o \
+ umf_i_malloc.o umf_i_realloc.o \
umf_i_report_perm.o umf_i_singletons.o \
umf_l_analyze.o umf_l_apply_order.o umf_l_colamd.o umf_l_free.o \
- umf_l_fsize.o umf_l_is_permutation.o umf_l_malloc.o umf_l_realloc.o \
+ umf_l_cholmod.o umf_l_fsize.o umf_l_is_permutation.o \
+ umf_l_malloc.o umf_l_realloc.o \
umf_l_report_perm.o umf_l_singletons.o \
umfpack_gn_timer.o umfpack_gn_tictoc.o \
umf_di_lhsolve.o \
@@ -358,7 +357,7 @@ everything:
umf_di_set_stats.o umf_di_solve.o umf_di_symbolic_usage.o \
umf_di_transpose.o umf_di_tuple_lengths.o umf_di_usolve.o \
umf_di_utsolve.o umf_di_valid_numeric.o umf_di_valid_symbolic.o \
- umf_di_grow_front.o umf_di_start_front.o umf_di_2by2.o \
+ umf_di_grow_front.o umf_di_start_front.o \
umf_di_store_lu.o umf_di_scale.o umfpack_di_wsolve.o \
umfpack_di_col_to_triplet.o umfpack_di_defaults.o \
umfpack_di_free_numeric.o umfpack_di_free_symbolic.o \
@@ -390,7 +389,7 @@ everything:
umf_dl_set_stats.o umf_dl_solve.o umf_dl_symbolic_usage.o \
umf_dl_transpose.o umf_dl_tuple_lengths.o umf_dl_usolve.o \
umf_dl_utsolve.o umf_dl_valid_numeric.o umf_dl_valid_symbolic.o \
- umf_dl_grow_front.o umf_dl_start_front.o umf_dl_2by2.o \
+ umf_dl_grow_front.o umf_dl_start_front.o \
umf_dl_store_lu.o umf_dl_scale.o umfpack_dl_wsolve.o \
umfpack_dl_col_to_triplet.o umfpack_dl_defaults.o \
umfpack_dl_free_numeric.o umfpack_dl_free_symbolic.o \
@@ -422,7 +421,7 @@ everything:
umf_zi_set_stats.o umf_zi_solve.o umf_zi_symbolic_usage.o \
umf_zi_transpose.o umf_zi_tuple_lengths.o umf_zi_usolve.o \
umf_zi_utsolve.o umf_zi_valid_numeric.o umf_zi_valid_symbolic.o \
- umf_zi_grow_front.o umf_zi_start_front.o umf_zi_2by2.o \
+ umf_zi_grow_front.o umf_zi_start_front.o \
umf_zi_store_lu.o umf_zi_scale.o umfpack_zi_wsolve.o \
umfpack_zi_col_to_triplet.o umfpack_zi_defaults.o \
umfpack_zi_free_numeric.o umfpack_zi_free_symbolic.o \
@@ -454,7 +453,7 @@ everything:
umf_zl_set_stats.o umf_zl_solve.o umf_zl_symbolic_usage.o \
umf_zl_transpose.o umf_zl_tuple_lengths.o umf_zl_usolve.o \
umf_zl_utsolve.o umf_zl_valid_numeric.o umf_zl_valid_symbolic.o \
- umf_zl_grow_front.o umf_zl_start_front.o umf_zl_2by2.o \
+ umf_zl_grow_front.o umf_zl_start_front.o \
umf_zl_store_lu.o umf_zl_scale.o umfpack_zl_wsolve.o \
umfpack_zl_col_to_triplet.o umfpack_zl_defaults.o \
umfpack_zl_free_numeric.o umfpack_zl_free_symbolic.o \
diff --git a/src/C/SuiteSparse/UMFPACK/Lib/libumfpack.def b/src/C/SuiteSparse/UMFPACK/Lib/libumfpack.def
index 72e6991..4ddc471 100644
--- a/src/C/SuiteSparse/UMFPACK/Lib/libumfpack.def
+++ b/src/C/SuiteSparse/UMFPACK/Lib/libumfpack.def
@@ -10,6 +10,7 @@ umfpack_di_get_symbolic
umfpack_di_get_determinant
umfpack_di_numeric
umfpack_di_qsymbolic
+umfpack_di_fsymbolic
umfpack_di_report_control
umfpack_di_report_info
umfpack_di_report_matrix
@@ -35,6 +36,7 @@ umfpack_dl_get_symbolic
umfpack_dl_get_determinant
umfpack_dl_numeric
umfpack_dl_qsymbolic
+umfpack_dl_fsymbolic
umfpack_dl_report_control
umfpack_dl_report_info
umfpack_dl_report_matrix
@@ -60,6 +62,7 @@ umfpack_zi_get_symbolic
umfpack_zi_get_determinant
umfpack_zi_numeric
umfpack_zi_qsymbolic
+umfpack_zi_fsymbolic
umfpack_zi_report_control
umfpack_zi_report_info
umfpack_zi_report_matrix
@@ -85,6 +88,7 @@ umfpack_zl_get_symbolic
umfpack_zl_get_determinant
umfpack_zl_numeric
umfpack_zl_qsymbolic
+umfpack_zl_fsymbolic
umfpack_zl_report_control
umfpack_zl_report_info
umfpack_zl_report_matrix
diff --git a/src/C/SuiteSparse/UMFPACK/Makefile b/src/C/SuiteSparse/UMFPACK/Makefile
index a707234..606654e 100644
--- a/src/C/SuiteSparse/UMFPACK/Makefile
+++ b/src/C/SuiteSparse/UMFPACK/Makefile
@@ -1,29 +1,23 @@
#-------------------------------------------------------------------------------
-# UMFPACK makefile (for GNU make or original make)
+# UMFPACK Makefile
#-------------------------------------------------------------------------------
+VERSION = 5.7.1
+
# UMFPACK requires the AMD package to be in ../AMD
-default: library
+default: all
-include ../UFconfig/UFconfig.mk
+include ../SuiteSparse_config/SuiteSparse_config.mk
-# compile all C code (except hb, fortran, and fortran64), including AMD and the
-# MATLAB mexFunctions
+# compile all C code (except hb, fortran, and fortran64), incl. AMD and demos
all:
- ( cd ../AMD ; $(MAKE) library )
- ( cd ../AMD ; $(MAKE) mex )
( cd Lib ; $(MAKE) )
( cd Demo ; $(MAKE) )
- ( cd MATLAB ; $(MAKE) )
- - cat Doc/License
-# compile just the C-callable libraries and demo programs (not mexFunctions)
+# compile just the C-callable UMFPACK library
library:
- ( cd ../AMD ; $(MAKE) library )
( cd Lib ; $(MAKE) )
- ( cd Demo ; $(MAKE) )
- - cat Doc/License
# compile the FORTRAN interface and demo program
fortran:
@@ -39,28 +33,25 @@ hb:
# remove object files, but keep the compiled programs and library archives
clean:
- ( cd ../AMD ; $(MAKE) clean )
( cd Lib ; $(MAKE) clean )
( cd Demo ; $(MAKE) clean )
- ( cd MATLAB ; $(MAKE) clean )
( cd Doc ; $(MAKE) clean )
+ ( cd MATLAB ; $(RM) $(CLEAN) rename.h )
# clean, and then remove compiled programs and library archives
purge:
- ( cd ../AMD ; $(MAKE) purge )
( cd Lib ; $(MAKE) purge )
( cd Demo ; $(MAKE) purge )
- ( cd MATLAB ; $(MAKE) purge )
( cd Doc ; $(MAKE) purge )
+ ( cd Tcov ; $(MAKE) purge )
+ ( cd MATLAB ; $(RM) $(CLEAN) rename.h *.mex* )
# create PDF documents for the original distribution
-doc:
- ( cd ../AMD ; $(MAKE) doc )
+docs:
( cd Doc ; $(MAKE) )
# get ready for distribution
dist: purge
- ( cd ../AMD ; $(MAKE) dist )
( cd Demo ; $(MAKE) dist )
( cd Doc ; $(MAKE) )
@@ -68,12 +59,22 @@ distclean: purge
ccode: library
-# compile the MATLAB mexFunction
-mex:
- ( cd ../AMD/MATLAB ; $(MAKE) )
- ( cd MATLAB ; $(MAKE) )
+lib: library
# statement coverage (requires Linux; takes a lot of time and disk space)
cov: purge
- ( cd Tcov ; ./DO.linux ; ./covall )
+ ( cd Tcov ; ./DO.all )
+
+# install UMFPACK
+install:
+ $(CP) Lib/libumfpack.a $(INSTALL_LIB)/libumfpack.$(VERSION).a
+ ( cd $(INSTALL_LIB) ; ln -sf libumfpack.$(VERSION).a libumfpack.a )
+ $(CP) Include/*.h $(INSTALL_INCLUDE)
+ chmod 644 $(INSTALL_LIB)/libumfpack*.a
+ chmod 644 $(INSTALL_INCLUDE)/umfpack*.h
+
+# uninstall UMFPACK
+uninstall:
+ $(RM) $(INSTALL_LIB)/libumfpack*.a
+ $(RM) $(INSTALL_INCLUDE)/umfpack*.h
diff --git a/src/C/SuiteSparse/UMFPACK/README.txt b/src/C/SuiteSparse/UMFPACK/README.txt
index d4f9d7b..4cdd79e 100644
--- a/src/C/SuiteSparse/UMFPACK/README.txt
+++ b/src/C/SuiteSparse/UMFPACK/README.txt
@@ -1,39 +1,45 @@
+UMFPACK, Copyright (c) 1995-2013 by Timothy A. Davis,
+http://www.suitesparse.com
+
UMFPACK : a set of routines solving sparse linear systems via LU
factorization. Requires three other packages: the BLAS (dense matrix
- operations), AMD (sparse matrix minimum degree ordering), and UFconfig.
+ operations), AMD (sparse matrix minimum degree ordering), and
+ SuiteSparse_config.
+
Includes a C-callable and MATLAB interface, and a basic FORTRAN 77
interface to a subset of the C-callable routines. Requires AMD Version
2.0 or later.
-The AMD, UFconfig, and UMFPACK directories must all reside in the same parent
-directory.
+ Unless you compile with -DNCHOLMOD, addtional packages are required:
+ CHOLMOD, CAMD, CCOLAMD, COLAMD, and metis-4.0.
+
+The AMD, SuiteSparse_config, and UMFPACK directories must all reside in the
+same parent directory. If the -DNCHOLMOD is not used, the CHOLMOD, CAMD,
+CCOLAMD, COLAMD, and metis-4.0 also also exist in the same parent.
Quick start (Unix, or Windows with Cygwin):
To compile, test, and install both UMFPACK and AMD, the UMFPACK and AMD
- directories must be in the same parent directory. To configure, edit
- the UFconfig/UFconfig.mk file (otherwise, you may get warnings that the
- BLAS (dgemm, etc) are not found). You may use UMFPACK_CONFIG = -DNBLAS in
- the UFconfig/UFconfig.mk file, to avoid using the BLAS, but UMFPACK will be
- slow. Next, cd to this directory (UMFPACK) and type "make". To compile
- and run a FORTRAN demo program for Harwell/Boeing matrices, type "make hb".
- To compile a FORTRAN main program that calls the 32-bit C-callable UMFPACK
- library, type "make fortran". When done, type "make clean" to remove
- unused *.o files (keeps the compiled libraries and demo programs). See
- the User Guide (Doc/UserGuide.pdf), or ../UFconfig/UFconfig.mk for more
- details (including options for compiling in 64-bit mode).
+ directories must be in the same parent directory. To configure, edit the
+ SuiteSparse_config/SuiteSparse_config.mk file (otherwise, you may get
+ warnings that the BLAS (dgemm, etc) are not found). You may use
+ UMFPACK_CONFIG = -DNBLAS in the SuiteSparse_config/SuiteSparse_config.mk
+ file, to avoid using the BLAS, but UMFPACK will be slow. Next, cd to this
+ directory (UMFPACK) and type "make". To compile and run a FORTRAN demo
+ program for Harwell/Boeing matrices, type "make hb". To compile a FORTRAN
+ main program that calls the 32-bit C-callable UMFPACK library, type "make
+ fortran". When done, type "make clean" to remove unused *.o files (keeps
+ the compiled libraries and demo programs). See the User Guide
+ (Doc/UserGuide.pdf), or ../SuiteSparse_config/SuiteSparse_config.mk for
+ more details (including options for compiling in 64-bit mode).
Quick start (for MATLAB users):
To compile, test, and install the UMFPACK mexFunction, cd to the
UMFPACK/MATLAB directory and type umfpack_make at the MATLAB prompt.
- NOTE: DO NOT ATTEMPT TO USE THIS CODE IN 64-BIT MATLAB (v7.3).
- It is not yet ported to that version of MATLAB.
-
--------------------------------------------------------------------------------
-UMFPACK, Copyright (c) 1995-2006 by Timothy A. Davis. All Rights Reserved.
UMFPACK is available under alternate licences; contact T. Davis for details.
UMFPACK License:
@@ -68,13 +74,13 @@ UMFPACK License:
Availability:
- http://www.cise.ufl.edu/research/sparse/umfpack
+ http://www.suitesparse.com
UMFPACK (including versions 2.2.1 and earlier, in FORTRAN) is available at
- http://www.cise.ufl.edu/research/sparse. MA38 is available in the Harwell
+ http://www.suitesparse.com. MA38 is available in the Harwell
Subroutine Library. This version of UMFPACK includes a modified form of
COLAMD Version 2.0, originally released on Jan. 31, 2000, also available at
- http://www.cise.ufl.edu/research/sparse. COLAMD V2.0 is also incorporated
+ http://www.suitesparse.com. COLAMD V2.0 is also incorporated
as a built-in function in MATLAB version 6.1, by The MathWorks, Inc.
(http://www.mathworks.com). COLAMD V1.0 appears as a column-preordering
in SuperLU (SuperLU is available at http://www.netlib.org).
@@ -105,10 +111,10 @@ Description:
Authors:
- Timothy A. Davis (davis at cise.ufl.edu), University of Florida.
+ Timothy A. Davis (DrTimothyAldenDavis at gmail.com)
Includes a modified version of COLAMD V2.0, by Stefan I. Larimore and
- Timothy A. Davis, University of Florida. The COLAMD algorithm was developed
+ Timothy A. Davis. The COLAMD algorithm was developed
in collaboration with John Gilbert, Xerox Palo Alto Research Center, and
Esmond Ng, Lawrence Berkeley National Laboratory.
@@ -130,7 +136,7 @@ Acknowledgements:
I would also like to thank the many researchers who provided sparse
matrices from a wide range of domains and used earlier versions of UMFPACK/
MA38 in their applications, and thus assisted in the practical development
- of the algorithm (see http://www.cise.ufl.edu/research/sparse, future
+ of the algorithm (see http://www.suitesparse.com, future
contributions of matrices are always welcome).
The MathWorks, Inc., provided a pre-release of MATLAB V6 which allowed me
@@ -224,15 +230,15 @@ Files and directories in the UMFPACK distribution:
umf_config.h configuration file (BLAS, memory, timer)
umf_internal.h definitions internal to UMFPACK
- umf_version.h version definitions (int/UF_long, real/complex)
+ umf_version.h version definitions (int/long, real/complex)
- umf_2by2.[ch]
umf_analyze.[ch] symbolic factorization of A'*A
umf_apply_order.[ch] apply column etree postorder
umf_assemble.[ch] assemble elements into current front
umf_blas3_update.[ch] rank-k update. Uses level-3 BLAS
umf_build_tuples.[ch] construct tuples for elements
umf_colamd.[ch] COLAMD pre-ordering, modified for UMFPACK
+ umf_cholmod.[ch] interface to CHOLMOD
umf_create_element.[ch] create a new element
umf_dump.[ch] debugging routines, not normally active
umf_extend_front.[ch] extend the current frontal matrix
@@ -334,9 +340,9 @@ Files and directories in the UMFPACK distribution:
umfpack_zl_demo.sed for creating umfpack_zl_demo.c
umfpack_di_demo.c a full demo (real/int version)
- umfpack_dl_demo.c a full demo (real/UF_long version)
+ umfpack_dl_demo.c a full demo (real/long version)
umfpack_zi_demo.c a full demo (complex/int version)
- umfpack_zl_demo.c a full demo (complex/UF_long version)
+ umfpack_zl_demo.c a full demo (complex/long version)
umfpack_di_demo.out umfpack_di_demo output
umfpack_dl_demo.out umfpack_dl_demo output
@@ -386,7 +392,7 @@ Files and directories in the UMFPACK distribution:
umfpack_report.m report statistics
umfpack_simple.m a simple umfpack demo
umfpack_solve.m x=A\b or b/A for arbitrary b
- umfpack_test.m extensive test, requires UF sparse matrices
+ umfpack_test.m extensive test, requires UFget
umfpackmex.c the umfpack mexFunction
west0067.mat sparse matrix for umfpack_demo.m
diff --git a/src/C/SuiteSparse/UMFPACK/Source/cholmod_blas.h b/src/C/SuiteSparse/UMFPACK/Source/cholmod_blas.h
index 7957968..2cc47e3 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/cholmod_blas.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/cholmod_blas.h
@@ -2,15 +2,6 @@
/* === Include/cholmod_blas.h =============================================== */
/* ========================================================================== */
-/* -----------------------------------------------------------------------------
- * CHOLMOD/Include/cholmod_blas.h.
- * Copyright (C) 2005-2006, Univ. of Florida. Author: Timothy A. Davis
- * CHOLMOD/Include/cholmod_blas.h is licensed under Version 2.1 of the GNU
- * Lesser General Public License. See lesser.txt for a text of the license.
- * CHOLMOD is also available under other licenses; contact authors for details.
- * http://www.cise.ufl.edu/research/sparse
- * -------------------------------------------------------------------------- */
-
/* This does not need to be included in the user's program. */
#ifndef CHOLMOD_BLAS_H
@@ -32,10 +23,15 @@
#define CHOLMOD_LINUX
#define CHOLMOD_ARCHITECTURE "Linux"
+#elif defined (__APPLE__)
+#define CHOLMOD_MAC
+#define CHOLMOD_ARCHITECTURE "Mac"
+
#elif defined (_AIX) || defined (MIBM_RS) || defined (ARCH_IBM_RS)
#define CHOLMOD_AIX
#define CHOLMOD_ARCHITECTURE "IBM AIX"
-#define BLAS_NO_UNDERSCORE
+/* recent reports from IBM AIX seem to indicate that this is not needed: */
+/* #define BLAS_NO_UNDERSCORE */
#elif defined (__alpha) || defined (MALPHA) || defined (ARCH_ALPHA)
#define CHOLMOD_ALPHA
@@ -68,7 +64,6 @@
#define CHOLMOD_ARCHITECTURE "unknown"
#endif
-
/* ========================================================================== */
/* === BLAS and LAPACK names ================================================ */
/* ========================================================================== */
@@ -76,7 +71,7 @@
/* Prototypes for the various versions of the BLAS. */
/* Determine if the 64-bit Sun Performance BLAS is to be used */
-#if defined(CHOLMOD_SOL2) && !defined(NSUNPERF) && defined(LONG) && defined(LONGBLAS)
+#if defined(CHOLMOD_SOL2) && !defined(NSUNPERF) && defined(BLAS64)
#define SUN64
#endif
@@ -146,23 +141,20 @@
/* === BLAS and LAPACK integer arguments ==================================== */
/* ========================================================================== */
-/* CHOLMOD can be compiled with -D'LONGBLAS=long' for the Sun Performance
- * Library, or -D'LONGBLAS=long long' for SGI's SCSL BLAS. This defines the
- * integer used in the BLAS for the cholmod_l_* routines.
- *
- * The "int" version of CHOLMOD always uses the "int" version of the BLAS.
- */
+/* Compile CHOLMOD, UMFPACK, and SPQR with -DBLAS64 if you have a BLAS that
+ * uses 64-bit integers */
-#if defined (LONGBLAS) && defined (LONG)
-#define BLAS_INT LONGBLAS
+#if defined (LONGBLAS) || defined (BLAS64)
+#define BLAS_INT SuiteSparse_long
#else
#define BLAS_INT int
#endif
/* If the BLAS integer is smaller than the basic CHOLMOD integer, then we need
- * to check for integer overflow when converting from one to the other. If
- * any integer overflows, the externally-defined blas_ok variable is set to
- * FALSE. blas_ok should be set to TRUE before calling any BLAS_* macro.
+ * to check for integer overflow when converting from Int to BLAS_INT. If
+ * any integer overflows, the externally-defined BLAS_OK variable is
+ * set to FALSE. BLAS_OK should be set to TRUE before calling any
+ * BLAS_* macro.
*/
#define CHECK_BLAS_INT (sizeof (BLAS_INT) < sizeof (Int))
@@ -179,12 +171,12 @@ void BLAS_DGEMV (char *trans, BLAS_INT *m, BLAS_INT *n, double *alpha,
#define BLAS_dgemv(trans,m,n,alpha,A,lda,X,incx,beta,Y,incy) \
{ \
BLAS_INT M = m, N = n, LDA = lda, INCX = incx, INCY = incy ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
+ EQ (INCX,incx) && EQ (INCY,incy))) \
{ \
- blas_ok &= EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx) \
- && EQ (INCY,incy) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DGEMV (trans, &M, &N, alpha, A, &LDA, X, &INCX, beta, Y, &INCY) ; \
} \
@@ -197,12 +189,12 @@ void BLAS_ZGEMV (char *trans, BLAS_INT *m, BLAS_INT *n, double *alpha,
#define BLAS_zgemv(trans,m,n,alpha,A,lda,X,incx,beta,Y,incy) \
{ \
BLAS_INT M = m, N = n, LDA = lda, INCX = incx, INCY = incy ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
+ EQ (INCX,incx) && EQ (INCY,incy))) \
{ \
- blas_ok &= EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx) \
- && EQ (INCY,incy) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZGEMV (trans, &M, &N, alpha, A, &LDA, X, &INCX, beta, Y, &INCY) ; \
} \
@@ -214,11 +206,11 @@ void BLAS_DTRSV (char *uplo, char *trans, char *diag, BLAS_INT *n, double *A,
#define BLAS_dtrsv(uplo,trans,diag,n,A,lda,X,incx) \
{ \
BLAS_INT N = n, LDA = lda, INCX = incx ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx))) \
{ \
- blas_ok &= EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DTRSV (uplo, trans, diag, &N, A, &LDA, X, &INCX) ; \
} \
@@ -230,11 +222,11 @@ void BLAS_ZTRSV (char *uplo, char *trans, char *diag, BLAS_INT *n, double *A,
#define BLAS_ztrsv(uplo,trans,diag,n,A,lda,X,incx) \
{ \
BLAS_INT N = n, LDA = lda, INCX = incx ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx))) \
{ \
- blas_ok &= EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZTRSV (uplo, trans, diag, &N, A, &LDA, X, &INCX) ; \
} \
@@ -247,11 +239,12 @@ void BLAS_DTRSM (char *side, char *uplo, char *transa, char *diag, BLAS_INT *m,
#define BLAS_dtrsm(side,uplo,transa,diag,m,n,alpha,A,lda,B,ldb) \
{ \
BLAS_INT M = m, N = n, LDA = lda, LDB = ldb ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
+ EQ (LDB,ldb))) \
{ \
- blas_ok &= EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && EQ (LDB,ldb) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DTRSM (side, uplo, transa, diag, &M, &N, alpha, A, &LDA, B, &LDB);\
} \
@@ -264,11 +257,12 @@ void BLAS_ZTRSM (char *side, char *uplo, char *transa, char *diag, BLAS_INT *m,
#define BLAS_ztrsm(side,uplo,transa,diag,m,n,alpha,A,lda,B,ldb) \
{ \
BLAS_INT M = m, N = n, LDA = lda, LDB = ldb ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
+ EQ (LDB,ldb))) \
{ \
- blas_ok &= EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && EQ (LDB,ldb) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZTRSM (side, uplo, transa, diag, &M, &N, alpha, A, &LDA, B, &LDB);\
} \
@@ -281,12 +275,12 @@ void BLAS_DGEMM (char *transa, char *transb, BLAS_INT *m, BLAS_INT *n,
#define BLAS_dgemm(transa,transb,m,n,k,alpha,A,lda,B,ldb,beta,C,ldc) \
{ \
BLAS_INT M = m, N = n, K = k, LDA = lda, LDB = ldb, LDC = ldc ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (K,k) && \
+ EQ (LDA,lda) && EQ (LDB,ldb) && EQ (LDC,ldc))) \
{ \
- blas_ok &= EQ (M,m) && EQ (N,n) && EQ (K,k) && EQ (LDA,lda) \
- && EQ (LDB,ldb) && EQ (LDC,ldc) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DGEMM (transa, transb, &M, &N, &K, alpha, A, &LDA, B, &LDB, beta, \
C, &LDC) ; \
@@ -300,12 +294,12 @@ void BLAS_ZGEMM (char *transa, char *transb, BLAS_INT *m, BLAS_INT *n,
#define BLAS_zgemm(transa,transb,m,n,k,alpha,A,lda,B,ldb,beta,C,ldc) \
{ \
BLAS_INT M = m, N = n, K = k, LDA = lda, LDB = ldb, LDC = ldc ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (K,k) && \
+ EQ (LDA,lda) && EQ (LDB,ldb) && EQ (LDC,ldc))) \
{ \
- blas_ok &= EQ (M,m) && EQ (N,n) && EQ (K,k) && EQ (LDA,lda) \
- && EQ (LDB,ldb) && EQ (LDC,ldc) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZGEMM (transa, transb, &M, &N, &K, alpha, A, &LDA, B, &LDB, beta, \
C, &LDC) ; \
@@ -319,11 +313,12 @@ void BLAS_DSYRK (char *uplo, char *trans, BLAS_INT *n, BLAS_INT *k,
#define BLAS_dsyrk(uplo,trans,n,k,alpha,A,lda,beta,C,ldc) \
{ \
BLAS_INT N = n, K = k, LDA = lda, LDC = ldc ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (K,k) && EQ (LDA,lda) && \
+ EQ (LDC,ldc))) \
{ \
- blas_ok &= EQ (N,n) && EQ (K,k) && EQ (LDA,lda) && EQ (LDC,ldc) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DSYRK (uplo, trans, &N, &K, alpha, A, &LDA, beta, C, &LDC) ; \
} \
@@ -336,11 +331,12 @@ void BLAS_ZHERK (char *uplo, char *trans, BLAS_INT *n, BLAS_INT *k,
#define BLAS_zherk(uplo,trans,n,k,alpha,A,lda,beta,C,ldc) \
{ \
BLAS_INT N = n, K = k, LDA = lda, LDC = ldc ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (K,k) && EQ (LDA,lda) && \
+ EQ (LDC,ldc))) \
{ \
- blas_ok &= EQ (N,n) && EQ (K,k) && EQ (LDA,lda) && EQ (LDC,ldc) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZHERK (uplo, trans, &N, &K, alpha, A, &LDA, beta, C, &LDC) ; \
} \
@@ -352,11 +348,11 @@ void LAPACK_DPOTRF (char *uplo, BLAS_INT *n, double *A, BLAS_INT *lda,
#define LAPACK_dpotrf(uplo,n,A,lda,info) \
{ \
BLAS_INT N = n, LDA = lda, INFO = 1 ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (LDA,lda))) \
{ \
- blas_ok &= EQ (N,n) && EQ (LDA,lda) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
LAPACK_DPOTRF (uplo, &N, A, &LDA, &INFO) ; \
} \
@@ -369,11 +365,11 @@ void LAPACK_ZPOTRF (char *uplo, BLAS_INT *n, double *A, BLAS_INT *lda,
#define LAPACK_zpotrf(uplo,n,A,lda,info) \
{ \
BLAS_INT N = n, LDA = lda, INFO = 1 ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (LDA,lda))) \
{ \
- blas_ok &= EQ (N,n) && EQ (LDA,lda) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
LAPACK_ZPOTRF (uplo, &N, A, &LDA, &INFO) ; \
} \
@@ -387,11 +383,11 @@ void BLAS_DSCAL (BLAS_INT *n, double *alpha, double *Y, BLAS_INT *incy) ;
#define BLAS_dscal(n,alpha,Y,incy) \
{ \
BLAS_INT N = n, INCY = incy ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (INCY,incy))) \
{ \
- blas_ok &= EQ (N,n) && EQ (INCY,incy) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DSCAL (&N, alpha, Y, &INCY) ; \
} \
@@ -402,11 +398,11 @@ void BLAS_ZSCAL (BLAS_INT *n, double *alpha, double *Y, BLAS_INT *incy) ;
#define BLAS_zscal(n,alpha,Y,incy) \
{ \
BLAS_INT N = n, INCY = incy ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (N,n) && EQ (INCY,incy))) \
{ \
- blas_ok &= EQ (N,n) && EQ (INCY,incy) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZSCAL (&N, alpha, Y, &INCY) ; \
} \
@@ -419,12 +415,12 @@ void BLAS_DGER (BLAS_INT *m, BLAS_INT *n, double *alpha,
#define BLAS_dger(m,n,alpha,X,incx,Y,incy,A,lda) \
{ \
BLAS_INT M = m, N = n, LDA = lda, INCX = incx, INCY = incy ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
+ EQ (INCX,incx) && EQ (INCY,incy))) \
{ \
- blas_ok &= EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx) \
- && EQ (INCY,incy) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_DGER (&M, &N, alpha, X, &INCX, Y, &INCY, A, &LDA) ; \
} \
@@ -437,12 +433,12 @@ void BLAS_ZGER (BLAS_INT *m, BLAS_INT *n, double *alpha,
#define BLAS_zgeru(m,n,alpha,X,incx,Y,incy,A,lda) \
{ \
BLAS_INT M = m, N = n, LDA = lda, INCX = incx, INCY = incy ; \
- if (CHECK_BLAS_INT) \
+ if (CHECK_BLAS_INT && !(EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && \
+ EQ (INCX,incx) && EQ (INCY,incy))) \
{ \
- blas_ok &= EQ (M,m) && EQ (N,n) && EQ (LDA,lda) && EQ (INCX,incx) \
- && EQ (INCY,incy) ; \
+ BLAS_OK = FALSE ; \
} \
- if (blas_ok) \
+ if (!CHECK_BLAS_INT || BLAS_OK) \
{ \
BLAS_ZGER (&M, &N, alpha, X, &INCX, Y, &INCY, A, &LDA) ; \
} \
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_2by2.c b/src/C/SuiteSparse/UMFPACK/Source/umf_2by2.c
deleted file mode 100644
index 584f2cb..0000000
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_2by2.c
+++ /dev/null
@@ -1,866 +0,0 @@
-/* ========================================================================== */
-/* === UMF_2by2 ============================================================= */
-/* ========================================================================== */
-
-/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
-/* -------------------------------------------------------------------------- */
-
-/* NOTE: this code is currently disabled */
-
-/* Not user-callable. Computes a row permutation P so that A (P,:) has a
- * mostly zero-free diagonal, with large entries on the diagonal. It does this
- * by swapping pairs of rows. Once a row is swapped it is not swapped again.
- * This is a "cheap" assignment, not a complete max. transversal or
- * bi-partite matching. It is only a partial matching. For most matrices
- * for which this algorithm is used, however, the matching is complete (in
- * UMFPACK this algorithm is used for matrices with roughly symmetric pattern,
- * and these matrices typically have a mostly-zero-free diagonal to begin with.
- * This algorithm is not meant to be used on arbitrary unsymmetric matrices
- * (for those matrices, UMFPACK uses its unsymmetric strategy and does not
- * use this algorithm).
- *
- * Even if incomplete, the matching is usually good enough for UMFPACK's
- * symmetric strategy, which can easily pivot off the diagonal during numerical
- * factorization if it finds a weak diagonal entry.
- *
- * The algorithms works as follows. First, row scaling factors are computed,
- * and weak diagonal entries are found. A weak entry is a value A(k,k) whose
- * absolute value is < tol * max (abs (A (:,k))). For each weak diagonal k in
- * increasing order of degree in A+A', the algorithm finds an index j such
- * that A (k,j) and A (j,k) are "large" (greater than or equal to tol times
- * the largest magnitude in their columns). Row j must also not have already
- * been swapped. Rows j and k are then swapped. If we come to a diagonal k
- * that has already been swapped, then it is not modified. This case occurs
- * for "oxo" pivots:
- *
- * k j
- * k o x
- * j x o
- *
- * which are swapped once to obtain
- *
- * k j
- * j x o
- * k o x
- *
- * These two rows are then not modified any further (A (j,j) was weak, but
- * after one swap the permuted the jth diagonal entry is strong.
- *
- * This algorithm only works on square matrices (real, complex, or pattern-
- * only). The numerical values are optional. If not present, each entry is
- * treated as numerically acceptable (tol is ignored), and the algorithm
- * operates by just using the pattern, not the values. Each column of the
- * input matrix A must be sorted, with no duplicate entries. The matrix A
- * can be optionally scaled prior to the numerical test. The matrix A (:,P)
- * has the same diagonal entries as A (:,P), except in different order. So
- * the output permutation P can also be used to swap the columns of A.
- */
-
-#if 0
-
-#include "umf_internal.h"
-#include "umf_2by2.h"
-
-#ifndef NDEBUG
-#include "umf_is_permutation.h"
-#endif
-
-/* x is "weak" if it is less than ctol. If x or ctol are NaN, then define
- * x as not "weak". This is a rather arbitrary choice, made to simplify the
- * computation. On all but a PC with Microsoft C/C++, this test becomes
- * ((x) - ctol < 0). */
-#define WEAK(x,ctol) (SCALAR_IS_LTZERO ((x)-(ctol)))
-
-/* For flag value in Next [col] */
-#define IS_WEAK -2
-
-/* ========================================================================== */
-/* === two_by_two =========================================================== */
-/* ========================================================================== */
-
-PRIVATE Int two_by_two /* returns # unmatched weak diagonals */
-(
- /* input, not modified */
- Int n2, /* C is n2-by-n2 */
- Int Cp [ ], /* size n2+1, column pointers for C */
- Int Ci [ ], /* size snz = Cp [n2], row indices for C */
- Int Degree [ ], /* Degree [i] = degree of row i of C+C' */
-
- /* input, not defined on output */
- Int Next [ ], /* Next [k] == IS_WEAK if k is a weak diagonal */
- Int Ri [ ], /* Ri [i] is the length of row i in C */
-
- /* output, not defined on input */
- Int P [ ],
-
- /* workspace, not defined on input or output */
- Int Rp [ ],
- Int Head [ ]
-)
-{
- Int deg, newcol, row, col, p, p2, unmatched, k, j, j2, j_best, best, jdiff,
- jdiff_best, jdeg, jdeg_best, cp, cp1, cp2, rp, rp1, rp2, maxdeg,
- mindeg ;
-
- /* ---------------------------------------------------------------------- */
- /* place weak diagonals in the degree lists */
- /* ---------------------------------------------------------------------- */
-
- for (deg = 0 ; deg < n2 ; deg++)
- {
- Head [deg] = EMPTY ;
- }
-
- maxdeg = 0 ;
- mindeg = Int_MAX ;
- for (newcol = n2-1 ; newcol >= 0 ; newcol--)
- {
- if (Next [newcol] == IS_WEAK)
- {
- /* add this column to the list of weak nodes */
- DEBUGm1 ((" newcol "ID" has a weak diagonal deg "ID"\n",
- newcol, deg)) ;
- deg = Degree [newcol] ;
- ASSERT (deg >= 0 && deg < n2) ;
- Next [newcol] = Head [deg] ;
- Head [deg] = newcol ;
- maxdeg = MAX (maxdeg, deg) ;
- mindeg = MIN (mindeg, deg) ;
- }
- }
-
- /* ---------------------------------------------------------------------- */
- /* construct R = C' (C = strong entries in pruned submatrix) */
- /* ---------------------------------------------------------------------- */
-
- /* Ri [0..n2-1] is the length of each row of R */
- /* use P as temporary pointer into the row form of R [ */
- Rp [0] = 0 ;
- for (row = 0 ; row < n2 ; row++)
- {
- Rp [row+1] = Rp [row] + Ri [row] ;
- P [row] = Rp [row] ;
- }
- /* Ri no longer needed for row counts */
-
- /* all entries in C are strong */
- for (col = 0 ; col < n2 ; col++)
- {
- p2 = Cp [col+1] ;
- for (p = Cp [col] ; p < p2 ; p++)
- {
- /* place the column index in row = Ci [p] */
- Ri [P [Ci [p]]++] = col ;
- }
- }
-
- /* contents of P no longer needed ] */
-
-#ifndef NDEBUG
- DEBUG0 (("==================R: row form of strong entries in A:\n")) ;
- UMF_dump_col_matrix ((double *) NULL,
-#ifdef COMPLEX
- (double *) NULL,
-#endif
- Ri, Rp, n2, n2, Rp [n2]) ;
-#endif
- ASSERT (AMD_valid (n2, n2, Rp, Ri) == AMD_OK) ;
-
- /* ---------------------------------------------------------------------- */
- /* for each weak diagonal, find a pair of strong off-diagonal entries */
- /* ---------------------------------------------------------------------- */
-
- for (row = 0 ; row < n2 ; row++)
- {
- P [row] = EMPTY ;
- }
-
- unmatched = 0 ;
- best = EMPTY ;
- jdiff = EMPTY ;
- jdeg = EMPTY ;
-
- for (deg = mindeg ; deg <= maxdeg ; deg++)
- {
- /* find the next weak diagonal of lowest degree */
- DEBUGm2 (("---------------------------------- Deg: "ID"\n", deg)) ;
- for (k = Head [deg] ; k != EMPTY ; k = Next [k])
- {
- DEBUGm2 (("k: "ID"\n", k)) ;
- if (P [k] == EMPTY)
- {
- /* C (k,k) is a weak diagonal entry. Find an index j != k such
- * that C (j,k) and C (k,j) are both strong, and also such
- * that Degree [j] is minimized. In case of a tie, pick
- * the smallest index j. C and R contain the pattern of
- * strong entries only.
- *
- * Note that row k of R and column k of C are both sorted. */
-
- DEBUGm4 (("===== Weak diagonal k = "ID"\n", k)) ;
- DEBUG1 (("Column k of C:\n")) ;
- for (p = Cp [k] ; p < Cp [k+1] ; p++)
- {
- DEBUG1 ((" "ID": deg "ID"\n", Ci [p], Degree [Ci [p]]));
- }
- DEBUG1 (("Row k of R (strong entries only):\n")) ;
- for (p = Rp [k] ; p < Rp [k+1] ; p++)
- {
- DEBUG1 ((" "ID": deg "ID"\n", Ri [p], Degree [Ri [p]]));
- }
-
- /* no (C (k,j), C (j,k)) pair exists yet */
- j_best = EMPTY ;
- jdiff_best = Int_MAX ;
- jdeg_best = Int_MAX ;
-
- /* pointers into column k (including values) */
- cp1 = Cp [k] ;
- cp2 = Cp [k+1] ;
- cp = cp1 ;
-
- /* pointers into row k (strong entries only, no values) */
- rp1 = Rp [k] ;
- rp2 = Rp [k+1] ;
- rp = rp1 ;
-
- /* while entries searched in column k and row k */
- while (TRUE)
- {
-
- if (cp >= cp2)
- {
- /* no more entries in this column */
- break ;
- }
-
- /* get C (j,k), which is strong */
- j = Ci [cp] ;
-
- if (rp >= rp2)
- {
- /* no more entries in this column */
- break ;
- }
-
- /* get R (k,j2), which is strong */
- j2 = Ri [rp] ;
-
- if (j < j2)
- {
- /* C (j,k) is strong, but R (k,j) is not strong */
- cp++ ;
- continue ;
- }
-
- if (j2 < j)
- {
- /* C (k,j2) is strong, but R (j2,k) is not strong */
- rp++ ;
- continue ;
- }
-
- /* j == j2: C (j,k) is strong and R (k,j) is strong */
-
- best = FALSE ;
-
- if (P [j] == EMPTY)
- {
- /* j has not yet been matched */
- jdeg = Degree [j] ;
- jdiff = SCALAR_ABS (k-j) ;
-
- DEBUG1 (("Try candidate j "ID" deg "ID" diff "ID
- "\n", j, jdeg, jdiff)) ;
-
- if (j_best == EMPTY)
- {
- /* this is the first candidate seen */
- DEBUG1 ((" first\n")) ;
- best = TRUE ;
- }
- else
- {
- if (jdeg < jdeg_best)
- {
- /* the degree of j is best seen so far. */
- DEBUG1 ((" least degree\n")) ;
- best = TRUE ;
- }
- else if (jdeg == jdeg_best)
- {
- /* degree of j and j_best are the same */
- /* tie break by nearest node number */
- if (jdiff < jdiff_best)
- {
- DEBUG1 ((" tie degree, closer\n")) ;
- best = TRUE ;
- }
- else if (jdiff == jdiff_best)
- {
- /* |j-k| = |j_best-k|. For any given k
- * and j_best there is only one other j
- * than can be just as close as j_best.
- * Tie break by picking the smaller of
- * j and j_best */
- DEBUG1 ((" tie degree, as close\n"));
- best = j < j_best ;
- }
- }
- else
- {
- /* j has higher degree than best so far */
- best = FALSE ;
- }
- }
- }
-
- if (best)
- {
- /* j is best match for k */
- /* found a strong pair, A (j,k) and A (k,j) */
- DEBUG1 ((" --- Found pair k: "ID" j: " ID
- " jdeg: "ID" jdiff: "ID"\n",
- k, j, jdeg, jdiff)) ;
- ASSERT (jdiff != EMPTY) ;
- ASSERT (jdeg != EMPTY) ;
- j_best = j ;
- jdeg_best = jdeg ;
- jdiff_best = jdiff ;
- }
-
- /* get the next entries in column k and row k */
- cp++ ;
- rp++ ;
- }
-
- /* save the pair (j,k), if we found one */
- if (j_best != EMPTY)
- {
- j = j_best ;
- DEBUGm4 ((" --- best pair j: "ID" for k: "ID"\n", j, k)) ;
- P [k] = j ;
- P [j] = k ;
- }
- else
- {
- /* no match was found for k */
- unmatched++ ;
- }
- }
- }
- }
-
- /* ---------------------------------------------------------------------- */
- /* finalize the row permutation, P */
- /* ---------------------------------------------------------------------- */
-
- for (k = 0 ; k < n2 ; k++)
- {
- if (P [k] == EMPTY)
- {
- P [k] = k ;
- }
- }
- ASSERT (UMF_is_permutation (P, Rp, n2, n2)) ;
-
- return (unmatched) ;
-}
-
-
-/* ========================================================================== */
-/* === UMF_2by2 ============================================================= */
-/* ========================================================================== */
-
-GLOBAL void UMF_2by2
-(
- /* input, not modified: */
- Int n, /* A is n-by-n */
- const Int Ap [ ], /* size n+1 */
- const Int Ai [ ], /* size nz = Ap [n] */
- const double Ax [ ], /* size nz if present */
-#ifdef COMPLEX
- const double Az [ ], /* size nz if present */
-#endif
- double tol, /* tolerance for determining whether or not an
- * entry is numerically acceptable. If tol <= 0
- * then all numerical values ignored. */
- Int scale, /* scaling to perform (none, sum, or max) */
- Int Cperm1 [ ], /* singleton permutations */
-#ifndef NDEBUG
- Int Rperm1 [ ], /* not needed, since Rperm1 = Cperm1 for submatrix S */
-#endif
- Int InvRperm1 [ ], /* inverse of Rperm1 */
- Int n1, /* number of singletons */
- Int nempty, /* number of empty rows/cols */
-
- /* input, contents undefined on output: */
- Int Degree [ ], /* Degree [j] is the number of off-diagonal
- * entries in row/column j of S+S', where
- * where S = A (Cperm1 [n1..], Rperm1 [n1..]).
- * Note that S is not used, nor formed. */
-
- /* output: */
- Int P [ ], /* P [k] = i means original row i is kth row in S(P,:)
- * where S = A (Cperm1 [n1..], Rperm1 [n1..]) */
- Int *p_nweak,
- Int *p_unmatched,
-
- /* workspace (not defined on input or output): */
- Int Ri [ ], /* of size >= max (nz, n) */
- Int Rp [ ], /* of size n+1 */
- double Rs [ ], /* of size n if present. Rs = sum (abs (A),2) or
- * max (abs (A),2), the sum or max of each row. Unused
- * if scale is equal to UMFPACK_SCALE_NONE. */
- Int Head [ ], /* of size n. Head pointers for bucket sort */
- Int Next [ ], /* of size n. Next pointers for bucket sort */
- Int Ci [ ], /* size nz */
- Int Cp [ ] /* size n+1 */
-)
-{
-
- /* ---------------------------------------------------------------------- */
- /* local variables */
- /* ---------------------------------------------------------------------- */
-
- Entry aij ;
- double cmax, value, rs, ctol, dvalue ;
- Int k, p, row, col, do_values, do_sum, do_max, do_scale, nweak, weak,
- p1, p2, dfound, unmatched, n2, oldrow, newrow, oldcol, newcol, pp ;
-#ifdef COMPLEX
- Int split = SPLIT (Az) ;
-#endif
-#ifndef NRECIPROCAL
- Int do_recip = FALSE ;
-#endif
-
-#ifndef NDEBUG
- /* UMF_debug += 99 ; */
- DEBUGm3 (("\n ==================================UMF_2by2: tol %g\n", tol)) ;
- ASSERT (AMD_valid (n, n, Ap, Ai) == AMD_OK) ;
- for (k = n1 ; k < n - nempty ; k++)
- {
- ASSERT (Cperm1 [k] == Rperm1 [k]) ;
- }
-#endif
-
- /* ---------------------------------------------------------------------- */
- /* determine scaling options */
- /* ---------------------------------------------------------------------- */
-
- /* use the values, but only if they are present */
- /* ignore the values if tol <= 0 */
- do_values = (tol > 0) && (Ax != (double *) NULL) ;
- if (do_values && (Rs != (double *) NULL))
- {
- do_sum = (scale == UMFPACK_SCALE_SUM) ;
- do_max = (scale == UMFPACK_SCALE_MAX) ;
- }
- else
- {
- /* no scaling */
- do_sum = FALSE ;
- do_max = FALSE ;
- }
- do_scale = do_max || do_sum ;
- DEBUGm3 (("do_values "ID" do_sum "ID" do_max "ID" do_scale "ID"\n",
- do_values, do_sum, do_max, do_scale)) ;
-
- /* ---------------------------------------------------------------------- */
- /* compute the row scaling, if requested */
- /* ---------------------------------------------------------------------- */
-
- /* see also umf_kernel_init */
-
- if (do_scale)
- {
-#ifndef NRECIPROCAL
- double rsmin ;
-#endif
- for (row = 0 ; row < n ; row++)
- {
- Rs [row] = 0.0 ;
- }
- for (col = 0 ; col < n ; col++)
- {
- p2 = Ap [col+1] ;
- for (p = Ap [col] ; p < p2 ; p++)
- {
- row = Ai [p] ;
- ASSIGN (aij, Ax, Az, p, split) ;
- APPROX_ABS (value, aij) ;
- rs = Rs [row] ;
- if (!SCALAR_IS_NAN (rs))
- {
- if (SCALAR_IS_NAN (value))
- {
- /* if any entry in a row is NaN, then the scale factor
- * for the row is NaN. It will be set to 1 later. */
- Rs [row] = value ;
- }
- else if (do_max)
- {
- Rs [row] = MAX (rs, value) ;
- }
- else
- {
- Rs [row] += value ;
- }
- }
- }
- }
-#ifndef NRECIPROCAL
- rsmin = Rs [0] ;
- if (SCALAR_IS_ZERO (rsmin) || SCALAR_IS_NAN (rsmin))
- {
- rsmin = 1.0 ;
- }
-#endif
- for (row = 0 ; row < n ; row++)
- {
- /* do not scale an empty row, or a row with a NaN */
- rs = Rs [row] ;
- if (SCALAR_IS_ZERO (rs) || SCALAR_IS_NAN (rs))
- {
- Rs [row] = 1.0 ;
- }
-#ifndef NRECIPROCAL
- rsmin = MIN (rsmin, Rs [row]) ;
-#endif
- }
-
-#ifndef NRECIPROCAL
- /* multiply by the reciprocal if Rs is not too small */
- do_recip = (rsmin >= RECIPROCAL_TOLERANCE) ;
- if (do_recip)
- {
- /* invert the scale factors */
- for (row = 0 ; row < n ; row++)
- {
- Rs [row] = 1.0 / Rs [row] ;
- }
- }
-#endif
- }
-
- /* ---------------------------------------------------------------------- */
- /* compute the max in each column and find diagonal */
- /* ---------------------------------------------------------------------- */
-
- nweak = 0 ;
-
-#ifndef NDEBUG
- for (k = 0 ; k < n ; k++)
- {
- ASSERT (Rperm1 [k] >= 0 && Rperm1 [k] < n) ;
- ASSERT (InvRperm1 [Rperm1 [k]] == k) ;
- }
-#endif
-
- n2 = n - n1 - nempty ;
-
- /* use Ri to count the number of strong entries in each row */
- for (row = 0 ; row < n2 ; row++)
- {
- Ri [row] = 0 ;
- }
-
- pp = 0 ;
- ctol = 0 ;
- dvalue = 1 ;
-
- /* construct C = pruned submatrix, strong values only, column form */
-
- for (k = n1 ; k < n - nempty ; k++)
- {
- oldcol = Cperm1 [k] ;
- newcol = k - n1 ;
- Next [newcol] = EMPTY ;
- DEBUGm1 (("Column "ID" newcol "ID" oldcol "ID"\n", k, newcol, oldcol)) ;
-
- Cp [newcol] = pp ;
-
- dfound = FALSE ;
- p1 = Ap [oldcol] ;
- p2 = Ap [oldcol+1] ;
- if (do_values)
- {
- cmax = 0 ;
- dvalue = 0 ;
-
- if (!do_scale)
- {
- /* no scaling */
- for (p = p1 ; p < p2 ; p++)
- {
- oldrow = Ai [p] ;
- ASSERT (oldrow >= 0 && oldrow < n) ;
- newrow = InvRperm1 [oldrow] - n1 ;
- ASSERT (newrow >= -n1 && newrow < n2) ;
- if (newrow < 0) continue ;
- ASSIGN (aij, Ax, Az, p, split) ;
- APPROX_ABS (value, aij) ;
- /* if either cmax or value is NaN, define cmax as NaN */
- if (!SCALAR_IS_NAN (cmax))
- {
- if (SCALAR_IS_NAN (value))
- {
- cmax = value ;
- }
- else
- {
- cmax = MAX (cmax, value) ;
- }
- }
- if (oldrow == oldcol)
- {
- /* we found the diagonal entry in this column */
- dvalue = value ;
- dfound = TRUE ;
- ASSERT (newrow == newcol) ;
- }
- }
- }
-#ifndef NRECIPROCAL
- else if (do_recip)
- {
- /* multiply by the reciprocal */
- for (p = p1 ; p < p2 ; p++)
- {
- oldrow = Ai [p] ;
- ASSERT (oldrow >= 0 && oldrow < n) ;
- newrow = InvRperm1 [oldrow] - n1 ;
- ASSERT (newrow >= -n1 && newrow < n2) ;
- if (newrow < 0) continue ;
- ASSIGN (aij, Ax, Az, p, split) ;
- APPROX_ABS (value, aij) ;
- value *= Rs [oldrow] ;
- /* if either cmax or value is NaN, define cmax as NaN */
- if (!SCALAR_IS_NAN (cmax))
- {
- if (SCALAR_IS_NAN (value))
- {
- cmax = value ;
- }
- else
- {
- cmax = MAX (cmax, value) ;
- }
- }
- if (oldrow == oldcol)
- {
- /* we found the diagonal entry in this column */
- dvalue = value ;
- dfound = TRUE ;
- ASSERT (newrow == newcol) ;
- }
- }
- }
-#endif
- else
- {
- /* divide instead */
- for (p = p1 ; p < p2 ; p++)
- {
- oldrow = Ai [p] ;
- ASSERT (oldrow >= 0 && oldrow < n) ;
- newrow = InvRperm1 [oldrow] - n1 ;
- ASSERT (newrow >= -n1 && newrow < n2) ;
- if (newrow < 0) continue ;
- ASSIGN (aij, Ax, Az, p, split) ;
- APPROX_ABS (value, aij) ;
- value /= Rs [oldrow] ;
- /* if either cmax or value is NaN, define cmax as NaN */
- if (!SCALAR_IS_NAN (cmax))
- {
- if (SCALAR_IS_NAN (value))
- {
- cmax = value ;
- }
- else
- {
- cmax = MAX (cmax, value) ;
- }
- }
- if (oldrow == oldcol)
- {
- /* we found the diagonal entry in this column */
- dvalue = value ;
- dfound = TRUE ;
- ASSERT (newrow == newcol) ;
- }
- }
- }
-
- ctol = tol * cmax ;
- DEBUGm1 ((" cmax col "ID" %g ctol %g\n", oldcol, cmax, ctol)) ;
- }
- else
- {
- for (p = p1 ; p < p2 ; p++)
- {
- oldrow = Ai [p] ;
- ASSERT (oldrow >= 0 && oldrow < n) ;
- newrow = InvRperm1 [oldrow] - n1 ;
- ASSERT (newrow >= -n1 && newrow < n2) ;
- if (newrow < 0) continue ;
- Ci [pp++] = newrow ;
- if (oldrow == oldcol)
- {
- /* we found the diagonal entry in this column */
- ASSERT (newrow == newcol) ;
- dfound = TRUE ;
- }
- /* count the entries in each column */
- Ri [newrow]++ ;
- }
- }
-
- /* ------------------------------------------------------------------ */
- /* flag the weak diagonals */
- /* ------------------------------------------------------------------ */
-
- if (!dfound)
- {
- /* no diagonal entry present */
- weak = TRUE ;
- }
- else
- {
- /* diagonal entry is present, check its value */
- weak = (do_values) ? WEAK (dvalue, ctol) : FALSE ;
- }
- if (weak)
- {
- /* flag this column as weak */
- DEBUG0 (("Weak!\n")) ;
- Next [newcol] = IS_WEAK ;
- nweak++ ;
- }
-
- /* ------------------------------------------------------------------ */
- /* count entries in each row that are not numerically weak */
- /* ------------------------------------------------------------------ */
-
- if (do_values)
- {
- if (!do_scale)
- {
- /* no scaling */
- for (p = p1 ; p < p2 ; p++)
- {
- oldrow = Ai [p] ;
- newrow = InvRperm1 [oldrow] - n1 ;
- if (newrow < 0) continue ;
- ASSIGN (aij, Ax, Az, p, split) ;
- APPROX_ABS (value, aij) ;
- weak = WEAK (value, ctol) ;
- if (!weak)
- {
- DEBUG0 ((" strong: row "ID": %g\n", oldrow, value)) ;
- Ci [pp++] = newrow ;
- Ri [newrow]++ ;
- }
- }
- }
-#ifndef NRECIPROCAL
- else if (do_recip)
- {
- /* multiply by the reciprocal */
- for (p = p1 ; p < p2 ; p++)
- {
- oldrow = Ai [p] ;
- newrow = InvRperm1 [oldrow] - n1 ;
- if (newrow < 0) continue ;
- ASSIGN (aij, Ax, Az, p, split) ;
- APPROX_ABS (value, aij) ;
- value *= Rs [oldrow] ;
- weak = WEAK (value, ctol) ;
- if (!weak)
- {
- DEBUG0 ((" strong: row "ID": %g\n", oldrow, value)) ;
- Ci [pp++] = newrow ;
- Ri [newrow]++ ;
- }
- }
- }
-#endif
- else
- {
- /* divide instead */
- for (p = p1 ; p < p2 ; p++)
- {
- oldrow = Ai [p] ;
- newrow = InvRperm1 [oldrow] - n1 ;
- if (newrow < 0) continue ;
- ASSIGN (aij, Ax, Az, p, split) ;
- APPROX_ABS (value, aij) ;
- value /= Rs [oldrow] ;
- weak = WEAK (value, ctol) ;
- if (!weak)
- {
- DEBUG0 ((" strong: row "ID": %g\n", oldrow, value)) ;
- Ci [pp++] = newrow ;
- Ri [newrow]++ ;
- }
- }
- }
- }
- }
- Cp [n2] = pp ;
- ASSERT (AMD_valid (n2, n2, Cp, Ci) == AMD_OK) ;
-
- if (nweak == 0)
- {
- /* nothing to do, quick return */
- DEBUGm2 (("\n =============================UMF_2by2: quick return\n")) ;
- for (k = 0 ; k < n ; k++)
- {
- P [k] = k ;
- }
- *p_nweak = 0 ;
- *p_unmatched = 0 ;
- return ;
- }
-
-#ifndef NDEBUG
- for (k = 0 ; k < n2 ; k++)
- {
- P [k] = EMPTY ;
- }
- for (k = 0 ; k < n2 ; k++)
- {
- ASSERT (Degree [k] >= 0 && Degree [k] < n2) ;
- }
-#endif
-
- /* ---------------------------------------------------------------------- */
- /* find the 2-by-2 permutation */
- /* ---------------------------------------------------------------------- */
-
- /* The matrix S is now mapped to the index range 0 to n2-1. We have
- * S = A (Rperm [n1 .. n-nempty-1], Cperm [n1 .. n-nempty-1]), and then
- * C = pattern of strong entries in S. A weak diagonal k in S is marked
- * with Next [k] = IS_WEAK. */
-
- unmatched = two_by_two (n2, Cp, Ci, Degree, Next, Ri, P, Rp, Head) ;
-
- /* ---------------------------------------------------------------------- */
-
- *p_nweak = nweak ;
- *p_unmatched = unmatched ;
-
-#ifndef NDEBUG
- DEBUGm4 (("UMF_2by2: weak "ID" unmatched "ID"\n", nweak, unmatched)) ;
- for (row = 0 ; row < n ; row++)
- {
- DEBUGm2 (("P ["ID"] = "ID"\n", row, P [row])) ;
- }
- DEBUGm2 (("\n =============================UMF_2by2: done\n\n")) ;
-#endif
-}
-
-#endif
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_2by2.h b/src/C/SuiteSparse/UMFPACK/Source/umf_2by2.h
deleted file mode 100644
index 3cb8b45..0000000
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_2by2.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
-/* -------------------------------------------------------------------------- */
-
-GLOBAL void UMF_2by2
-(
- Int n,
- const Int Ap [ ],
- const Int Ai [ ],
- const double Ax [ ],
-#ifdef COMPLEX
- const double Az [ ],
-#endif
- double tol,
- Int scale,
- Int Cperm1 [ ],
-#ifndef NDEBUG
- Int Rperm1 [ ],
-#endif
- Int InvRperm [ ],
- Int n1,
- Int nempty,
- Int Degree [ ],
- Int P [ ],
- Int *p_nweak,
- Int *p_nmatched,
- Int Ri [ ],
- Int Rp [ ],
- double Rs [ ],
- Int Head [ ],
- Int Next [ ],
- Int Si [ ],
- Int Sp [ ]
-) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_analyze.c b/src/C/SuiteSparse/UMFPACK/Source/umf_analyze.c
index 62e65d6..7af0b4a 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_analyze.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_analyze.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -19,7 +18,7 @@
Uses workspace of size O(nonzeros in A). On input, the matrix A is
stored in row-form at the tail end of Ai. It is destroyed on output.
- The rows of A must be sorted by increasing first column index.
+ The rows of A must be sorted by increasing first nonzero column.
The matrix is assumed to be valid.
Empty rows and columns have already been removed.
@@ -48,7 +47,7 @@ GLOBAL Int UMF_analyze
/* Ap [0..n_row]: row pointers */
/* Row i is in Ai [Ap [i] ... Ap [i+1]-1] */
- /* rows must have smallest col index first, or be */
+ /* rows must have smallest col first, or be */
/* in sorted form. Used as workspace of size n_col */
/* and destroyed. */
@@ -303,10 +302,10 @@ GLOBAL Int UMF_analyze
}
}
- /* rows krow ... knext-1 all have first column index of j */
+ /* rows krow ... knext-1 all have first column of j */
/* (or are empty) */
- /* row knext has first column index of jnext */
+ /* row knext has first column of jnext */
/* if knext = n_row, then jnext is n_col */
if (knext == n_row)
{
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_analyze.h b/src/C/SuiteSparse/UMFPACK/Source/umf_analyze.h
index 733ba03..ed05574 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_analyze.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_analyze.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_analyze
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.c b/src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.c
index 6192af4..a438655 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.h b/src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.h
index dd7e682..59e050a 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_apply_order.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_apply_order
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_assemble.c b/src/C/SuiteSparse/UMFPACK/Source/umf_assemble.c
index 04a3de3..5ec6eb6 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_assemble.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_assemble.c
@@ -3,14 +3,13 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Degree update and numerical assembly. This is compiled twice (with and
- * without FIXQ) for each real/complex int/UF_long version, for a total of 8
- * versions.*/
+ * without FIXQ) for each real/complex int/SuiteSparse_long version, for a
+ * total of 8 versions.*/
#include "umf_internal.h"
#include "umf_assemble.h"
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_assemble.h b/src/C/SuiteSparse/UMFPACK/Source/umf_assemble.h
index e976b48..d5faa4b 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_assemble.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_assemble.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_assemble
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_blas3_update.c b/src/C/SuiteSparse/UMFPACK/Source/umf_blas3_update.c
index c4e9ee7..fa206dc 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_blas3_update.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_blas3_update.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
#include "umf_internal.h"
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_blas3_update.h b/src/C/SuiteSparse/UMFPACK/Source/umf_blas3_update.h
index c77b9ac..f7c29f5 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_blas3_update.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_blas3_update.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_blas3_update
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_build_tuples.c b/src/C/SuiteSparse/UMFPACK/Source/umf_build_tuples.c
index c2ab324..7b243dd 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_build_tuples.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_build_tuples.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_build_tuples.h b/src/C/SuiteSparse/UMFPACK/Source/umf_build_tuples.h
index 0b0410c..c0251cf 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_build_tuples.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_build_tuples.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_build_tuples
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_cholmod.c b/src/C/SuiteSparse/UMFPACK/Source/umf_cholmod.c
new file mode 100644
index 0000000..96481b8
--- /dev/null
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_cholmod.c
@@ -0,0 +1,233 @@
+/* ========================================================================== */
+/* === umf_cholmod ========================================================== */
+/* ========================================================================== */
+
+/* umfpack_cholmod: user-defined ordering function to interface UMFPACK
+ * to CHOLMOD.
+ *
+ * This routine is an example of a user-provided ordering function for UMFPACK.
+ *
+ * This function can be passed to umfpack_*_fsymbolic as the
+ * user_ordering function pointer.
+ */
+
+#include "umf_internal.h"
+#include "umf_cholmod.h"
+
+#ifndef NCHOLMOD
+#include "cholmod.h"
+#endif
+
+#if defined (DINT) || defined (ZINT)
+#define CHOLMOD_start cholmod_start
+#define CHOLMOD_transpose cholmod_transpose
+#define CHOLMOD_analyze cholmod_analyze
+#define CHOLMOD_free_sparse cholmod_free_sparse
+#define CHOLMOD_free_factor cholmod_free_factor
+#define CHOLMOD_finish cholmod_finish
+#define CHOLMOD_print_common cholmod_print_common
+#else
+#define CHOLMOD_start cholmod_l_start
+#define CHOLMOD_transpose cholmod_l_transpose
+#define CHOLMOD_analyze cholmod_l_analyze
+#define CHOLMOD_free_sparse cholmod_l_free_sparse
+#define CHOLMOD_free_factor cholmod_l_free_factor
+#define CHOLMOD_finish cholmod_l_finish
+#define CHOLMOD_print_common cholmod_l_print_common
+#endif
+
+int UMF_cholmod
+(
+ /* inputs */
+ Int nrow, /* A is nrow-by-ncol */
+ Int ncol, /* A is nrow-by-ncol */
+ Int symmetric, /* if true and nrow=ncol do A+A', else do A'A */
+ Int Ap [ ], /* column pointers, size ncol+1 */
+ Int Ai [ ], /* row indices, size nz = Ap [ncol] */
+ /* output */
+ Int Perm [ ], /* fill-reducing permutation, size ncol */
+ /* user-defined */
+ void *user_params, /* Int array of size 3 */
+ double user_info [3] /* [0]: max col count for L=chol(P(A+A')P')
+ [1]: nnz (L)
+ [2]: flop count for chol, if A real */
+)
+{
+#ifndef NCHOLMOD
+ double dmax, flops, c, lnz ;
+ cholmod_sparse Amatrix, *A, *AT, *S ;
+ cholmod_factor *L ;
+ cholmod_common cm ;
+ Int *P, *ColCount ;
+ Int k, ordering_option, print_level, *params ;
+
+ params = (Int *) user_params ;
+ ordering_option = params [0] ;
+ print_level = params [1] - 1 ;
+ params [2] = -1 ;
+
+ if (Ap == NULL || Ai == NULL || Perm == NULL || nrow < 0 || ncol < 0)
+ {
+ /* invalid inputs */
+ return (FALSE) ;
+ }
+ if (nrow != ncol)
+ {
+ /* force symmetric to be false */
+ symmetric = FALSE ;
+ }
+
+ /* start CHOLMOD */
+ CHOLMOD_start (&cm) ;
+ cm.supernodal = CHOLMOD_SIMPLICIAL ;
+ cm.print = print_level ;
+
+ /* adjust cm based on ordering_option */
+ switch (ordering_option)
+ {
+
+ default:
+ case UMFPACK_ORDERING_AMD:
+ /* AMD on A+A' if symmetric, COLAMD on A otherwise */
+ cm.nmethods = 1 ;
+ cm.method [0].ordering = symmetric ? CHOLMOD_AMD : CHOLMOD_COLAMD ;
+ cm.postorder = TRUE ;
+ break ;
+
+ case UMFPACK_ORDERING_METIS:
+ /* metis on A+A' if symmetric, A'A otherwise */
+ cm.nmethods = 1 ;
+ cm.method [0].ordering = CHOLMOD_METIS ;
+ cm.postorder = TRUE ;
+ break ;
+
+ case UMFPACK_ORDERING_NONE:
+ case UMFPACK_ORDERING_GIVEN:
+ case UMFPACK_ORDERING_USER:
+ /* no ordering. No input permutation here, and no user
+ function, so all these are the same as "none". */
+ cm.nmethods = 1 ;
+ cm.method [0].ordering = CHOLMOD_NATURAL ;
+ cm.postorder = FALSE ;
+ break ;
+
+ case UMFPACK_ORDERING_BEST:
+ /* try AMD, METIS and NESDIS on A+A', or COLAMD(A), METIS(A'A),
+ and NESDIS (A'A) */
+ cm.nmethods = 3 ;
+ cm.method [0].ordering = symmetric ? CHOLMOD_AMD : CHOLMOD_COLAMD ;
+ cm.method [1].ordering = CHOLMOD_METIS ;
+ cm.method [2].ordering = CHOLMOD_NESDIS ;
+ cm.postorder = TRUE ;
+ break ;
+
+ case UMFPACK_ORDERING_CHOLMOD:
+ /* no change to CHOLMOD defaults:
+ Do not use given permutation, since it's not provided.
+ Try AMD. If fill-in and flop count are low, use AMD.
+ Otherwise, try METIS and take the best of AMD and METIS.
+ cm.method [0].ordering = CHOLMOD_GIVEN
+ cm.method [1].ordering = CHOLMOD_AMD
+ cm.method [2].ordering = CHOLMOD_METIS
+ cm.nmethods = 2 if METIS installed, 3 otherwise ('given' is skipped)
+ */
+ break ;
+ }
+
+ /* construct a CHOLMOD version of the input matrix A */
+ A = &Amatrix ;
+ A->nrow = nrow ; /* A is nrow-by-ncol */
+ A->ncol = ncol ;
+ A->nzmax = Ap [ncol] ; /* with nzmax entries */
+ A->packed = TRUE ; /* there is no A->nz array */
+ if (symmetric)
+ {
+ A->stype = 1 ; /* A is symmetric */
+ }
+ else
+ {
+ A->stype = 0 ; /* A is unsymmetric */
+ }
+ A->itype = CHOLMOD_INT ;
+ A->xtype = CHOLMOD_PATTERN ;
+ A->dtype = CHOLMOD_DOUBLE ;
+ A->nz = NULL ;
+ A->p = Ap ; /* column pointers */
+ A->i = Ai ; /* row indices */
+ A->x = NULL ; /* no numerical values */
+ A->z = NULL ;
+ A->sorted = FALSE ; /* columns of A might not be sorted */
+
+ if (symmetric)
+ {
+ /* CHOLMOD with order the symmetric matrix A */
+ AT = NULL ;
+ S = A ;
+ }
+ else
+ {
+ /* S = A'. CHOLMOD will order S*S', which is A'*A */
+ AT = CHOLMOD_transpose (A, 0, &cm) ;
+ S = AT ;
+ }
+
+ /* order and analyze S or S*S' */
+ L = CHOLMOD_analyze (S, &cm) ;
+ CHOLMOD_free_sparse (&AT, &cm) ;
+ if (L == NULL)
+ {
+ return (FALSE) ;
+ }
+
+ /* determine the ordering used */
+ switch (L->ordering)
+ {
+
+ case CHOLMOD_AMD:
+ case CHOLMOD_COLAMD:
+ params [2] = UMFPACK_ORDERING_AMD ;
+ break ;
+
+ case CHOLMOD_METIS:
+ case CHOLMOD_NESDIS:
+ params [2] = UMFPACK_ORDERING_METIS ;
+ break ;
+
+ case CHOLMOD_GIVEN:
+ case CHOLMOD_NATURAL:
+ default:
+ params [2] = UMFPACK_ORDERING_NONE ;
+ break ;
+ }
+
+ /* copy the permutation from L to the output and compute statistics */
+ P = L->Perm ;
+ ColCount = L->ColCount ;
+ dmax = 1 ;
+ lnz = 0 ;
+ flops = 0 ;
+ for (k = 0 ; k < ncol ; k++)
+ {
+ Perm [k] = P [k] ;
+ c = ColCount [k] ;
+ if (c > dmax) dmax = c ;
+ lnz += c ;
+ flops += c*c ;
+ }
+ user_info [0] = dmax ;
+ user_info [1] = lnz ;
+ user_info [2] = flops ;
+
+ CHOLMOD_free_factor (&L, &cm) ;
+ if (print_level > 0)
+ {
+ CHOLMOD_print_common ("for UMFPACK", &cm) ;
+ }
+ CHOLMOD_finish (&cm) ;
+ return (TRUE) ;
+#else
+ /* CHOLMOD and its supporting packages (CAMD, CCOLAMD, COLAMD, metis-4.0)
+ not installed */
+ return (FALSE) ;
+#endif
+}
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_cholmod.h b/src/C/SuiteSparse/UMFPACK/Source/umf_cholmod.h
new file mode 100644
index 0000000..8879deb
--- /dev/null
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_cholmod.h
@@ -0,0 +1,37 @@
+#include "umfpack.h"
+
+int umf_i_cholmod
+(
+ /* inputs */
+ int nrow, /* A is nrow-by-ncol */
+ int ncol, /* A is nrow-by-ncol */
+ int symmetric, /* if true and nrow=ncol do A+A', else do A'A */
+ int Ap [ ], /* column pointers, size ncol+1 */
+ int Ai [ ], /* row indices, size nz = Ap [ncol] */
+ /* output */
+ int Perm [ ], /* fill-reducing permutation, size ncol */
+ /* user-defined */
+ void *ignore, /* not needed */
+ double user_info [3] /* [0]: max col count for L=chol(P(A+A')P')
+ [1]: nnz (L)
+ [2]: flop count for chol, if A real */
+) ;
+
+
+int umf_l_cholmod
+(
+ /* inputs */
+ SuiteSparse_long nrow, /* A is nrow-by-ncol */
+ SuiteSparse_long ncol, /* A is nrow-by-ncol */
+ SuiteSparse_long symmetric, /* if true and nrow=ncol do A+A', else do A'A */
+ SuiteSparse_long Ap [ ], /* column pointers, size ncol+1 */
+ SuiteSparse_long Ai [ ], /* row indices, size nz = Ap [ncol] */
+ /* output */
+ SuiteSparse_long Perm [ ], /* fill-reducing permutation, size ncol */
+ /* user-defined */
+ void *ignore, /* not needed */
+ double user_info [3] /* [0]: max col count for L=chol(P(A+A')P')
+ [1]: nnz (L)
+ [2]: flop count for chol, if A real */
+) ;
+
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_colamd.c b/src/C/SuiteSparse/UMFPACK/Source/umf_colamd.c
index 5a9b168..3efd0b1 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_colamd.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_colamd.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -38,7 +37,7 @@ Purpose:
Authors:
The authors of the COLAMD code itself are Stefan I. Larimore and Timothy A.
- Davis, University of Florida. The algorithm was developed in collaboration
+ Davis. The algorithm was developed in collaboration
with John Gilbert, Xerox PARC, and Esmond Ng, Oak Ridge National Laboratory.
The AMD metric on which this is based is by Patrick Amestoy, T. Davis,
and Iain Duff.
@@ -60,7 +59,7 @@ See the UMFPACK README file for the License for your use of this code.
Availability:
Both UMFPACK and the original unmodified colamd/symamd library are
- available at http://www.cise.ufl.edu/research/sparse.
+ available at http://www.suitesparse.com.
Changes for inclusion in UMFPACK:
@@ -83,8 +82,7 @@ For more information, see:
Davis, T. A. and Gilbert, J. R. and Larimore, S. I. and Ng, E. G.,
A column approximate minimum degree ordering algorithm,
- Univ. of Florida, CISE Dept., TR-00-005, Gainesville, FL
- Oct. 2000. Submitted to ACM Trans. Math. Softw.
+ ACM Trans. Math. Softw., vol 3, no 3, 2004
*/
@@ -313,8 +311,7 @@ For more information, see:
Example:
- See http://www.cise.ufl.edu/~davis/colamd/example.c
- for a complete example.
+ See colamd_example.c for a complete example.
To order the columns of a 5-by-4 matrix with 11 nonzero entries in
the following nonzero pattern
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_colamd.h b/src/C/SuiteSparse/UMFPACK/Source/umf_colamd.h
index 51675a5..4eff029 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_colamd.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_colamd.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -13,7 +12,7 @@
Authors:
The authors of the COLAMD code itself are Stefan I. Larimore and Timothy A.
- Davis, University of Florida. The algorithm was developed in collaboration
+ Davis. The algorithm was developed in collaboration
with John Gilbert, Xerox PARC, and Esmond Ng, Oak Ridge National Laboratory.
Date:
@@ -33,7 +32,7 @@ See the UMFPACK README file for the License for your use of this code.
Availability:
Both UMFPACK and the original unmodified colamd/symamd library are
- available at http://www.cise.ufl.edu/research/sparse.
+ available at http://www.suitesparse.com.
*/
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_config.h b/src/C/SuiteSparse/UMFPACK/Source/umf_config.h
index 79e9f5d..0f6c2a3 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_config.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_config.h
@@ -3,17 +3,17 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
This file controls the compile-time configuration of UMFPACK. Modify the
- UFconfig/UFconfig.mk file and this file if necessary, to control these
- options. The following flags may be given as options to your C compiler
- (as in "cc -DNSUNPERF", for example). These flags are normally placed in
- your UMFPACK_CONFIG string, defined in the UFconfig/UFconfig.mk file.
+ SuiteSparse_config/SuiteSparse_config.mk file and this file if necessary,
+ to control these options. The following flags may be given as options to
+ your C compiler (as in "cc -DNSUNPERF", for example). These flags are
+ normally placed in your UMFPACK_CONFIG string, defined in the
+ SuiteSparse_config/SuiteSparse_config.mk file.
All of these options, except for the timer, are for accessing the BLAS.
@@ -27,29 +27,6 @@
-DLONGBLAS
- -DNPOSIX
-
- If -DNPOSIX is set, then your Unix operating system is not POSIX-
- compliant, and the POSIX routines sysconf ( ) and times ( )
- routines are not used. These routines provide CPU time and
- wallclock time information. If -DNPOSIX is set, then the ANSI
- C clock ( ) routine is used. If -DNPOSIX is not set, then
- sysconf ( ) and times ( ) are used in umfpack_tic and umfpack_toc.
- See umfpack_tictoc.c for more information.
- The default is to use the POSIX routines, except for Windows,
- which is not POSIX-compliant.
-
- -DGETRUSAGE
-
- If -DGETRUSAGE is set, then your system's getrusage ( ) routine
- will be used for getting the process CPU time. Otherwise the ANSI
- C clock ( ) routine will be used. The default is to use getrusage
- ( ) on Unix systems, and to use clock on all other architectures.
-
- -DNO_TIMER
-
- If -DNO_TIMER is set, then no timing routines are used at all.
-
-DNRECIPROCAL
This option controls a tradeoff between speed and accuracy. Using
@@ -117,7 +94,7 @@
/* === AMD configuration ==================================================== */
/* ========================================================================== */
-/* NDEBUG, PRINTF defined in amd_internal.h */
+#define PRINTF(params) SUITESPARSE_PRINTF(params)
/* ========================================================================== */
/* === reciprocal option ==================================================== */
@@ -157,34 +134,12 @@
#define INDEX(i) (i)
#endif
-/* ========================================================================== */
-/* === Timer ================================================================ */
-/* ========================================================================== */
-
-/*
- If you have the getrusage routine (all Unix systems I've test do), then use
- that. Otherwise, use the ANSI C clock function. Note that on many
- systems, the ANSI clock function wraps around after only 2147 seconds, or
- about 36 minutes. BE CAREFUL: if you compare the run time of UMFPACK with
- other sparse matrix packages, be sure to use the same timer. See
- umfpack_tictoc.c for the timer used internally by UMFPACK. See also
- umfpack_timer.c for the timer used in an earlier version of UMFPACK.
- That timer is still available as a user-callable routine, but it is no
- longer used internally by UMFPACK.
-*/
-
-/* Sun Solaris, SGI Irix, Linux, Compaq Alpha, and IBM RS 6000 all have */
-/* getrusage. It's in BSD unix, so perhaps all unix systems have it. */
-#if defined (UMF_SOL2) || defined (UMF_SGI) || defined (UMF_LINUX) \
-|| defined (UMF_ALPHA) || defined (UMF_AIX) || defined (UMF_CYGWIN)
-#define GETRUSAGE
-#endif
-
/* ========================================================================== */
/* === BLAS ================================================================= */
/* ========================================================================== */
+#define BLAS_OK blas_ok
#include "cholmod_blas.h"
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_create_element.c b/src/C/SuiteSparse/UMFPACK/Source/umf_create_element.c
index bb487ec..f7a97e0 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_create_element.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_create_element.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_create_element.h b/src/C/SuiteSparse/UMFPACK/Source/umf_create_element.h
index b6025bb..43e84b3 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_create_element.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_create_element.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_create_element
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_dump.c b/src/C/SuiteSparse/UMFPACK/Source/umf_dump.c
index c68f198..b79aad0 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_dump.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_dump.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* These routines, and external variables, are used only when debugging. */
@@ -245,7 +244,7 @@ GLOBAL void UMF_dump_rowcol
{
Entry value ;
Entry *C ;
- Int f, nrows, j, jj, len, e, deg, index, n_row, n_col, *Cols, *Rows, nn,
+ Int f, nrows, j, jj, len, e, deg, rowcol, n_row, n_col, *Cols, *Rows, nn,
dumpdeg, ncols, preve, *E, tpi, *Pattern, approx_deg, not_in_use ;
Tuple *tp, *tend ;
Element *ep ;
@@ -382,31 +381,31 @@ GLOBAL void UMF_dump_rowcol
{
for (j = 0 ; j < jj ; j++)
{
- index = Pattern [j] ;
+ rowcol = Pattern [j] ;
value =
C [ (dumpwhich == 0) ? (f+nrows*j) : (j+nrows*f) ] ;
- if (index >= 0)
+ if (rowcol >= 0)
{
- DEBUG8 (("\t\t"ID":", index)) ;
+ DEBUG8 (("\t\t"ID":", rowcol)) ;
EDEBUG8 (value) ;
DEBUG8 (("\n")) ;
if (dumpwhich == 0)
{
/* col must be in the range 0..n_col-1 */
- ASSERT (index < n_col) ;
+ ASSERT (rowcol < n_col) ;
}
else
{
/* row must be in the range 0..n_row-1 */
- ASSERT (index < n_row) ;
+ ASSERT (rowcol < n_row) ;
}
if (nn <= UMF_DBMAX)
{
- if (UMF_DBscatter [index] != UMF_DBflag)
+ if (UMF_DBscatter [rowcol] != UMF_DBflag)
{
- UMF_DBpacked [deg++] = index ;
- UMF_DBscatter [index] = UMF_DBflag ;
+ UMF_DBpacked [deg++] = rowcol ;
+ UMF_DBscatter [rowcol] = UMF_DBflag ;
}
}
}
@@ -430,10 +429,10 @@ GLOBAL void UMF_dump_rowcol
DEBUG7 ((" Assembled, actual deg: "ID" : ", deg)) ;
for (j = 0 ; j < deg ; j++)
{
- index = UMF_DBpacked [j] ;
- DEBUG8 ((ID" ", index)) ;
+ rowcol = UMF_DBpacked [j] ;
+ DEBUG8 ((ID" ", rowcol)) ;
if (j % 20 == 19) DEBUG8 (("\n ")) ;
- ASSERT (UMF_DBscatter [index] == UMF_DBflag) ;
+ ASSERT (UMF_DBscatter [rowcol] == UMF_DBflag) ;
}
DEBUG7 (("\n")) ;
}
@@ -1091,8 +1090,10 @@ GLOBAL void UMF_dump_start
sizeof (int), sizeof (int) / sizeof (int), UNITS (int, 1) )) ;
DEBUG2 (("sizeof (size_t) %u %u %u\n",
sizeof (size_t), sizeof (size_t) / sizeof (size_t), UNITS (size_t, 1) )) ;
- DEBUG2 (("sizeof (UF_long) %u %u %u\n",
- sizeof (UF_long), sizeof (UF_long) / sizeof (UF_long), UNITS (UF_long, 1)));
+ DEBUG2 (("sizeof (SuiteSparse_long) %u %u %u\n",
+ sizeof (SuiteSparse_long),
+ sizeof (SuiteSparse_long) / sizeof (SuiteSparse_long),
+ UNITS (SuiteSparse_long, 1)));
DEBUG2 (("sizeof (double) %u %u %u\n",
sizeof (double), sizeof (double) / sizeof (int), UNITS (double, 1) )) ;
DEBUG2 (("sizeof (Unit) %u %u %u\n",
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_dump.h b/src/C/SuiteSparse/UMFPACK/Source/umf_dump.h
index f74d456..710baaa 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_dump.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_dump.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* umf_dump.h: debugging definitions. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_extend_front.c b/src/C/SuiteSparse/UMFPACK/Source/umf_extend_front.c
index 317c0c6..98253e2 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_extend_front.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_extend_front.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Called by kernel. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_extend_front.h b/src/C/SuiteSparse/UMFPACK/Source/umf_extend_front.h
index 6c51986..1ee86ca 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_extend_front.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_extend_front.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_extend_front
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_free.c b/src/C/SuiteSparse/UMFPACK/Source/umf_free.c
index 867ab22..ff72280 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_free.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_free.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -30,8 +29,7 @@ GLOBAL void *UMF_free
if (p)
{
- /* see AMD/Source/amd_global.c for the memory allocator selection */
- amd_free (p) ;
+ SuiteSparse_free (p) ;
#if defined (UMF_MALLOC_COUNT) || !defined (NDEBUG)
/* One more object has been free'd. Keep track of the count. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_free.h b/src/C/SuiteSparse/UMFPACK/Source/umf_free.h
index cacf331..9c156df 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_free.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_free.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void *UMF_free
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_fsize.c b/src/C/SuiteSparse/UMFPACK/Source/umf_fsize.c
index 634b525..48c88e8 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_fsize.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_fsize.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Determine the largest frontal matrix size for each subtree. Called by
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_fsize.h b/src/C/SuiteSparse/UMFPACK/Source/umf_fsize.h
index 1bd83d4..66529d4 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_fsize.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_fsize.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_fsize
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_garbage_collection.c b/src/C/SuiteSparse/UMFPACK/Source/umf_garbage_collection.c
index 716270b..c32b766 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_garbage_collection.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_garbage_collection.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_garbage_collection.h b/src/C/SuiteSparse/UMFPACK/Source/umf_garbage_collection.h
index 9d2d8b7..3cacae9 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_garbage_collection.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_garbage_collection.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_garbage_collection
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.c b/src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.c
index 696955b..217d327 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.h b/src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.h
index 317d97a..98be54e 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_get_memory.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_get_memory
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.c b/src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.c
index 611c3a1..c3e8154 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Current frontal matrix is too small. Make it bigger. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.h b/src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.h
index 8078897..02be4fb 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_grow_front.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_grow_front
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_init_front.c b/src/C/SuiteSparse/UMFPACK/Source/umf_init_front.c
index 201f1f8..1413b50 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_init_front.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_init_front.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
#include "umf_internal.h"
@@ -137,7 +136,7 @@ GLOBAL Int UMF_init_front
for (i = fnrows ; i < fnrows_extended ; i++)
{
Fl [i] = Wy [i] ;
- /* flip the row index, since Wrp must be < 0 */
+ /* flip the row, since Wrp must be < 0 */
row = Frows [i] ;
Work->NewRows [i] = FLIP (row) ;
}
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_init_front.h b/src/C/SuiteSparse/UMFPACK/Source/umf_init_front.h
index 9801b72..8a613bd 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_init_front.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_init_front.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_init_front
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_internal.h b/src/C/SuiteSparse/UMFPACK/Source/umf_internal.h
index cd46b03..1facfb6 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_internal.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_internal.h
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -46,6 +45,10 @@
#define UMF_LINUX
#define UMFPACK_ARCHITECTURE "Linux"
+#elif defined (__APPLE__)
+#define UMF_MAC
+#define UMFPACK_ARCHITECTURE "Mac"
+
#elif defined (_AIX) || defined (MIBM_RS) || defined (ARCH_IBM_RS)
#define UMF_AIX
#define UMFPACK_ARCHITECTURE "IBM AIX"
@@ -103,7 +106,7 @@
#endif
/* -------------------------------------------------------------------------- */
-/* Real/complex and int/UF_long definitions, double relops */
+/* Real/complex and int/SuiteSparse_long definitions, double relops */
/* -------------------------------------------------------------------------- */
#include "umf_version.h"
@@ -200,15 +203,7 @@
/* Memory allocator */
/* -------------------------------------------------------------------------- */
-/* See AMD/Source/amd_global.c and AMD/Source/amd.h for the
- * definition of the memory allocator used by UMFPACK. Versions 4.4 and
- * earlier had their memory allocator definitions here. Other global
- * function pointers for UMFPACK are located in umf_global.c.
- *
- * The MATLAB mexFunction uses MATLAB's memory manager and mexPrintf, while the
- * C-callable AMD library uses the ANSI C malloc, free, realloc, and printf
- * routines.
- */
+ /* see SuiteSparse_config */
/* -------------------------------------------------------------------------- */
/* Memory space definitions */
@@ -668,7 +663,7 @@ typedef struct /* SymbolicType */
maxnrows, /* largest number of rows in any front */
maxncols, /* largest number of columns in any front */
*Front_npivcol, /* Front_npivcol [j] = size of jth supercolumn*/
- *Front_1strow, /* first row index in front j */
+ *Front_1strow, /* first row in front j */
*Front_leftmostdesc, /* leftmost desc of front j */
*Front_parent, /* super-column elimination tree */
*Cperm_init, /* initial column ordering */
@@ -678,7 +673,7 @@ typedef struct /* SymbolicType */
dense_row_threshold,
n1, /* number of singletons */
nempty, /* MIN (nempty_row, nempty_col) */
- *Diagonal_map, /* initial "diagonal" (after 2by2) */
+ *Diagonal_map, /* initial "diagonal" */
esize, /* size of Esize array */
nfr,
n_row, n_col, /* matrix A is n_row-by-n_col */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_is_permutation.c b/src/C/SuiteSparse/UMFPACK/Source/umf_is_permutation.c
index 689c65e..5971c83 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_is_permutation.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_is_permutation.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Return TRUE if P is a r-permutation vector, FALSE otherwise */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_is_permutation.h b/src/C/SuiteSparse/UMFPACK/Source/umf_is_permutation.h
index 2468545..7bda1d1 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_is_permutation.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_is_permutation.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_is_permutation
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel.c b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel.c
index 6168829..2ca0de3 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel.h b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel.h
index 0f5d70d..68c0778 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_kernel
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.c b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.c
index 464c19c..ef1af77 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -771,9 +770,6 @@ GLOBAL Int UMF_kernel_init
cdeg = Cdeg [k] ;
ASSERT (cdeg >= 0) ;
- ASSERT (IMPLIES (
- (Symbolic->ordering != UMFPACK_ORDERING_GIVEN) && n1 > 0,
- cdeg > 1 || cdeg == 0)) ;
/* if fixQ: set Col_degree to 0 for the NON_PIVOTAL_COL macro */
Col_degree [k] = fixQ ? 0 : cdeg ;
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.h b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.h
index dc86d04..21f8c30 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_init.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_kernel_init
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.c b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.c
index d9c3cd5..3066d26 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* The matrix is factorized. Finish the LU data structure. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.h b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.h
index e3e8fbd..923d513 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_kernel_wrapup.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_kernel_wrapup
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_local_search.c b/src/C/SuiteSparse/UMFPACK/Source/umf_local_search.c
index ecfb388..5d79dc8 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_local_search.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_local_search.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_local_search.h b/src/C/SuiteSparse/UMFPACK/Source/umf_local_search.h
index 434d66f..97aa6fd 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_local_search.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_local_search.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_local_search
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.c b/src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.c
index 7e1943c..3d0f46f 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* solves Lx = b, where L is the lower triangular factor of a matrix */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.h b/src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.h
index 211adff..8501b13 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_lsolve.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL double UMF_lsolve
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.c b/src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.c
index 1792dfa..793e9b4 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Solves L'x = b or L.'x=b, where L is the lower triangular factor of a */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.h b/src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.h
index 02f7734..4787d68 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_ltsolve.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL double UMF_ltsolve
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_malloc.c b/src/C/SuiteSparse/UMFPACK/Source/umf_malloc.c
index d7ff561..c597435 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_malloc.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_malloc.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -61,20 +60,7 @@ GLOBAL void *UMF_malloc
DEBUG0 (("UMF_malloc: ")) ;
- /* make sure that we allocate something */
- n_objects = MAX (1, n_objects) ;
-
- size = (size_t) n_objects ;
- ASSERT (size_of_object > 1) ;
- if (size > Int_MAX / size_of_object)
- {
- /* object is too big for integer pointer arithmetic */
- return ((void *) NULL) ;
- }
- size *= size_of_object ;
-
- /* see AMD/Source/amd_global.c for the memory allocator selection */
- p = amd_malloc (size) ;
+ p = SuiteSparse_malloc (n_objects, size_of_object) ;
DEBUG0 ((ID"\n", (Int) p)) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_malloc.h b/src/C/SuiteSparse/UMFPACK/Source/umf_malloc.h
index 8ee9934..7ebf243 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_malloc.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_malloc.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
#ifndef _UMF_MALLOC
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_element.c b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_element.c
index cac0db8..633b371 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_element.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_element.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* The UMF_mem_* routines manage the Numeric->Memory memory space. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_element.h b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_element.h
index e0b259f..f374f5c 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_element.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_element.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_mem_alloc_element
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_head_block.c b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_head_block.c
index 6d7355c..efbeb79 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_head_block.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_head_block.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* The UMF_mem_* routines manage the Numeric->Memory memory space. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_head_block.h b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_head_block.h
index 510a6fa..f2266a3 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_head_block.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_head_block.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_mem_alloc_head_block
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_tail_block.c b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_tail_block.c
index a16698a..7041252 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_tail_block.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_tail_block.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* The UMF_mem_* routines manage the Numeric->Memory memory space. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_tail_block.h b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_tail_block.h
index d072a73..7d2e7c6 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_tail_block.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_alloc_tail_block.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_mem_alloc_tail_block
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_free_tail_block.c b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_free_tail_block.c
index 9bec421..26ba206 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_free_tail_block.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_free_tail_block.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* The UMF_mem_* routines manage the Numeric->Memory memory space. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_free_tail_block.h b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_free_tail_block.h
index 14c7324..7462cba 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_free_tail_block.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_free_tail_block.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_mem_free_tail_block
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_init_memoryspace.c b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_init_memoryspace.c
index 0e05f5c..01f782f 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_init_memoryspace.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_init_memoryspace.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* The UMF_mem_* routines manage the Numeric->Memory memory space. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_init_memoryspace.h b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_init_memoryspace.h
index 45d552f..b0903c5 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_mem_init_memoryspace.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_mem_init_memoryspace.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_mem_init_memoryspace
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_multicompile.c b/src/C/SuiteSparse/UMFPACK/Source/umf_multicompile.c
index 0603560..a075c91 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_multicompile.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_multicompile.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* This file is not needed if you have the Unix/Linux "make" command for
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_realloc.c b/src/C/SuiteSparse/UMFPACK/Source/umf_realloc.c
index feae25a..607e164 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_realloc.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_realloc.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -57,8 +56,7 @@ GLOBAL void *UMF_realloc
DEBUG0 (("UMF_realloc: "ID" n_objects "ID" size_of_object "ID"\n",
(Int) p, n_objects, (Int) size_of_object)) ;
- /* see AMD/Source/amd_global.c for the memory allocator selection */
- p2 = amd_realloc (p, size) ;
+ p2 = SuiteSparse_config.realloc_func (p, size) ;
#if defined (UMF_MALLOC_COUNT) || !defined (NDEBUG)
/* If p didn't exist on input, and p2 exists, then a new object has been
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_realloc.h b/src/C/SuiteSparse/UMFPACK/Source/umf_realloc.h
index 5b2f1c2..b40eccf 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_realloc.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_realloc.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void *UMF_realloc
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.c b/src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.c
index aa5260d..fc6aa76 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
#include "umf_internal.h"
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.h b/src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.h
index 6b18d85..a6233f6 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_report_perm.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_report_perm
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_report_vector.c b/src/C/SuiteSparse/UMFPACK/Source/umf_report_vector.c
index 5533683..e26daad 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_report_vector.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_report_vector.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
#include "umf_internal.h"
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_report_vector.h b/src/C/SuiteSparse/UMFPACK/Source/umf_report_vector.h
index 6a758d7..82211b9 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_report_vector.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_report_vector.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_report_vector
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_row_search.c b/src/C/SuiteSparse/UMFPACK/Source/umf_row_search.c
index f20ca0c..505fe51 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_row_search.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_row_search.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_row_search.h b/src/C/SuiteSparse/UMFPACK/Source/umf_row_search.h
index e0171ee..c105923 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_row_search.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_row_search.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_row_search
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_scale.c b/src/C/SuiteSparse/UMFPACK/Source/umf_scale.c
index 04f09df..6ca8556 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_scale.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_scale.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Divide a vector of stride 1 by the pivot value. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_scale.h b/src/C/SuiteSparse/UMFPACK/Source/umf_scale.h
index 99799f5..b030afb 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_scale.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_scale.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_scale
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_scale_column.c b/src/C/SuiteSparse/UMFPACK/Source/umf_scale_column.c
index 9fd3796..74cb476 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_scale_column.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_scale_column.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_scale_column.h b/src/C/SuiteSparse/UMFPACK/Source/umf_scale_column.h
index 2306787..25a93a8 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_scale_column.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_scale_column.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_scale_column
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.c b/src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.c
index fb1f232..8eaf0f9 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.h b/src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.h
index f4342ce..29e1c00 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_set_stats.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL void UMF_set_stats
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_singletons.c b/src/C/SuiteSparse/UMFPACK/Source/umf_singletons.c
index 663a590..3e2ec1a 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_singletons.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_singletons.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Find and order the row and column singletons of a matrix A. If there are
@@ -748,6 +747,7 @@ GLOBAL Int UMF_singletons
const Int Ai [ ], /* size nz = Ap [n_col] */
const Int Quser [ ], /* size n_col if present */
Int strategy, /* strategy requested by user */
+ Int do_singletons, /* if false, then do not look for singletons */
/* output, not defined on input: */
Int Cdeg [ ], /* size n_col */
@@ -822,7 +822,14 @@ GLOBAL Int UMF_singletons
/* find singletons */
/* ---------------------------------------------------------------------- */
- if (Quser != (Int *) NULL)
+ if (!do_singletons)
+ {
+ /* do not look for singletons at all */
+ n1 = 0 ;
+ n1r = 0 ;
+ n1c = 0 ;
+ }
+ else if (Quser != (Int *) NULL)
{
/* user has provided an input column ordering */
if (strategy == UMFPACK_STRATEGY_UNSYMMETRIC)
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_singletons.h b/src/C/SuiteSparse/UMFPACK/Source/umf_singletons.h
index 5b2e498..4093188 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_singletons.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_singletons.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_singletons
@@ -12,6 +11,7 @@ GLOBAL Int UMF_singletons
const Int Ai [ ],
const Int Quser [ ],
Int strategy,
+ Int do_singletons,
Int Cdeg [ ],
Int Cperm [ ],
Int Rdeg [ ],
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_solve.c b/src/C/SuiteSparse/UMFPACK/Source/umf_solve.c
index 42bf879..71b8b54 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_solve.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_solve.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_solve.h b/src/C/SuiteSparse/UMFPACK/Source/umf_solve.h
index 80a796c..9183c15 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_solve.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_solve.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_solve
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_start_front.c b/src/C/SuiteSparse/UMFPACK/Source/umf_start_front.c
index 47aa354..902e258 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_start_front.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_start_front.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Allocate the initial frontal matrix working array for a single chain. The
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_start_front.h b/src/C/SuiteSparse/UMFPACK/Source/umf_start_front.h
index 1a1c4f2..f59c8d9 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_start_front.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_start_front.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_start_front
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.c b/src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.c
index 97e1081..7b0f55c 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.h b/src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.h
index 82627ad..4379a11 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_store_lu.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_store_lu
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_symbolic_usage.c b/src/C/SuiteSparse/UMFPACK/Source/umf_symbolic_usage.c
index 31abdf9..b16ce92 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_symbolic_usage.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_symbolic_usage.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Returns the final size of the Symbolic object, in Units */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_symbolic_usage.h b/src/C/SuiteSparse/UMFPACK/Source/umf_symbolic_usage.h
index 3fad24a..1caeeca 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_symbolic_usage.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_symbolic_usage.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL double UMF_symbolic_usage
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_transpose.c b/src/C/SuiteSparse/UMFPACK/Source/umf_transpose.c
index 6ac7435..262fede 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_transpose.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_transpose.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Not user-callable. Computes a permuted transpose, R = (A (P,Q(1:nq)))' in
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_transpose.h b/src/C/SuiteSparse/UMFPACK/Source/umf_transpose.h
index 4c4dee9..b6b93ff 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_transpose.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_transpose.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_transpose
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_triplet.c b/src/C/SuiteSparse/UMFPACK/Source/umf_triplet.c
index aaca50c..13a43c0 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_triplet.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_triplet.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_triplet.h b/src/C/SuiteSparse/UMFPACK/Source/umf_triplet.h
index 62f9729..e1b3b69 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_triplet.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_triplet.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_triplet_map_x
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_tuple_lengths.c b/src/C/SuiteSparse/UMFPACK/Source/umf_tuple_lengths.c
index 8dd349e..61da4af 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_tuple_lengths.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_tuple_lengths.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Determine the tuple list lengths, and the amount of memory required for */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_tuple_lengths.h b/src/C/SuiteSparse/UMFPACK/Source/umf_tuple_lengths.h
index a31ccb9..038bdd0 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_tuple_lengths.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_tuple_lengths.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_tuple_lengths
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_usolve.c b/src/C/SuiteSparse/UMFPACK/Source/umf_usolve.c
index f5a127d..4ea12ef 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_usolve.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_usolve.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* solves Ux = b, where U is the upper triangular factor of a matrix. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_usolve.h b/src/C/SuiteSparse/UMFPACK/Source/umf_usolve.h
index 3b950d3..55b6142 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_usolve.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_usolve.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL double UMF_usolve
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.c b/src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.c
index 3d557b6..708a04c 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* solves U'x = b or U.'x=b, where U is the upper triangular factor of a */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.h b/src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.h
index dae3143..44f9485 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_utsolve.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL double UMF_utsolve
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_valid_numeric.c b/src/C/SuiteSparse/UMFPACK/Source/umf_valid_numeric.c
index 76855e3..48c0686 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_valid_numeric.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_valid_numeric.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* Returns TRUE if the Numeric object is valid, FALSE otherwise. */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_valid_numeric.h b/src/C/SuiteSparse/UMFPACK/Source/umf_valid_numeric.h
index 0b258e4..8ea1da4 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_valid_numeric.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_valid_numeric.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_valid_numeric
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_valid_symbolic.c b/src/C/SuiteSparse/UMFPACK/Source/umf_valid_symbolic.c
index dd81851..d396839 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_valid_symbolic.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_valid_symbolic.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
#include "umf_internal.h"
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_valid_symbolic.h b/src/C/SuiteSparse/UMFPACK/Source/umf_valid_symbolic.h
index 741a799..299f0fd 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_valid_symbolic.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_valid_symbolic.h
@@ -1,7 +1,6 @@
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
GLOBAL Int UMF_valid_symbolic
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umf_version.h b/src/C/SuiteSparse/UMFPACK/Source/umf_version.h
index 98d765f..186078f 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umf_version.h
+++ b/src/C/SuiteSparse/UMFPACK/Source/umf_version.h
@@ -3,17 +3,16 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
Define routine names, depending on version being compiled.
DINT: double precision, int's as integers
- DLONG: double precision, UF_long's as integers
- ZLONG: complex double precision, UF_long's as integers
+ DLONG: double precision, SuiteSparse_long's as integers
+ ZLONG: complex double precision, SuiteSparse_long's as integers
ZINT: complex double precision, int's as integers
*/
@@ -28,7 +27,7 @@
#endif
/* -------------------------------------------------------------------------- */
-/* integer type (Int is int or UF_long) now defined in amd_internal.h */
+/* integer type (Int is int or SuiteSparse_long) defined in amd_internal.h */
/* -------------------------------------------------------------------------- */
#if defined (DLONG) || defined (ZLONG)
@@ -353,7 +352,8 @@ typedef struct
/* c = a/b, using function pointer */
#define DIV(c,a,b) \
{ \
- (void) umfpack_divcomplex ((a).Real, (a).Imag, (b).Real, (b).Imag, \
+ (void) SuiteSparse_config.divcomplex_func \
+ ((a).Real, (a).Imag, (b).Real, (b).Imag, \
&((c).Real), &((c).Imag)) ; \
}
@@ -362,7 +362,8 @@ typedef struct
/* c = a/conjugate(b), using function pointer */
#define DIV_CONJ(c,a,b) \
{ \
- (void) umfpack_divcomplex ((a).Real, (a).Imag, (b).Real, (-(b).Imag), \
+ (void) SuiteSparse_config.divcomplex_func \
+ ((a).Real, (a).Imag, (b).Real, (-(b).Imag), \
&((c).Real), &((c).Imag)) ; \
}
@@ -379,7 +380,7 @@ typedef struct
/* exact absolute value, s = sqrt (a.real^2 + a.imag^2) */
#define ABS(s,a) \
{ \
- (s) = umfpack_hypot ((a).Real, (a).Imag) ; \
+ (s) = SuiteSparse_config.hypot_func ((a).Real, (a).Imag) ; \
}
/* -------------------------------------------------------------------------- */
@@ -475,7 +476,7 @@ typedef struct
#define UMF_triplet_map_nox umfdi_triplet_map_nox
#define UMF_triplet_nomap_x umfdi_triplet_nomap_x
#define UMF_triplet_nomap_nox umfdi_triplet_nomap_nox
-#define UMF_2by2 umfdi_2by2
+#define UMF_cholmod umf_i_cholmod
#define UMFPACK_col_to_triplet umfpack_di_col_to_triplet
#define UMFPACK_defaults umfpack_di_defaults
@@ -487,6 +488,7 @@ typedef struct
#define UMFPACK_get_determinant umfpack_di_get_determinant
#define UMFPACK_numeric umfpack_di_numeric
#define UMFPACK_qsymbolic umfpack_di_qsymbolic
+#define UMFPACK_fsymbolic umfpack_di_fsymbolic
#define UMFPACK_report_control umfpack_di_report_control
#define UMFPACK_report_info umfpack_di_report_info
#define UMFPACK_report_matrix umfpack_di_report_matrix
@@ -529,7 +531,7 @@ typedef struct
#endif
/* -------------------------------------------------------------------------- */
-/* Double precision, with UF_long's as integers */
+/* Double precision, with SuiteSparse_long's as integers */
/* -------------------------------------------------------------------------- */
#ifdef DLONG
@@ -590,7 +592,7 @@ typedef struct
#define UMF_triplet_map_nox umfdl_triplet_map_nox
#define UMF_triplet_nomap_x umfdl_triplet_nomap_x
#define UMF_triplet_nomap_nox umfdl_triplet_nomap_nox
-#define UMF_2by2 umfdl_2by2
+#define UMF_cholmod umf_l_cholmod
#define UMFPACK_col_to_triplet umfpack_dl_col_to_triplet
#define UMFPACK_defaults umfpack_dl_defaults
@@ -602,6 +604,7 @@ typedef struct
#define UMFPACK_get_determinant umfpack_dl_get_determinant
#define UMFPACK_numeric umfpack_dl_numeric
#define UMFPACK_qsymbolic umfpack_dl_qsymbolic
+#define UMFPACK_fsymbolic umfpack_dl_fsymbolic
#define UMFPACK_report_control umfpack_dl_report_control
#define UMFPACK_report_info umfpack_dl_report_info
#define UMFPACK_report_matrix umfpack_dl_report_matrix
@@ -705,7 +708,7 @@ typedef struct
#define UMF_triplet_map_nox umfzi_triplet_map_nox
#define UMF_triplet_nomap_x umfzi_triplet_nomap_x
#define UMF_triplet_nomap_nox umfzi_triplet_nomap_nox
-#define UMF_2by2 umfzi_2by2
+#define UMF_cholmod umf_i_cholmod
#define UMFPACK_col_to_triplet umfpack_zi_col_to_triplet
#define UMFPACK_defaults umfpack_zi_defaults
@@ -717,6 +720,7 @@ typedef struct
#define UMFPACK_get_determinant umfpack_zi_get_determinant
#define UMFPACK_numeric umfpack_zi_numeric
#define UMFPACK_qsymbolic umfpack_zi_qsymbolic
+#define UMFPACK_fsymbolic umfpack_zi_fsymbolic
#define UMFPACK_report_control umfpack_zi_report_control
#define UMFPACK_report_info umfpack_zi_report_info
#define UMFPACK_report_matrix umfpack_zi_report_matrix
@@ -759,7 +763,7 @@ typedef struct
#endif
/* -------------------------------------------------------------------------- */
-/* Complex double precision, with UF_long's as integers */
+/* Complex double precision, with SuiteSparse_long's as integers */
/* -------------------------------------------------------------------------- */
#ifdef ZLONG
@@ -820,7 +824,7 @@ typedef struct
#define UMF_triplet_map_nox umfzl_triplet_map_nox
#define UMF_triplet_nomap_x umfzl_triplet_nomap_x
#define UMF_triplet_nomap_nox umfzl_triplet_nomap_nox
-#define UMF_2by2 umfzl_2by2
+#define UMF_cholmod umf_l_cholmod
#define UMFPACK_col_to_triplet umfpack_zl_col_to_triplet
#define UMFPACK_defaults umfpack_zl_defaults
@@ -832,6 +836,7 @@ typedef struct
#define UMFPACK_get_determinant umfpack_zl_get_determinant
#define UMFPACK_numeric umfpack_zl_numeric
#define UMFPACK_qsymbolic umfpack_zl_qsymbolic
+#define UMFPACK_fsymbolic umfpack_zl_fsymbolic
#define UMFPACK_report_control umfpack_zl_report_control
#define UMFPACK_report_info umfpack_zl_report_info
#define UMFPACK_report_matrix umfpack_zl_report_matrix
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_col_to_triplet.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_col_to_triplet.c
index f49a13d..9e157b6 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_col_to_triplet.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_col_to_triplet.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_defaults.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_defaults.c
index 761ecd1..8b242e8 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_defaults.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_defaults.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -40,15 +39,13 @@ GLOBAL void UMFPACK_defaults
/* used in UMFPACK_report_* routines: */
Control [UMFPACK_PRL] = UMFPACK_DEFAULT_PRL ;
- /* used in UMFPACK_*symbolic: */
Control [UMFPACK_DENSE_ROW] = UMFPACK_DEFAULT_DENSE_ROW ;
Control [UMFPACK_DENSE_COL] = UMFPACK_DEFAULT_DENSE_COL ;
Control [UMFPACK_AMD_DENSE] = UMFPACK_DEFAULT_AMD_DENSE ;
Control [UMFPACK_STRATEGY] = UMFPACK_DEFAULT_STRATEGY ;
- Control [UMFPACK_2BY2_TOLERANCE] = UMFPACK_DEFAULT_2BY2_TOLERANCE ;
Control [UMFPACK_AGGRESSIVE] = UMFPACK_DEFAULT_AGGRESSIVE ;
-
- /* used in UMFPACK_numeric: */
+ Control [UMFPACK_SINGLETONS] = UMFPACK_DEFAULT_SINGLETONS ;
+ Control [UMFPACK_ORDERING] = UMFPACK_DEFAULT_ORDERING ;
Control [UMFPACK_PIVOT_TOLERANCE] = UMFPACK_DEFAULT_PIVOT_TOLERANCE ;
Control [UMFPACK_SYM_PIVOT_TOLERANCE] = UMFPACK_DEFAULT_SYM_PIVOT_TOLERANCE;
Control [UMFPACK_BLOCK_SIZE] = UMFPACK_DEFAULT_BLOCK_SIZE ;
@@ -70,45 +67,4 @@ GLOBAL void UMFPACK_defaults
/* use externally-provided BLAS (dgemm, dger, dgemv, zgemm, zgeru, zgemv) */
Control [UMFPACK_COMPILED_WITH_BLAS] = 1 ;
#endif
-
-#ifdef MATLAB_MEX_FILE
- /* compiled as a MATLAB mexFunction */
- Control [UMFPACK_COMPILED_FOR_MATLAB] = 1 ;
-#else
-#ifdef MATHWORKS
- /* compiled for internal use in MATLAB */
- Control [UMFPACK_COMPILED_FOR_MATLAB] = 2 ;
-#else
- /* use ANSI C malloc, free, realloc, and printf */
- Control [UMFPACK_COMPILED_FOR_MATLAB] = 0 ;
-#endif
-#endif
-
-#ifdef NO_TIMER
- /* no timer used */
- Control [UMFPACK_COMPILED_WITH_GETRUSAGE] = 3 ;
-#ifndef NPOSIX
- /* uses the POSIX sysconf ( ) and times ( ) routines in UMFPACK_tic, toc */
- Control [UMFPACK_COMPILED_WITH_GETRUSAGE] = 2 ;
-#else
-#ifdef GETRUSAGE
- /* uses the non-standard getrusage to get CPU time (Solaris) */
- Control [UMFPACK_COMPILED_WITH_GETRUSAGE] = 1 ;
-#else
- /* uses the ANSI standard clock routine to get CPU time */
- /* this may wrap around */
- Control [UMFPACK_COMPILED_WITH_GETRUSAGE] = 0 ;
-#endif
-#endif
-#endif
-
-#ifndef NDEBUG
- /* UMFPACK is compiled in debug mode. */
- /* This is exceedingly slow. */
- DEBUG0 (("UMFPACK is running in debug mode. This is very slow!\n")) ;
- Control [UMFPACK_COMPILED_IN_DEBUG_MODE] = 1 ;
-#else
- /* UMFPACK is compiled in normal (non-debug) mode */
- Control [UMFPACK_COMPILED_IN_DEBUG_MODE] = 0 ;
-#endif
}
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_free_numeric.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_free_numeric.c
index 7e4e531..b8fbe6b 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_free_numeric.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_free_numeric.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/* User-callable. Free the entire Numeric object (consists of 11 to 13
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_free_symbolic.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_free_symbolic.c
index b865c43..529b2a5 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_free_symbolic.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_free_symbolic.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_determinant.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_determinant.c
index bfeacaa..c3ec011 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_determinant.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_determinant.c
@@ -3,12 +3,12 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
-/* UMFPACK_get_determinant contributed by David Bateman, Motorola, Paris. */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
+/* UMFPACK_get_determinant contributed by David Bateman, Motorola, Paris. */
+
/*
User-callable. From the LU factors, scale factor, and permutation vectors
held in the Numeric object, calculates the determinant of the matrix A.
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_lunz.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_lunz.c
index 21752d3..407899d 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_lunz.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_lunz.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_numeric.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_numeric.c
index 9dd2208..63faf0b 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_numeric.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_numeric.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_symbolic.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_symbolic.c
index 560d38c..fec93bb 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_symbolic.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_get_symbolic.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c
index b227573..f57ee36 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c
@@ -3,128 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
-/*
- Global variables. UMFPACK uses these function pointers for several
- user-redefinable functions. The amd_* functions are defined in
- AMD/Source/amd_global.c.
-
- Function pointer default for mexFunction
- (see MATLAB/umfpackmex.c)
- ---------------- ------- ---------------
- amd_malloc malloc mxMalloc
- amd_free free mxFree
- amd_realloc realloc mxRealloc
- amd_calloc calloc mxCalloc
- amd_printf printf mexPrintf
-
- umfpack_hypot umf_hypot umf_hypot
- umfpack_divcomplex umf_divcomplex umf_divcomplex
-
- This routine is compiled just once for all four versions of UMFPACK
- (int/UF_long, double/complex).
-*/
-
-#include "umf_internal.h"
-
-double (*umfpack_hypot) (double, double) = umf_hypot ;
-int (*umfpack_divcomplex) (double, double, double, double, double *, double *)
- = umf_divcomplex ;
-
-
-/* ========================================================================== */
-/* === umf_hypot ============================================================ */
-/* ========================================================================== */
-
-/* There is an equivalent routine called hypot in <math.h>, which conforms
- * to ANSI C99. However, UMFPACK does not assume that ANSI C99 is available.
- * You can use the ANSI C99 hypot routine with:
- *
- * #include <math.h>
- * umfpack_hypot = hypot ;
- *
- * prior to calling any UMFPACK routine.
- *
- * s = hypot (x,y) computes s = sqrt (x*x + y*y) but does so more accurately.
- *
- * The NaN case for the double relops x >= y and x+y == x is safely ignored.
- */
-
-double umf_hypot (double x, double y)
-{
- double s, r ;
- x = SCALAR_ABS (x) ;
- y = SCALAR_ABS (y) ;
- if (x >= y)
- {
- if (x + y == x)
- {
- s = x ;
- }
- else
- {
- r = y / x ;
- s = x * sqrt (1.0 + r*r) ;
- }
- }
- else
- {
- if (y + x == y)
- {
- s = y ;
- }
- else
- {
- r = x / y ;
- s = y * sqrt (1.0 + r*r) ;
- }
- }
- return (s) ;
-}
-
-
-/* ========================================================================== */
-/* === umf_divcomplex ======================================================= */
-/* ========================================================================== */
-
-/* c = a/b where c, a, and b are complex. The real and imaginary parts are
- * passed as separate arguments to this routine. The NaN case is ignored
- * for the double relop br >= bi. Returns TRUE (1) if the denominator is
- * zero, FALSE (0) otherwise.
- *
- * This uses ACM Algo 116, by R. L. Smith, 1962, which tries to avoid
- * underflow and overflow.
- *
- * c can be the same variable as a or b.
- */
-
-int umf_divcomplex
-(
- double ar, double ai, /* real and imaginary parts of a */
- double br, double bi, /* real and imaginary parts of b */
- double *cr, double *ci /* real and imaginary parts of c */
-)
-{
- double tr, ti, r, den ;
- if (SCALAR_ABS (br) >= SCALAR_ABS (bi))
- {
- r = bi / br ;
- den = br + r * bi ;
- tr = (ar + ai * r) / den ;
- ti = (ai - ar * r) / den ;
- }
- else
- {
- r = br / bi ;
- den = r * br + bi ;
- tr = (ar * r + ai) / den ;
- ti = (ai * r - ar) / den ;
- }
- *cr = tr ;
- *ci = ti ;
- return (SCALAR_IS_ZERO (den)) ;
-}
+ /* moved to SuiteSparse_config */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_load_numeric.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_load_numeric.c
index a234902..4451376 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_load_numeric.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_load_numeric.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_load_symbolic.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_load_symbolic.c
index 10db361..75b46d4 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_load_symbolic.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_load_symbolic.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_numeric.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_numeric.c
index a96a9fd..a89bce6 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_numeric.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_numeric.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -161,8 +160,9 @@ GLOBAL Int UMFPACK_numeric
return (UMFPACK_ERROR_invalid_Symbolic_object) ;
}
- /* compute alloc_init automatically for AMD ordering */
- if (Symbolic->ordering == UMFPACK_ORDERING_AMD && alloc_init >= 0)
+ /* compute alloc_init automatically for AMD or other symmetric ordering */
+ if (/* Symbolic->ordering == UMFPACK_ORDERING_AMD */ alloc_init >= 0
+ && Symbolic->amd_lunz > 0)
{
alloc_init = (Symbolic->nz + Symbolic->amd_lunz) / Symbolic->lunz_bound;
alloc_init = MIN (1.0, alloc_init) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_qsymbolic.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_qsymbolic.c
index fe3967b..2063014 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_qsymbolic.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_qsymbolic.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -28,8 +27,8 @@
#include "umf_is_permutation.h"
#include "umf_malloc.h"
#include "umf_free.h"
-#include "umf_2by2.h"
#include "umf_singletons.h"
+#include "umf_cholmod.h"
typedef struct /* SWType */
{
@@ -46,7 +45,6 @@ typedef struct /* SWType */
Int *Si ; /* size nz */
Int *Sp ; /* size n_col + 1 */
double *Rs ; /* size n_row */
- Int *Rperm_2by2 ; /* size n_row */
} SWType ;
@@ -83,25 +81,383 @@ PRIVATE Int init_count ;
#endif
/* ========================================================================== */
+/* === inverse_permutation ================================================== */
+/* ========================================================================== */
+
+/* Check a permutation, and return its inverse */
+
+PRIVATE int inverse_permutation
+(
+ Int *P, /* input, size n, P[k]=i means i is kth object in permutation */
+ Int *Pinv, /* output, size n, Pinv[i]=k if P[k]=i */
+ Int n /* input */
+)
+{
+ Int i, k ;
+ for (i = 0 ; i < n ; i++)
+ {
+ Pinv [i] = EMPTY ;
+ }
+ for (k = 0 ; k < n ; k++)
+ {
+ i = P [k] ;
+ if (i < 0 || i >= n || Pinv [i] != EMPTY)
+ {
+ /* invalid permutation */
+ return (FALSE) ;
+ }
+ Pinv [i] = k ;
+ }
+ return (TRUE) ;
+}
+
+
+/* ========================================================================== */
+/* === do_amd_1 ============================================================= */
+/* ========================================================================== */
+
+/* do_amd_1: Construct A+A' for a sparse matrix A and perform the AMD ordering
+ * or user_ordering. Modified from AMD/Source/amd_1.c
+ *
+ * The n-by-n sparse matrix A can be unsymmetric. It is stored in MATLAB-style
+ * compressed-column form, with sorted row indices in each column, and no
+ * duplicate entries. Diagonal entries may be present, but they are ignored.
+ * Row indices of column j of A are stored in Ai [Ap [j] ... Ap [j+1]-1].
+ * Ap [0] must be zero, and nz = Ap [n] is the number of entries in A. The
+ * size of the matrix, n, must be greater than or equal to zero.
+ *
+ * This routine must be preceded by a call to AMD_aat, which computes the
+ * number of entries in each row/column in A+A', excluding the diagonal.
+ * Len [j], on input, is the number of entries in row/column j of A+A'. This
+ * routine constructs the matrix A+A' and then calls AMD_2 or the user_ordering.
+ * No error checking is performed (this was done in AMD_valid).
+ */
+
+PRIVATE int do_amd_1
+(
+ Int n, /* n > 0 */
+ Int Ap [ ], /* input of size n+1, not modified */
+ Int Ai [ ], /* input of size nz = Ap [n], not modified */
+ Int P [ ], /* size n output permutation */
+ Int Pinv [ ], /* size n output inverse permutation */
+ Int Len [ ], /* size n input, undefined on output */
+ Int slen, /* slen >= sum (Len [0..n-1]) + 7n+1,
+ * ideally slen = 1.2 * sum (Len) + 8n */
+ Int S [ ], /* size slen workspace */
+ Int ordering_option,
+ Int print_level,
+
+ /* user-provided ordering function */
+ int (*user_ordering) /* TRUE if OK, FALSE otherwise */
+ (
+ /* inputs, not modified on output */
+ Int, /* nrow */
+ Int, /* ncol */
+ Int, /* sym: if TRUE and nrow==ncol do A+A', else do A'A */
+ Int *, /* Ap, size ncol+1 */
+ Int *, /* Ai, size nz */
+ /* output */
+ Int *, /* size ncol, fill-reducing permutation */
+ /* input/output */
+ void *, /* user_params (ignored by UMFPACK) */
+ double * /* user_info[0..2], optional output for symmetric case.
+ user_info[0]: max column count for L=chol(P(A+A')P')
+ user_info[1]: nnz (L)
+ user_info[2]: flop count for chol, if A real */
+ ),
+ void *user_params, /* passed to user_ordering function */
+
+ Int *ordering_used,
+
+ double amd_Control [ ], /* input array of size AMD_CONTROL */
+ double amd_Info [ ] /* output array of size AMD_INFO */
+)
+{
+ Int i, j, k, p, pfree, iwlen, pj, p1, p2, pj2, anz, *Iw, *Pe, *Nv, *Head,
+ *Elen, *Degree, *s, *W, *Sp, *Tp ;
+
+ /* --------------------------------------------------------------------- */
+ /* construct the matrix for AMD_2 or user_ordering */
+ /* --------------------------------------------------------------------- */
+
+ ASSERT (n > 0) ;
+#ifndef NDEBUG
+ for (p = 0 ; p < slen ; p++) S [p] = EMPTY ;
+#endif
+
+ s = S ;
+ Pe = s ; s += (n+1) ; slen -= (n+1) ;
+ Nv = s ; s += n ; slen -= n ;
+
+ if (user_ordering == NULL)
+ {
+ /* iwlen = slen - (3*n+1) ; */
+ Head = s ; s += n ; slen -= n ;
+ Elen = s ; s += n ; slen -= n ;
+ Degree = s ; s += n ; slen -= n ;
+ }
+ else
+ {
+ /* iwlen = slen - (6*n+1) ; */
+ Head = NULL ;
+ Elen = NULL ;
+ Degree = NULL ;
+ }
+
+ W = s ; s += n ; slen -= n ;
+
+ iwlen = slen ;
+ Iw = s ; s += iwlen ;
+
+ ASSERT (AMD_valid (n, n, Ap, Ai) == AMD_OK) ;
+ anz = Ap [n] ;
+
+ /* construct the pointers for A+A' */
+ Sp = Nv ; /* use Nv and W as workspace for Sp and Tp [ */
+ Tp = W ;
+ pfree = 0 ;
+ for (j = 0 ; j < n ; j++)
+ {
+ Pe [j] = pfree ;
+ Sp [j] = pfree ;
+ pfree += Len [j] ;
+ }
+ Pe [n] = pfree ;
+
+#ifndef NDEBUG
+ if (user_ordering == NULL)
+ {
+ /* Note that this restriction on iwlen is slightly more restrictive than
+ * what is strictly required in AMD_2. AMD_2 can operate with no elbow
+ * room at all, but it will be very slow. For better performance, at
+ * least size-n elbow room is enforced. */
+ ASSERT (iwlen >= pfree + n) ;
+ }
+ else
+ {
+ ASSERT (iwlen >= pfree) ;
+ }
+ for (p = 0 ; p < iwlen ; p++) Iw [p] = EMPTY ;
+#endif
+
+ for (k = 0 ; k < n ; k++)
+ {
+ AMD_DEBUG1 (("Construct row/column k= "ID" of A+A'\n", k)) ;
+ p1 = Ap [k] ;
+ p2 = Ap [k+1] ;
+
+ /* construct A+A' */
+ for (p = p1 ; p < p2 ; )
+ {
+ /* scan the upper triangular part of A */
+ j = Ai [p] ;
+ ASSERT (j >= 0 && j < n) ;
+ if (j < k)
+ {
+ /* entry A (j,k) in the strictly upper triangular part */
+ ASSERT (Sp [j] < (j == n-1 ? pfree : Pe [j+1])) ;
+ ASSERT (Sp [k] < (k == n-1 ? pfree : Pe [k+1])) ;
+ Iw [Sp [j]++] = k ;
+ Iw [Sp [k]++] = j ;
+ p++ ;
+ }
+ else if (j == k)
+ {
+ /* skip the diagonal */
+ p++ ;
+ break ;
+ }
+ else /* j > k */
+ {
+ /* first entry below the diagonal */
+ break ;
+ }
+ /* scan lower triangular part of A, in column j until reaching
+ * row k. Start where last scan left off. */
+ ASSERT (Ap [j] <= Tp [j] && Tp [j] <= Ap [j+1]) ;
+ pj2 = Ap [j+1] ;
+ for (pj = Tp [j] ; pj < pj2 ; )
+ {
+ i = Ai [pj] ;
+ ASSERT (i >= 0 && i < n) ;
+ if (i < k)
+ {
+ /* A (i,j) is only in the lower part, not in upper */
+ ASSERT (Sp [i] < (i == n-1 ? pfree : Pe [i+1])) ;
+ ASSERT (Sp [j] < (j == n-1 ? pfree : Pe [j+1])) ;
+ Iw [Sp [i]++] = j ;
+ Iw [Sp [j]++] = i ;
+ pj++ ;
+ }
+ else if (i == k)
+ {
+ /* entry A (k,j) in lower part and A (j,k) in upper */
+ pj++ ;
+ break ;
+ }
+ else /* i > k */
+ {
+ /* consider this entry later, when k advances to i */
+ break ;
+ }
+ }
+ Tp [j] = pj ;
+ }
+ Tp [k] = p ;
+ }
+
+ /* clean up, for remaining mismatched entries */
+ for (j = 0 ; j < n ; j++)
+ {
+ for (pj = Tp [j] ; pj < Ap [j+1] ; pj++)
+ {
+ i = Ai [pj] ;
+ ASSERT (i >= 0 && i < n) ;
+ /* A (i,j) is only in the lower part, not in upper */
+ ASSERT (Sp [i] < (i == n-1 ? pfree : Pe [i+1])) ;
+ ASSERT (Sp [j] < (j == n-1 ? pfree : Pe [j+1])) ;
+ Iw [Sp [i]++] = j ;
+ Iw [Sp [j]++] = i ;
+ }
+ }
+
+#ifndef NDEBUG
+ for (j = 0 ; j < n ; j++) ASSERT (Sp [j] == Pe [j+1]) ;
+#endif
+
+ /* Tp and Sp no longer needed ] */
+
+ /* --------------------------------------------------------------------- */
+ /* order the matrix */
+ /* --------------------------------------------------------------------- */
+
+ if (ordering_option == UMFPACK_ORDERING_AMD)
+ {
+
+ /* use AMD as the symmetric ordering */
+ AMD_2 (n, Pe, Iw, Len, iwlen, pfree,
+ Nv, Pinv, P, Head, Elen, Degree, W, amd_Control, amd_Info) ;
+ *ordering_used = UMFPACK_ORDERING_AMD ;
+ return (TRUE) ;
+
+ }
+ else
+ {
+
+ /* use the user-provided symmetric ordering, or umf_cholmod */
+ double user_info [3], dmax, lnz, flops ;
+ int ok ;
+ user_info [0] = EMPTY ;
+ user_info [1] = EMPTY ;
+ user_info [2] = EMPTY ;
+
+ if (ordering_option == UMFPACK_ORDERING_USER)
+ {
+ ok = (*user_ordering) (n, n, TRUE, Pe, Iw, P,
+ user_params, user_info) ;
+ *ordering_used = UMFPACK_ORDERING_USER ;
+ }
+ else
+ /* if (ordering_option == UMFPACK_ORDERING_CHOLMOD
+ || ordering_option == UMFPACK_ORDERING_GIVEN
+ || ordering_option == UMFPACK_ORDERING_NONE
+ || ordering_option == UMFPACK_ORDERING_METIS
+ || ordering_option == UMFPACK_ORDERING_BEST) */
+ {
+ Int params [3] ;
+ params [0] = ordering_option ;
+ params [1] = print_level ;
+ ok = UMF_cholmod (n, n, TRUE, Pe, Iw, P, ¶ms, user_info) ;
+ *ordering_used = params [2] ;
+ }
+
+ if (!ok)
+ {
+ /* user_ordering or UMF_cholmod failed */
+ amd_Info [AMD_STATUS] = AMD_INVALID ;
+ return (FALSE) ;
+ }
+
+ /* get the user ordering statistics, if computed */
+ dmax = user_info [0] ;
+ lnz = user_info [1] ;
+ flops = user_info [2] ;
+
+ /* construct amd_Info, as if AMD was called */
+ amd_Info [AMD_STATUS] = AMD_OK ;
+ amd_Info [AMD_N] = n ;
+ amd_Info [AMD_NZ] = anz ;
+ /* amd_Info [AMD_SYMMETRY] not computed ; */
+ /* amd_Info [AMD_NZDIAG] not computed ; */
+ amd_Info [AMD_NZ_A_PLUS_AT] = pfree ;
+ amd_Info [AMD_NDENSE] = 0 ;
+ /* amd_Info [AMD_MEMORY] not computed ; */
+ amd_Info [AMD_NCMPA] = 0 ;
+ amd_Info [AMD_LNZ] = lnz ;
+ amd_Info [AMD_NDIV] = lnz ;
+ if (flops >= 0)
+ {
+ amd_Info [AMD_NMULTSUBS_LDL] = (flops - n) / 2 ;
+ amd_Info [AMD_NMULTSUBS_LU] = (flops - n) ;
+ }
+ else
+ {
+ amd_Info [AMD_NMULTSUBS_LDL] = EMPTY ;
+ amd_Info [AMD_NMULTSUBS_LU] = EMPTY ;
+ }
+ amd_Info [AMD_DMAX] = dmax ;
+
+ /* construct the inverse permutation */
+ return (inverse_permutation (P, Pinv, n)) ;
+ }
+}
+
+
+/* ========================================================================== */
/* === do_amd =============================================================== */
/* ========================================================================== */
-PRIVATE void do_amd
+PRIVATE int do_amd
(
Int n,
- const Int Ap [ ], /* size n+1 */
- const Int Ai [ ], /* size nz = Ap [n] */
+ Int Ap [ ], /* size n+1 */
+ Int Ai [ ], /* size nz = Ap [n] */
Int Q [ ], /* output permutation, j = Q [k] */
Int Qinv [ ], /* output inverse permutation, Qinv [j] = k */
Int Sdeg [ ], /* degree of A+A', from AMD_aat */
Int Clen, /* size of Ci */
- Int Ci [ ], /* size Ci workspace */
+ Int Ci [ ], /* size Clen workspace */
double amd_Control [ ], /* AMD control parameters */
double amd_Info [ ], /* AMD info */
SymbolicType *Symbolic, /* Symbolic object */
- double Info [ ] /* UMFPACK info */
+ double Info [ ], /* UMFPACK info */
+ Int ordering_option,
+ Int print_level,
+
+ /* user-provided ordering function */
+ int (*user_ordering) /* TRUE if OK, FALSE otherwise */
+ (
+ /* inputs, not modified on output */
+ Int, /* nrow */
+ Int, /* ncol */
+ Int, /* sym: if TRUE and nrow==ncol do A+A', else do A'A */
+ Int *, /* Ap, size ncol+1 */
+ Int *, /* Ai, size nz */
+ /* output */
+ Int *, /* size ncol, fill-reducing permutation */
+ /* input/output */
+ void *, /* user_params (ignored by UMFPACK) */
+ double * /* user_info[0..2], optional output for symmetric case.
+ user_info[0]: max column count for L=chol(P(A+A')P')
+ user_info[1]: nnz (L)
+ user_info[2]: flop count for chol, if A real */
+ ),
+ void *user_params, /* passed to user_ordering function */
+ Int *ordering_used
)
{
+ int ok = TRUE ;
+ *ordering_used = UMFPACK_ORDERING_NONE ;
if (n == 0)
{
@@ -114,18 +470,24 @@ PRIVATE void do_amd
}
else
{
- AMD_1 (n, Ap, Ai, Q, Qinv, Sdeg, Clen, Ci, amd_Control, amd_Info) ;
+ ok = do_amd_1 (n, Ap, Ai, Q, Qinv, Sdeg, Clen,
+ Ci, ordering_option, print_level, user_ordering, user_params,
+ ordering_used, amd_Control, amd_Info) ;
- /* return estimates computed from AMD on PA+PA' */
- Symbolic->amd_dmax = amd_Info [AMD_DMAX] ;
- Symbolic->amd_lunz = 2 * amd_Info [AMD_LNZ] + n ;
- Info [UMFPACK_SYMMETRIC_LUNZ] = Symbolic->amd_lunz ;
- Info [UMFPACK_SYMMETRIC_FLOPS] = DIV_FLOPS * amd_Info [AMD_NDIV] +
- MULTSUB_FLOPS * amd_Info [AMD_NMULTSUBS_LU] ;
- Info [UMFPACK_SYMMETRIC_DMAX] = Symbolic->amd_dmax ;
- Info [UMFPACK_SYMMETRIC_NDENSE] = amd_Info [AMD_NDENSE] ;
- Info [UMFPACK_SYMBOLIC_DEFRAG] += amd_Info [AMD_NCMPA] ;
+ /* return estimates computed from AMD or user ordering P(A+A')P' */
+ if (ok)
+ {
+ Symbolic->amd_dmax = amd_Info [AMD_DMAX] ;
+ Symbolic->amd_lunz = 2 * amd_Info [AMD_LNZ] + n ;
+ Info [UMFPACK_SYMMETRIC_LUNZ] = Symbolic->amd_lunz ;
+ Info [UMFPACK_SYMMETRIC_FLOPS] = DIV_FLOPS * amd_Info [AMD_NDIV] +
+ MULTSUB_FLOPS * amd_Info [AMD_NMULTSUBS_LU] ;
+ Info [UMFPACK_SYMMETRIC_DMAX] = Symbolic->amd_dmax ;
+ Info [UMFPACK_SYMMETRIC_NDENSE] = amd_Info [AMD_NDENSE] ;
+ Info [UMFPACK_SYMBOLIC_DEFRAG] += amd_Info [AMD_NCMPA] ;
+ }
}
+ return (ok) ;
}
/* ========================================================================== */
@@ -292,10 +654,10 @@ PRIVATE void combine_ordering
}
/* ========================================================================== */
-/* === UMFPACK_qsymbolic ==================================================== */
+/* === symbolic_analysis ==================================================== */
/* ========================================================================== */
-GLOBAL Int UMFPACK_qsymbolic
+PRIVATE Int symbolic_analysis
(
Int n_row,
Int n_col,
@@ -305,7 +667,30 @@ GLOBAL Int UMFPACK_qsymbolic
#ifdef COMPLEX
const double Az [ ],
#endif
+
+ /* user-provided ordering (may be NULL) */
const Int Quser [ ],
+
+ /* user-provided ordering function */
+ int (*user_ordering) /* TRUE if OK, FALSE otherwise */
+ (
+ /* inputs, not modified on output */
+ Int, /* nrow */
+ Int, /* ncol */
+ Int, /* sym: if TRUE and nrow==ncol do A+A', else do A'A */
+ Int *, /* Ap, size ncol+1 */
+ Int *, /* Ai, size nz */
+ /* output */
+ Int *, /* size ncol, fill-reducing permutation */
+ /* input/output */
+ void *, /* user_params (ignored by UMFPACK) */
+ double * /* user_info[0..2], optional output for symmetric case.
+ user_info[0]: max column count for L=chol(P(A+A')P')
+ user_info[1]: nnz (L)
+ user_info[2]: flop count for chol, if A real */
+ ),
+ void *user_params, /* passed to user_ordering function */
+
void **SymbolicHandle,
const double Control [UMFPACK_CONTROL],
double User_Info [UMFPACK_INFO]
@@ -320,7 +705,7 @@ GLOBAL Int UMFPACK_qsymbolic
Info2 [UMFPACK_INFO], drow, dcol, dtail_usage, dlf, duf, dmax_usage,
dhead_usage, dlnz, dunz, dmaxfrsize, dClen, dClen_analyze, sym,
amd_Info [AMD_INFO], dClen_amd, dr, dc, cr, cc, cp,
- amd_Control [AMD_CONTROL], stats [2], tol ;
+ amd_Control [AMD_CONTROL], stats [2] ;
double *Info ;
Int i, nz, j, newj, status, f1, f2, maxnrows, maxncols, nfr, col,
nchains, maxrows, maxcols, p, nb, nn, *Chain_start, *Chain_maxrows,
@@ -333,8 +718,10 @@ GLOBAL Int UMFPACK_qsymbolic
*Wq, *Sdeg, *Fr_npivcol, nempty, *Fr_nrows, *Fr_ncols, *Fr_parent,
*Fr_cols, nempty_row, nempty_col, user_auto_strategy, fail, max_rdeg,
head_usage, tail_usage, lnz, unz, esize, *Esize, rdeg, *Cdeg, *Rdeg,
- *Cperm1, *Rperm1, n1, oldcol, newcol, n1c, n1r, *Rperm_2by2, oldrow,
- dense_row_threshold, tlen, aggressive, scale, *Rp, *Ri ;
+ *Cperm1, *Rperm1, n1, oldcol, newcol, n1c, n1r, oldrow,
+ dense_row_threshold, tlen, aggressive, *Rp, *Ri ;
+ Int do_singletons, ordering_option, print_level ;
+ int ok ;
SymbolicType *Symbolic ;
SWType SWspace, *SW ;
@@ -361,17 +748,37 @@ GLOBAL Int UMFPACK_qsymbolic
dcol = GET_CONTROL (UMFPACK_DENSE_COL, UMFPACK_DEFAULT_DENSE_COL) ;
nb = GET_CONTROL (UMFPACK_BLOCK_SIZE, UMFPACK_DEFAULT_BLOCK_SIZE) ;
strategy = GET_CONTROL (UMFPACK_STRATEGY, UMFPACK_DEFAULT_STRATEGY) ;
-#if 0
- tol = GET_CONTROL (UMFPACK_2BY2_TOLERANCE, UMFPACK_DEFAULT_2BY2_TOLERANCE) ;
-#endif
- scale = GET_CONTROL (UMFPACK_SCALE, UMFPACK_DEFAULT_SCALE) ;
force_fixQ = GET_CONTROL (UMFPACK_FIXQ, UMFPACK_DEFAULT_FIXQ) ;
+ do_singletons = GET_CONTROL (UMFPACK_SINGLETONS,UMFPACK_DEFAULT_SINGLETONS);
AMD_defaults (amd_Control) ;
amd_Control [AMD_DENSE] =
GET_CONTROL (UMFPACK_AMD_DENSE, UMFPACK_DEFAULT_AMD_DENSE) ;
aggressive =
(GET_CONTROL (UMFPACK_AGGRESSIVE, UMFPACK_DEFAULT_AGGRESSIVE) != 0) ;
amd_Control [AMD_AGGRESSIVE] = aggressive ;
+ print_level = GET_CONTROL (UMFPACK_PRL, UMFPACK_DEFAULT_PRL) ;
+
+ /* get the ordering_option */
+ ordering_option = GET_CONTROL (UMFPACK_ORDERING, UMFPACK_DEFAULT_ORDERING) ;
+ if (ordering_option < 0 || ordering_option > UMFPACK_ORDERING_USER)
+ {
+ ordering_option = UMFPACK_DEFAULT_ORDERING ;
+ }
+ if (Quser == (Int *) NULL)
+ {
+ /* Quser is NULL, so ordering cannot be "given" */
+ /* user_ordering function not provided, so ordering cannot be "user" */
+ if (ordering_option == UMFPACK_ORDERING_GIVEN ||
+ (ordering_option == UMFPACK_ORDERING_USER && !user_ordering))
+ {
+ ordering_option = UMFPACK_ORDERING_NONE ;
+ }
+ }
+ else
+ {
+ /* if Quser is not NULL, then always use it */
+ ordering_option = UMFPACK_ORDERING_GIVEN ;
+ }
nb = MAX (2, nb) ;
nb = MIN (nb, MAXNB) ;
@@ -380,15 +787,6 @@ GLOBAL Int UMFPACK_qsymbolic
DEBUG0 (("UMFPACK_qsymbolic: nb = "ID" aggressive = "ID"\n", nb,
aggressive)) ;
-#if 0
- tol = MAX (0.0, MIN (tol, 1.0)) ;
-#endif
-
- if (scale != UMFPACK_SCALE_NONE && scale != UMFPACK_SCALE_MAX)
- {
- scale = UMFPACK_DEFAULT_SCALE ;
- }
-
if (User_Info != (double *) NULL)
{
/* return Info in user's array */
@@ -413,10 +811,16 @@ GLOBAL Int UMFPACK_qsymbolic
Info [UMFPACK_NCOL] = n_col ;
Info [UMFPACK_SIZE_OF_UNIT] = (double) (sizeof (Unit)) ;
Info [UMFPACK_SIZE_OF_INT] = (double) (sizeof (int)) ;
- Info [UMFPACK_SIZE_OF_LONG] = (double) (sizeof (UF_long)) ;
+ Info [UMFPACK_SIZE_OF_LONG] = (double) (sizeof (SuiteSparse_long)) ;
Info [UMFPACK_SIZE_OF_POINTER] = (double) (sizeof (void *)) ;
Info [UMFPACK_SIZE_OF_ENTRY] = (double) (sizeof (Entry)) ;
Info [UMFPACK_SYMBOLIC_DEFRAG] = 0 ;
+ Info [UMFPACK_ORDERING_USED] = EMPTY ;
+
+ if (SymbolicHandle != NULL)
+ {
+ *SymbolicHandle = (void *) NULL ;
+ }
if (!Ai || !Ap || !SymbolicHandle)
{
@@ -424,8 +828,6 @@ GLOBAL Int UMFPACK_qsymbolic
return (UMFPACK_ERROR_argument_missing) ;
}
- *SymbolicHandle = (void *) NULL ;
-
if (n_row <= 0 || n_col <= 0) /* n_row, n_col must be > 0 */
{
Info [UMFPACK_STATUS] = UMFPACK_ERROR_n_nonpositive ;
@@ -454,7 +856,8 @@ GLOBAL Int UMFPACK_qsymbolic
}
if (strategy < UMFPACK_STRATEGY_AUTO
- || strategy > UMFPACK_STRATEGY_SYMMETRIC)
+ || strategy > UMFPACK_STRATEGY_SYMMETRIC
+ || strategy == UMFPACK_STRATEGY_OBSOLETE)
{
/* unrecognized strategy */
strategy = UMFPACK_STRATEGY_AUTO ;
@@ -464,10 +867,6 @@ GLOBAL Int UMFPACK_qsymbolic
{
/* when the user provides Q, only symmetric and unsymmetric strategies
* are available */
- if (strategy == UMFPACK_STRATEGY_2BY2)
- {
- strategy = UMFPACK_STRATEGY_SYMMETRIC ;
- }
if (strategy != UMFPACK_STRATEGY_SYMMETRIC)
{
strategy = UMFPACK_STRATEGY_UNSYMMETRIC ;
@@ -498,9 +897,8 @@ GLOBAL Int UMFPACK_qsymbolic
dClen = MAX (dClen, dClen_analyze) ;
/* The space for AMD can be larger than what's required for colamd: */
- dClen_amd = 2.4 * (double) nz + 8 * (double) n_inner ;
- /* additional space for the 2-by-2 strategy */
- dClen_amd += (double) MAX (nn, nz) ;
+ dClen_amd = 2.4 * (double) nz + 8 * (double) n_inner + 1 ;
+
dClen = MAX (dClen, dClen_amd) ;
/* worst case total memory usage for UMFPACK_symbolic (revised below) */
@@ -513,7 +911,8 @@ GLOBAL Int UMFPACK_qsymbolic
/* :: int overflow, Clen too large :: */
/* Problem is too large for array indexing (Ci [i]) with an Int i. */
/* Cannot even analyze the problem to determine upper bounds on */
- /* memory usage. Need to use the UF_long version, umfpack_*l_*. */
+ /* memory usage. Need to use the SuiteSparse_long version, */
+ /* umfpack_*l_*. */
DEBUGm4 (("out of memory: symbolic int overflow\n")) ;
Info [UMFPACK_STATUS] = UMFPACK_ERROR_out_of_memory ;
return (UMFPACK_ERROR_out_of_memory) ;
@@ -523,8 +922,7 @@ GLOBAL Int UMFPACK_qsymbolic
Clen = UMF_COLAMD_RECOMMENDED (nz, n_row, n_col) ;
Clen_analyze = UMF_ANALYZE_CLEN (nz, n_row, n_col, nn) ;
Clen = MAX (Clen, Clen_analyze) ;
- Clen_amd = 2.4 * nz + 8 * n_inner ;
- Clen_amd += MAX (nn, nz) ; /* for Ri, in UMF_2by2 */
+ Clen_amd = 2.4 * nz + 8 * n_inner + 1 ;
Clen = MAX (Clen, Clen_amd) ;
/* ---------------------------------------------------------------------- */
@@ -561,6 +959,9 @@ GLOBAL Int UMFPACK_qsymbolic
Symbolic->Front_leftmostdesc = (Int *) NULL ;
Symbolic->Esize = (Int *) NULL ;
Symbolic->esize = 0 ;
+ Symbolic->ordering = EMPTY ; /* not yet determined */
+ Symbolic->amd_lunz = EMPTY ;
+ Symbolic->max_nchains = EMPTY ;
Symbolic->Cperm_init = (Int *) UMF_malloc (n_col+1, sizeof (Int)) ;
Symbolic->Rperm_init = (Int *) UMF_malloc (n_row+1, sizeof (Int)) ;
@@ -585,6 +986,8 @@ GLOBAL Int UMFPACK_qsymbolic
Symbolic->n_col = n_col ;
Symbolic->nz = nz ;
Symbolic->nb = nb ;
+ Cdeg [n_col] = EMPTY ; /* unused space */
+ Rdeg [n_row] = EMPTY ;
/* ---------------------------------------------------------------------- */
/* check user's input permutation */
@@ -645,9 +1048,6 @@ GLOBAL Int UMFPACK_qsymbolic
SW->Rperm1 = (Int *) UMF_malloc (n_row, sizeof (Int)) ;
SW->InFront = (Int *) UMF_malloc (n_row, sizeof (Int)) ;
- /* this is allocated later, and free'd after Cperm1 but before Ci */
- SW->Rperm_2by2 = (Int *) NULL ; /* will be nn Int's */
-
/* this is allocated last, and free'd first */
SW->Rs = (double *) NULL ; /* will be n_row double's */
@@ -662,7 +1062,6 @@ GLOBAL Int UMFPACK_qsymbolic
Si = SW->Si ;
Sp = SW->Sp ;
InvRperm1 = SW->InvRperm1 ;
- Rperm_2by2 = (Int *) NULL ;
InFront = SW->InFront ;
if (!Ci || !Fr_npivcol || !Fr_nrows || !Fr_ncols || !Fr_parent || !Fr_cols
@@ -687,6 +1086,7 @@ GLOBAL Int UMFPACK_qsymbolic
ASSERT (Clen >= nz + n_row + MAX (n_row, n_col)) ;
status = UMF_singletons (n_row, n_col, Ap, Ai, Quser, strategy,
+ do_singletons, /* if false, then do not look for singletons */
Cdeg, Cperm1, Rdeg,
Rperm1, InvRperm1, &n1, &n1c, &n1r, &nempty_col, &nempty_row, &is_sym,
&max_rdeg, /* workspace: */ Rperm_init, Ci, Ci + nz, Ci + nz + n_row) ;
@@ -756,9 +1156,8 @@ GLOBAL Int UMFPACK_qsymbolic
if (strategy != UMFPACK_STRATEGY_UNSYMMETRIC)
{
- /* This also determines the degree of each node in S+S' (Sdeg), which
- * is needed by the 2-by-2 strategy, the symmetry of S, and the number
- * of nonzeros on the diagonal of S. */
+ /* This also determines the degree of each node in S+S' (Sdeg), the
+ * symmetry of S, and the number of nonzeros on the diagonal of S. */
ASSERT (n_row == n_col) ;
ASSERT (nempty_row == nempty_col) ;
@@ -830,43 +1229,11 @@ GLOBAL Int UMFPACK_qsymbolic
/* determine the initial strategy based on symmetry and nnz (diag (S)) */
/* ---------------------------------------------------------------------- */
-#if 0
- if (strategy == UMFPACK_STRATEGY_AUTO)
- {
- if (sym < 0.10)
- {
- /* highly unsymmetric: use the unsymmetric strategy */
- strategy = UMFPACK_STRATEGY_UNSYMMETRIC ;
- DEBUGm4 (("Strategy: select unsymmetric\n")) ;
- }
- else if (sym >= 0.7 && nzdiag == n2)
- {
- /* mostly symmetric, zero-free diagonal: use symmetric strategy */
- strategy = UMFPACK_STRATEGY_SYMMETRIC ;
- DEBUGm4 (("Strategy: select symmetric\n")) ;
- }
- else
- {
- /* Evaluate the symmetric 2-by-2 strategy, and select it, or
- * the unsymmetric strategy if the 2-by-2 strategy doesn't look
- * promising. */
- strategy = UMFPACK_STRATEGY_2BY2 ;
- DEBUGm4 (("Strategy: try 2-by-2\n")) ;
- }
- }
-#endif
-
- /* The 2-by-2 strategy can cause an error UMFPACK_ERROR_different_pattern
- * (-11) when factorizing a structurally singular matrix. The problem
- * occurs very rarely. It's a conflict between the search of the row
- * merge tree and the 2-by-2 pre-permutation. Until this bug is fixed,
- * the 2-by-2 strategy is disabled. */
-
if (strategy == UMFPACK_STRATEGY_AUTO)
{
- if (sym >= 0.7 && nzdiag >= 0.9 * n2)
+ if (sym >= 0.5 && nzdiag >= 0.9 * n2)
{
- /* pattern is mostly symmetric (70% or more) and the diagonal is
+ /* pattern is mostly symmetric (50% or more) and the diagonal is
* mostly zero-free (90% or more). Use symmetric strategy. */
strategy = UMFPACK_STRATEGY_SYMMETRIC ;
DEBUG0 (("Strategy: select symmetric\n")) ;
@@ -879,268 +1246,31 @@ GLOBAL Int UMFPACK_qsymbolic
}
}
- if (strategy == UMFPACK_STRATEGY_2BY2)
- {
- /* If the user insists on the 2-by-2 strategy, use the symmetric
- * strategy instead. */
- strategy = UMFPACK_STRATEGY_SYMMETRIC ;
- }
-
-#if 0
-
- /* ---------------------------------------------------------------------- */
- /* try the 2-by-2 strategy */
- /* ---------------------------------------------------------------------- */
-
- /* (3) If the 2-by-2 strategy is attempted, additional workspace of size
- * nn integers and nn double's is allocated, where nn = n_row = n_col.
- * The real workspace is immediately free'd. The integer workspace of
- * size nn remains until the end of umfpack_qsymbolic. */
-
- /* If the resulting matrix S (Rperm_2by2, :) is too unsymmetric, then the
- * unsymmetric strategy will be used instead. */
-
- if (strategy == UMFPACK_STRATEGY_2BY2)
- {
- double sym2 ;
- Int *Blen, *W, nz_papat, nzd2, nweak, unmatched, Clen3 ;
-
- /* ------------------------------------------------------------------ */
- /* get workspace for UMF_2by2 */
- /* ------------------------------------------------------------------ */
-
- ASSERT (n_row == n_col && nn == n_row) ;
-
-#ifndef NDEBUG
- for (k = 0 ; k < n2 ; k++)
- {
- ASSERT (Sdeg [k] >= 0 && Sdeg [k] < n2) ;
- }
-#endif
-
- /* allocate Rperm_2by2 */
- SW->Rperm_2by2 = (Int *) UMF_malloc (nn, sizeof (Int)) ;
- Rperm_2by2 = SW->Rperm_2by2 ;
- if (Rperm_2by2 == (Int *) NULL)
- {
- DEBUGm4 (("out of memory: Rperm_2by2\n")) ;
- Info [UMFPACK_STATUS] = UMFPACK_ERROR_out_of_memory ;
- error (&Symbolic, SW) ;
- return (UMFPACK_ERROR_out_of_memory) ;
- }
-
- /* allocate Ri from the tail end of Ci [ */
- Clen3 = Clen - (MAX (nn, nz) + 1) ;
- Ri = Ci + Clen3 ;
- ASSERT (Clen3 >= nz) ; /* space required for UMF_2by2 */
-
- /* use Fr_* as workspace for Rp, Blen, and W [ */
- Rp = Fr_npivcol ;
- Blen = Fr_ncols ;
- W = Fr_cols ;
-
- if (scale != UMFPACK_SCALE_NONE)
- {
- SW->Rs = (double *) UMF_malloc (nn, sizeof (double)) ;
- if (SW->Rs == (double *) NULL)
- {
- DEBUGm4 (("out of memory: scale factors for 2-by-2\n")) ;
- Info [UMFPACK_STATUS] = UMFPACK_ERROR_out_of_memory ;
- error (&Symbolic, SW) ;
- return (UMFPACK_ERROR_out_of_memory) ;
- }
- }
-
- /* ------------------------------------------------------------------ */
- /* find the 2-by-2 row permutation */
- /* ------------------------------------------------------------------ */
-
- /* find a row permutation Rperm_2by2 such that S (Rperm_2by2, :)
- * has a healthy diagonal */
-
- UMF_2by2 (nn, Ap, Ai, Ax,
-#ifdef COMPLEX
- Az,
-#endif
- tol, scale, Cperm1,
-#ifndef NDEBUG
- Rperm1,
-#endif
- InvRperm1, n1, nempty, Sdeg, Rperm_2by2, &nweak, &unmatched,
- Ri, Rp, SW->Rs, Blen, W, Ci, Wq) ;
- DEBUGm3 (("2by2: nweak "ID" unmatched "ID"\n", nweak, unmatched)) ;
- Info [UMFPACK_2BY2_NWEAK] = nweak ;
- Info [UMFPACK_2BY2_UNMATCHED] = unmatched ;
-
- SW->Rs = (double *) UMF_free ((void *) SW->Rs) ;
-
- /* R = S (Rperm_2by2,:)' */
- (void) UMF_transpose (n2, n2, Sp, Si, (double *) NULL, Rperm_2by2,
- (Int *) NULL, 0, Rp, Ri, (double *) NULL, W, FALSE
-#ifdef COMPLEX
- , (double *) NULL, (double *) NULL, FALSE
-#endif
- ) ;
- ASSERT (AMD_valid (n2, n2, Rp, Ri) == AMD_OK) ;
-
- /* contents of Si and Sp no longer needed, but the space is
- * still needed */
-
- /* ------------------------------------------------------------------ */
- /* find symmetry of S (Rperm_2by2, :)', and prepare to order with AMD */
- /* ------------------------------------------------------------------ */
-
- for (i = 0 ; i < AMD_INFO ; i++)
- {
- amd_Info [i] = EMPTY ;
- }
- nz_papat = AMD_aat (n2, Rp, Ri, Sdeg, Wq, amd_Info) ;
- sym2 = amd_Info [AMD_SYMMETRY] ;
- nzd2 = amd_Info [AMD_NZDIAG] ;
-
- Info [UMFPACK_2BY2_PATTERN_SYMMETRY] = sym2 ;
- Info [UMFPACK_2BY2_NZ_PA_PLUS_PAT] = nz_papat ;
- Info [UMFPACK_2BY2_NZDIAG] = nzd2 ;
-
- DEBUG0 (("2by2: sym2 %g nzd2 "ID" n2 "ID"\n", sym2, nzd2, n2)) ;
-
- /* ------------------------------------------------------------------ */
- /* evaluate the 2-by-2 results */
- /* ------------------------------------------------------------------ */
-
- if (user_auto_strategy)
- {
- if ((sym2 > 1.1 * sym) && (nzd2 > 0.9 * n2))
- {
- /* 2-by-2 made it much more symmetric */
- DEBUGm4 (("eval Strategy 2by2: much more symmetric: 2by2\n")) ;
- strategy = UMFPACK_STRATEGY_2BY2 ;
- }
- else if (sym2 < 0.7 * sym)
- {
- /* 2-by-2 made it much more unsymmetric */
- DEBUGm4 (("eval Strategy 2by2: much more UNsymmetric:unsym\n"));
- strategy = UMFPACK_STRATEGY_UNSYMMETRIC ;
- }
- else if (sym2 < 0.25)
- {
- DEBUGm4 (("eval Strategy 2by2: is UNsymmetric: unsym\n"));
- strategy = UMFPACK_STRATEGY_UNSYMMETRIC ;
- }
- else if (sym2 >= 0.51)
- {
- DEBUGm4 (("eval Strategy 2by2: sym2 >= 0.51: 2by2\n")) ;
- strategy = UMFPACK_STRATEGY_2BY2 ;
- }
- else if (sym2 >= 0.999 * sym)
- {
- /* 2-by-2 improved symmetry, or made it only slightly worse */
- DEBUGm4 (("eval Strategy 2by2: sym2 >= 0.999 sym: 2by2\n")) ;
- strategy = UMFPACK_STRATEGY_2BY2 ;
- }
- else
- {
- /* can't decide what to do, so pick the unsymmetric strategy */
- DEBUGm4 (("eval Strategy 2by2: punt: unsym\n"));
- strategy = UMFPACK_STRATEGY_UNSYMMETRIC ;
- }
- }
-
- /* ------------------------------------------------------------------ */
- /* if the 2-by-2 strategy is selected: */
- /* ------------------------------------------------------------------ */
-
- if (strategy == UMFPACK_STRATEGY_2BY2)
- {
- if (Quser == (Int *) NULL)
- {
- /* 2-by-2 strategy is successful */
- /* compute amd (S) */
- Int *Qinv = Fr_npivcol ;
- ASSERT (Clen3 >= (nz_papat + nz_papat/5 + nn) + 7*nn) ;
- do_amd (n2, Rp, Ri, Wq, Qinv, Sdeg, Clen3, Ci,
- amd_Control, amd_Info, Symbolic, Info) ;
- /* combine the singleton ordering and the AMD ordering */
- combine_ordering (n1, nempty, nn, Cperm_init, Cperm1, Qinv) ;
- }
- /* fix Rperm_2by2 to reflect A, not S */
- for (k = 0 ; k < n1 ; k++)
- {
- oldcol = Cperm1 [k] ;
- i = k ;
- oldrow = Rperm1 [k] ;
- W [oldcol] = oldrow ;
- }
- for (k = n1 ; k < nn - nempty ; k++)
- {
- oldcol = Cperm1 [k] ;
- i = Rperm_2by2 [k - n1] + n1 ;
- oldrow = Rperm1 [i] ;
- W [oldcol] = oldrow ;
- }
- for (k = nn - nempty ; k < nn ; k++)
- {
- oldcol = Cperm1 [k] ;
- i = k ;
- oldrow = Rperm1 [k] ;
- W [oldcol] = oldrow ;
- }
- for (k = 0 ; k < nn ; k++)
- {
- Rperm_2by2 [k] = W [k] ;
- }
-
- /* Now, the "diagonal" entry in oldcol (where oldcol is the user's
- * name for a column, is the entry in row oldrow (where oldrow is
- * the user's name for a row, and oldrow = Rperm_2by2 [oldcol] */
- }
-
- /* Fr_* no longer needed for Rp, Blen, W ] */
- }
-#endif
-
/* ---------------------------------------------------------------------- */
/* finalize the strategy, including fixQ and prefer_diagonal */
/* ---------------------------------------------------------------------- */
+ DEBUG0 (("strategy is now "ID"\n", strategy)) ;
+
if (strategy == UMFPACK_STRATEGY_SYMMETRIC)
{
/* use given Quser or AMD (A+A'), fix Q during factorization,
* prefer diagonal */
DEBUG0 (("\nStrategy: symmetric\n")) ;
ASSERT (n_row == n_col) ;
- Symbolic->ordering = UMFPACK_ORDERING_AMD ;
- fixQ = TRUE ;
- prefer_diagonal = TRUE ;
- }
-#if 0
- else if (strategy == UMFPACK_STRATEGY_2BY2)
- {
- /* use Q = given Quser or Q = AMD (PA+PA'), fix Q during factorization,
- * prefer diagonal, and factorize PAQ, where P is found by UMF_2by2. */
- DEBUG0 (("\nStrategy: symmetric 2-by-2\n")) ;
- ASSERT (n_row == n_col) ;
- Symbolic->ordering = UMFPACK_ORDERING_AMD ;
fixQ = TRUE ;
prefer_diagonal = TRUE ;
}
-#endif
else
{
/* use given Quser or COLAMD (A), refine Q during factorization,
* no diagonal preference */
ASSERT (strategy == UMFPACK_STRATEGY_UNSYMMETRIC) ;
DEBUG0 (("\nStrategy: unsymmetric\n")) ;
- Symbolic->ordering = UMFPACK_ORDERING_COLAMD ;
fixQ = FALSE ;
prefer_diagonal = FALSE ;
}
- if (Quser != (Int *) NULL)
- {
- Symbolic->ordering = UMFPACK_ORDERING_GIVEN ;
- }
-
if (force_fixQ > 0)
{
fixQ = TRUE ;
@@ -1152,7 +1282,7 @@ GLOBAL Int UMFPACK_qsymbolic
DEBUG0 (("Force fixQ false\n")) ;
}
- DEBUG0 (("Strategy: ordering: "ID"\n", Symbolic->ordering)) ;
+ DEBUG0 (("Strategy: ordering: "ID"\n", ordering_option)) ;
DEBUG0 (("Strategy: fixQ: "ID"\n", fixQ)) ;
DEBUG0 (("Strategy: prefer diag "ID"\n", prefer_diagonal)) ;
@@ -1162,7 +1292,6 @@ GLOBAL Int UMFPACK_qsymbolic
Symbolic->prefer_diagonal = prefer_diagonal ;
Info [UMFPACK_STRATEGY_USED] = strategy ;
- Info [UMFPACK_ORDERING_USED] = Symbolic->ordering ;
Info [UMFPACK_QFIXED] = fixQ ;
Info [UMFPACK_DIAG_PREFERRED] = prefer_diagonal ;
@@ -1173,12 +1302,24 @@ GLOBAL Int UMFPACK_qsymbolic
if (strategy == UMFPACK_STRATEGY_SYMMETRIC && Quser == (Int *) NULL)
{
/* symmetric strategy for a matrix with mostly symmetric pattern */
+ Int ordering_used ;
Int *Qinv = Fr_npivcol ;
ASSERT (n_row == n_col && nn == n_row) ;
- ASSERT (Clen >= (nzaat + nzaat/5 + nn) + 7*nn) ;
- do_amd (n2, Sp, Si, Wq, Qinv, Sdeg, Clen, Ci,
- amd_Control, amd_Info, Symbolic, Info) ;
+ ASSERT (Clen >= (nzaat + nzaat/5 + nn) + 7*nn + 1) ;
+ ok = do_amd (n2, Sp, Si, Wq, Qinv, Sdeg, Clen, Ci,
+ amd_Control, amd_Info, Symbolic, Info,
+ ordering_option, print_level, user_ordering, user_params,
+ &ordering_used) ;
+ if (!ok)
+ {
+ DEBUGm4 (("symmetric ordering failed\n")) ;
+ status = UMFPACK_ERROR_ordering_failed ;
+ Info [UMFPACK_STATUS] = status ;
+ error (&Symbolic, SW) ;
+ return (status) ;
+ }
/* combine the singleton ordering and the AMD ordering */
+ Symbolic->ordering = ordering_used ;
combine_ordering (n1, nempty, nn, Cperm_init, Cperm1, Qinv) ;
}
/* Sdeg no longer needed ] */
@@ -1196,14 +1337,16 @@ GLOBAL Int UMFPACK_qsymbolic
{
Cperm_init [k] = Cperm1 [k] ;
}
+ Symbolic->ordering = UMFPACK_ORDERING_GIVEN ;
}
/* ---------------------------------------------------------------------- */
- /* use COLAMD to order the matrix */
+ /* use COLAMD or user_ordering to order the matrix */
/* ---------------------------------------------------------------------- */
if (strategy == UMFPACK_STRATEGY_UNSYMMETRIC && Quser == (Int *) NULL)
{
+ Int nrow2, ncol2 ;
/* ------------------------------------------------------------------ */
/* copy the matrix into colamd workspace (colamd destroys its input) */
@@ -1224,48 +1367,129 @@ GLOBAL Int UMFPACK_qsymbolic
#endif
) ;
- /* ------------------------------------------------------------------ */
- /* set UMF_colamd defaults */
- /* ------------------------------------------------------------------ */
+ /* size of pruned matrix */
+ nrow2 = n_row - n1 - nempty_row ;
+ ncol2 = n_col - n1 - nempty_col ;
- UMF_colamd_set_defaults (knobs) ;
- knobs [COLAMD_DENSE_ROW] = drow ;
- knobs [COLAMD_DENSE_COL] = dcol ;
- knobs [COLAMD_AGGRESSIVE] = aggressive ;
+ if ((ordering_option == UMFPACK_ORDERING_USER
+ || ordering_option == UMFPACK_ORDERING_NONE
+ || ordering_option == UMFPACK_ORDERING_METIS
+ || ordering_option == UMFPACK_ORDERING_CHOLMOD
+ || ordering_option == UMFPACK_ORDERING_BEST)
+ && nrow2 > 0 && ncol2 > 0)
+ {
- /* ------------------------------------------------------------------ */
- /* check input matrix and find the initial column pre-ordering */
- /* ------------------------------------------------------------------ */
+ /* -------------------------------------------------------------- */
+ /* use the user-provided column ordering */
+ /* -------------------------------------------------------------- */
+
+ double user_info [3] ; /* not needed */
+ Int *Qinv = Fr_npivcol ; /* use Fr_npivcol as workspace for Qinv */
+ Int *QQ = Fr_nrows ; /* use Fr_nrows as workspace for QQ */
+
+ /* analyze the resulting ordering for UMFPACK */
+ do_UMF_analyze = TRUE ;
+
+ if (ordering_option == UMFPACK_ORDERING_USER)
+ {
+ ok = (*user_ordering) (
+ /* inputs */
+ nrow2,
+ ncol2,
+ FALSE,
+ Cperm_init, /* column pointers, Cp [0 ... ncol] */
+ Ci, /* row indices */
+ /* outputs, contents not defined on input */
+ QQ, /* size ncol, QQ [k] = j if col j is kth col of A*Q */
+ /* parameters and info for user ordering */
+ user_params,
+ user_info) ;
+ Symbolic->ordering = UMFPACK_ORDERING_USER ;
+ }
+ else
+ {
+ Int params [3] ;
+ params [0] = ordering_option ;
+ params [1] = print_level ;
+ ok = UMF_cholmod (
+ /* inputs */
+ nrow2,
+ ncol2,
+ FALSE,
+ Cperm_init, /* column pointers, Cp [0 ... ncol] */
+ Ci, /* row indices */
+ /* outputs, contents not defined on input */
+ QQ, /* size ncol, QQ [k] = j if col j is kth col of A*Q */
+ /* parameters and info for user ordering */
+ ¶ms,
+ user_info) ;
+ Symbolic->ordering = params [2] ;
+ }
+
+ /* compute Qinv from QQ */
+ if (!ok || !inverse_permutation (QQ, Qinv, ncol2))
+ {
+ /* user ordering failed */
+ DEBUGm4 (("user ordering failed\n")) ;
+ status = UMFPACK_ERROR_ordering_failed ;
+ Info [UMFPACK_STATUS] = status ;
+ error (&Symbolic, SW) ;
+ return (status) ;
+ }
+
+ /* Combine the singleton and colamd ordering into Cperm_init */
+ /* Note that the user_unsymmetric_ordering function returns its
+ * inverse permutation in Qinv */
+ combine_ordering (n1, nempty_col, n_col, Cperm_init, Cperm1, Qinv) ;
- /* NOTE: umf_colamd is not given any original empty rows or columns.
- * Those have already been removed via prune_singletons, above. The
- * umf_colamd routine has been modified to assume that all rows and
- * columns have at least one entry in them. It will break if it is
- * given empty rows or columns (an assertion is triggered when running
- * in debug mode. */
+ }
+ else
+ {
- (void) UMF_colamd (
- n_row - n1 - nempty_row,
- n_col - n1 - nempty_col,
- Clen, Ci, Cperm_init, knobs, colamd_stats,
- Fr_npivcol, Fr_nrows, Fr_ncols, Fr_parent, Fr_cols, &nfr,
- InFront) ;
- ASSERT (colamd_stats [COLAMD_EMPTY_ROW] == 0) ;
- ASSERT (colamd_stats [COLAMD_EMPTY_COL] == 0) ;
-
- /* # of dense rows will be recomputed below */
- Info [UMFPACK_NDENSE_ROW] = colamd_stats [COLAMD_DENSE_ROW] ;
- Info [UMFPACK_NDENSE_COL] = colamd_stats [COLAMD_DENSE_COL] ;
- Info [UMFPACK_SYMBOLIC_DEFRAG] = colamd_stats [COLAMD_DEFRAG_COUNT] ;
-
- /* re-analyze if any "dense" rows or cols ignored by UMF_colamd */
- do_UMF_analyze =
- colamd_stats [COLAMD_DENSE_ROW] > 0 ||
- colamd_stats [COLAMD_DENSE_COL] > 0 ;
-
- /* Combine the singleton and colamd ordering into Cperm_init */
- /* Note that colamd returns its inverse permutation in Ci */
- combine_ordering (n1, nempty_col, n_col, Cperm_init, Cperm1, Ci) ;
+ /* -------------------------------------------------------------- */
+ /* set UMF_colamd defaults */
+ /* -------------------------------------------------------------- */
+
+ UMF_colamd_set_defaults (knobs) ;
+ knobs [COLAMD_DENSE_ROW] = drow ;
+ knobs [COLAMD_DENSE_COL] = dcol ;
+ knobs [COLAMD_AGGRESSIVE] = aggressive ;
+
+ /* -------------------------------------------------------------- */
+ /* check input matrix and find the initial column pre-ordering */
+ /* -------------------------------------------------------------- */
+
+ /* NOTE: umf_colamd is not given any original empty rows or
+ * columns. Those have already been removed via prune_singletons,
+ * above. The umf_colamd routine has been modified to assume that
+ * all rows and columns have at least one entry in them. It will
+ * break if it is given empty rows or columns (an assertion is
+ * triggered when running in debug mode. */
+
+ (void) UMF_colamd (
+ n_row - n1 - nempty_row,
+ n_col - n1 - nempty_col,
+ Clen, Ci, Cperm_init, knobs, colamd_stats,
+ Fr_npivcol, Fr_nrows, Fr_ncols, Fr_parent, Fr_cols, &nfr,
+ InFront) ;
+ ASSERT (colamd_stats [COLAMD_EMPTY_ROW] == 0) ;
+ ASSERT (colamd_stats [COLAMD_EMPTY_COL] == 0) ;
+ Symbolic->ordering = UMFPACK_ORDERING_AMD ;
+
+ /* # of dense rows will be recomputed below */
+ Info [UMFPACK_NDENSE_ROW] = colamd_stats [COLAMD_DENSE_ROW] ;
+ Info [UMFPACK_NDENSE_COL] = colamd_stats [COLAMD_DENSE_COL] ;
+ Info [UMFPACK_SYMBOLIC_DEFRAG] = colamd_stats [COLAMD_DEFRAG_COUNT];
+
+ /* re-analyze if any "dense" rows or cols ignored by UMF_colamd */
+ do_UMF_analyze =
+ colamd_stats [COLAMD_DENSE_ROW] > 0 ||
+ colamd_stats [COLAMD_DENSE_COL] > 0 ;
+
+ /* Combine the singleton and colamd ordering into Cperm_init */
+ /* Note that colamd returns its inverse permutation in Ci */
+ combine_ordering (n1, nempty_col, n_col, Cperm_init, Cperm1, Ci) ;
+ }
/* contents of Ci no longer needed */
@@ -1292,6 +1516,10 @@ GLOBAL Int UMFPACK_qsymbolic
}
+ /* ordering has been finalized */
+ Info [UMFPACK_ORDERING_USED] = Symbolic->ordering ;
+ DEBUG0 (("Final ordering used: "ID"\n", Symbolic->ordering)) ;
+
Cperm_init [n_col] = EMPTY ; /* unused in Cperm_init */
/* ---------------------------------------------------------------------- */
@@ -1322,7 +1550,7 @@ GLOBAL Int UMFPACK_qsymbolic
if (do_UMF_analyze)
{
- Int *W, *Bp, *Bi, *Cperm2, ok, *P, Clen2, bsize, Clen0 ;
+ Int *W, *Bp, *Bi, *Cperm2, *P, Clen2, bsize, Clen0 ;
/* ------------------------------------------------------------------ */
/* construct column pre-ordered, pruned submatrix */
@@ -1546,10 +1774,6 @@ GLOBAL Int UMFPACK_qsymbolic
/* determine the size of the Symbolic object */
/* ---------------------------------------------------------------------- */
- /* ---------------------------------------------------------------------- */
- /* determine the size of the Symbolic object */
- /* ---------------------------------------------------------------------- */
-
nchains = 0 ;
for (i = 0 ; i < nfr ; i++)
{
@@ -1619,7 +1843,6 @@ GLOBAL Int UMFPACK_qsymbolic
DEBUG0 (("Symbolic UMF_malloc_count - init_count = "ID"\n",
UMF_malloc_count - init_count)) ;
ASSERT (UMF_malloc_count == init_count + 21
- + (SW->Rperm_2by2 != (Int *) NULL)
+ (Symbolic->Esize != (Int *) NULL)) ;
Front_npivcol = Symbolic->Front_npivcol ;
@@ -1832,9 +2055,7 @@ GLOBAL Int UMFPACK_qsymbolic
/* Rperm_init [newrow] = row gives the row permutation that is implied
* by the column permutation, where "row" is a row index of the original
- * matrix A. It is not dependent on the Rperm_2by2 permutation, which
- * only redefines the "diagonal". Both are used to construct the
- * Diagonal_map.
+ * matrix A. It is used to construct the Diagonal_map.
*/
if (prefer_diagonal)
@@ -1862,35 +2083,15 @@ GLOBAL Int UMFPACK_qsymbolic
ASSERT (oldrow >= 0 && oldrow < nn) ;
Ci [oldrow] = newrow ;
}
-#if 0
- if (strategy == UMFPACK_STRATEGY_2BY2)
- {
- ASSERT (Rperm_2by2 != (Int *) NULL) ;
- for (newcol = 0 ; newcol < nn ; newcol++)
- {
- oldcol = Cperm_init [newcol] ;
- /* 2-by-2 pivoting done in S */
- oldrow = Rperm_2by2 [oldcol] ;
- newrow = Ci [oldrow] ;
- ASSERT (newrow >= 0 && newrow < nn) ;
- Diagonal_map [newcol] = newrow ;
- }
- }
- else
- {
-#endif
- for (newcol = 0 ; newcol < nn ; newcol++)
- {
- oldcol = Cperm_init [newcol] ;
- /* no 2-by-2 pivoting in S */
- oldrow = oldcol ;
- newrow = Ci [oldrow] ;
- ASSERT (newrow >= 0 && newrow < nn) ;
- Diagonal_map [newcol] = newrow ;
- }
-#if 0
- }
-#endif
+
+ for (newcol = 0 ; newcol < nn ; newcol++)
+ {
+ oldcol = Cperm_init [newcol] ;
+ oldrow = oldcol ;
+ newrow = Ci [oldrow] ;
+ ASSERT (newrow >= 0 && newrow < nn) ;
+ Diagonal_map [newcol] = newrow ;
+ }
#ifndef NDEBUG
DEBUG1 (("\nDiagonal map:\n")) ;
@@ -2017,6 +2218,9 @@ GLOBAL Int UMFPACK_qsymbolic
}
}
+ Chain_maxrows [nchains] = 0 ;
+ Chain_maxcols [nchains] = 0 ;
+
/* for Info only: */
dmaxfrsize = ceil (dmaxfrsize) ;
DEBUGm1 (("dmaxfrsize %30.20g Int_MAX "ID"\n", dmaxfrsize, Int_MAX)) ;
@@ -2287,7 +2491,7 @@ GLOBAL Int UMFPACK_qsymbolic
/* The flop count computed here is "canonical". */
/* factorize the frontal matrix */
- flops += DIV_FLOPS * (f*r + (f-1)*f/2) /* scale pivot columns */
+ flops += DIV_FLOPS * (f*r + (f-1)*f/2) /* divide by pivot */
/* f outer products: */
+ MULTSUB_FLOPS * (f*r*c + (r+c)*(f-1)*f/2 + (f-1)*f*(2*f-1)/6);
@@ -2421,7 +2625,6 @@ PRIVATE void free_work
{
if (SW)
{
- SW->Rperm_2by2 = (Int *) UMF_free ((void *) SW->Rperm_2by2) ;
SW->InvRperm1 = (Int *) UMF_free ((void *) SW->InvRperm1) ;
SW->Rs = (double *) UMF_free ((void *) SW->Rs) ;
SW->Si = (Int *) UMF_free ((void *) SW->Si) ;
@@ -2456,3 +2659,94 @@ PRIVATE void error
UMFPACK_free_symbolic ((void **) Symbolic) ;
ASSERT (UMF_malloc_count == init_count) ;
}
+
+
+/* ========================================================================== */
+/* === UMFPACK_qsymbolic ==================================================== */
+/* ========================================================================== */
+
+GLOBAL Int UMFPACK_qsymbolic
+(
+ Int n_row,
+ Int n_col,
+ const Int Ap [ ],
+ const Int Ai [ ],
+ const double Ax [ ],
+#ifdef COMPLEX
+ const double Az [ ],
+#endif
+ const Int Quser [ ],
+ void **SymbolicHandle,
+ const double Control [UMFPACK_CONTROL],
+ double User_Info [UMFPACK_INFO]
+)
+{
+ return (symbolic_analysis (n_row, n_col, Ap, Ai, Ax,
+#ifdef COMPLEX
+ Az,
+#endif
+
+ /* user-provided ordering (ignored if NULL) */
+ Quser,
+
+ /* no user provided ordering function */
+ (void *) NULL,
+ (void *) NULL,
+
+ SymbolicHandle, Control, User_Info)) ;
+}
+
+
+/* ========================================================================== */
+/* === UMFPACK_fsymbolic ==================================================== */
+/* ========================================================================== */
+
+GLOBAL Int UMFPACK_fsymbolic
+(
+ Int n_row,
+ Int n_col,
+ const Int Ap [ ],
+ const Int Ai [ ],
+ const double Ax [ ],
+#ifdef COMPLEX
+ const double Az [ ],
+#endif
+
+ /* user-provided ordering function */
+ int (*user_ordering) /* TRUE if OK, FALSE otherwise */
+ (
+ /* inputs, not modified on output */
+ Int, /* nrow */
+ Int, /* ncol */
+ Int, /* sym: if TRUE and nrow==ncol do A+A', else do A'A */
+ Int *, /* Ap, size ncol+1 */
+ Int *, /* Ai, size nz */
+ /* output */
+ Int *, /* size ncol, fill-reducing permutation */
+ /* input/output */
+ void *, /* user_params (ignored by UMFPACK) */
+ double * /* user_info[0..2], optional output for symmetric case.
+ user_info[0]: max column count for L=chol(P(A+A')P')
+ user_info[1]: nnz (L)
+ user_info[2]: flop count for chol, if A real */
+ ),
+ void *user_params, /* passed to user_ordering function */
+
+ void **SymbolicHandle,
+ const double Control [UMFPACK_CONTROL],
+ double User_Info [UMFPACK_INFO]
+)
+{
+ return (symbolic_analysis (n_row, n_col, Ap, Ai, Ax,
+#ifdef COMPLEX
+ Az,
+#endif
+
+ /* user ordering not provided */
+ (Int *) NULL,
+ /* user ordering functions used instead */
+ user_ordering,
+ user_params,
+
+ SymbolicHandle, Control, User_Info)) ;
+}
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_control.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_control.c
index 8993e04..615788c 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_control.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_control.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -21,8 +20,9 @@ GLOBAL void UMFPACK_report_control
)
{
double drow, dcol, relpt, relpt2, alloc_init, front_alloc_init, amd_alpha,
- tol, force_fixQ, droptol, aggr ;
+ force_fixQ, droptol, aggr ;
Int prl, nb, irstep, strategy, scale, s ;
+ Int do_singletons, ordering_option ;
prl = GET_CONTROL (UMFPACK_PRL, UMFPACK_DEFAULT_PRL) ;
@@ -48,7 +48,7 @@ GLOBAL void UMFPACK_report_control
#endif
#ifdef DLONG
PRINTF ((" Matrix entry defined as: double\n")) ;
- PRINTF ((" Int (generic integer) defined as: UF_long\n")) ;
+ PRINTF ((" Int (generic integer) defined as: SuiteSparse_long\n")) ;
#endif
#ifdef ZINT
PRINTF ((" Matrix entry defined as: double complex\n")) ;
@@ -56,7 +56,7 @@ GLOBAL void UMFPACK_report_control
#endif
#ifdef ZLONG
PRINTF ((" Matrix entry defined as: double complex\n")) ;
- PRINTF ((" Int (generic integer) defined as: UF_long\n")) ;
+ PRINTF ((" Int (generic integer) defined as: SuiteSparse_long\n")) ;
#endif
/* ---------------------------------------------------------------------- */
@@ -127,16 +127,6 @@ GLOBAL void UMFPACK_report_control
" Q = COLAMD (A), Q refined during numerical\n"
" factorization, and no attempt at diagonal pivoting.\n")) ;
}
-#if 0
- else if (strategy == UMFPACK_STRATEGY_2BY2)
- {
- PRINTF ((" (symmetric, with 2-by-2 block pivoting)\n"
- " P2 = row permutation that tries to place large entries on\n"
- " the diagonal. Q = AMD (P2*A+(P2*A)'), Q not refined during\n"
- " numerical factorization, attempt to select pivots from the\n"
- " diagonal of P2*A.\n")) ;
- }
-#endif
else /* auto strategy */
{
strategy = UMFPACK_STRATEGY_AUTO ;
@@ -144,6 +134,61 @@ GLOBAL void UMFPACK_report_control
}
/* ---------------------------------------------------------------------- */
+ /* ordering */
+ /* ---------------------------------------------------------------------- */
+
+ ordering_option = GET_CONTROL (UMFPACK_ORDERING, UMFPACK_DEFAULT_ORDERING) ;
+ if (ordering_option < 0 || ordering_option > UMFPACK_ORDERING_USER)
+ {
+ ordering_option = UMFPACK_DEFAULT_ORDERING ;
+ }
+ PRINTF ((" "ID": ordering: "ID,
+ (Int) INDEX (UMFPACK_ORDERING), ordering_option)) ;
+ if (ordering_option == UMFPACK_ORDERING_CHOLMOD)
+ {
+ PRINTF ((" CHOLMOD: AMD/COLAMD, then try METIS, and select best\n")) ;
+ }
+ else if (ordering_option == UMFPACK_ORDERING_AMD)
+ {
+ PRINTF ((" AMD/COLAMD\n")) ;
+ }
+ else if (ordering_option == UMFPACK_ORDERING_GIVEN)
+ {
+ PRINTF ((" user-provided permutation vector\n")) ;
+ }
+ else if (ordering_option == UMFPACK_ORDERING_NONE)
+ {
+ PRINTF ((" none\n")) ;
+ }
+ else if (ordering_option == UMFPACK_ORDERING_METIS)
+ {
+ PRINTF ((" METIS\n")) ;
+ }
+ else if (ordering_option == UMFPACK_ORDERING_BEST)
+ {
+ PRINTF ((" best effort. Try AMD/COLAMD and METIS, select best\n")) ;
+ }
+ else if (ordering_option == UMFPACK_ORDERING_USER)
+ {
+ PRINTF ((" user-provided ordering function\n")) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
+ /* disable singletons (default is FALSE) */
+ /* ---------------------------------------------------------------------- */
+
+ do_singletons = GET_CONTROL (UMFPACK_SINGLETONS,UMFPACK_DEFAULT_SINGLETONS);
+ PRINTF ((" "ID": singleton filter:", (Int) INDEX (UMFPACK_SINGLETONS))) ;
+ if (do_singletons)
+ {
+ PRINTF ((" enabled\n")) ;
+ }
+ else
+ {
+ PRINTF ((" disabled\n")) ;
+ }
+
+ /* ---------------------------------------------------------------------- */
/* initial allocation parameter */
/* ---------------------------------------------------------------------- */
@@ -171,15 +216,6 @@ GLOBAL void UMFPACK_report_control
(Int) INDEX (UMFPACK_IRSTEP), irstep)) ;
/* ---------------------------------------------------------------------- */
- /* 2-by-2 pivot tolerance */
- /* ---------------------------------------------------------------------- */
-
- tol = GET_CONTROL (UMFPACK_2BY2_TOLERANCE, UMFPACK_DEFAULT_2BY2_TOLERANCE) ;
- tol = MAX (0.0, MIN (tol, 1.0)) ;
- PRINTF ((" "ID": 2-by-2 pivot tolerance: %g\n",
- (Int) INDEX (UMFPACK_2BY2_TOLERANCE), tol)) ;
-
- /* ---------------------------------------------------------------------- */
/* force fixQ */
/* ---------------------------------------------------------------------- */
@@ -314,50 +350,21 @@ GLOBAL void UMFPACK_report_control
#endif
#ifdef MATLAB_MEX_FILE
- PRINTF ((" "ID": compiled for MATLAB\n",
- (Int) INDEX (UMFPACK_COMPILED_FOR_MATLAB))) ;
-#else
-#ifdef MATHWORKS
- PRINTF ((" "ID": compiled for MATLAB\n",
- (Int) INDEX (UMFPACK_COMPILED_FOR_MATLAB))) ;
+ PRINTF ((" compiled for MATLAB\n")) ;
#else
- PRINTF ((" "ID": compiled for ANSI C\n",
- (Int) INDEX (UMFPACK_COMPILED_FOR_MATLAB))) ;
-#endif
+ PRINTF ((" compiled for ANSI C\n")) ;
#endif
-#ifdef NO_TIMER
- PRINTF ((" "ID": no CPU timer \n",
- (Int) INDEX (UMFPACK_COMPILED_WITH_GETRUSAGE))) ;
-#else
-#ifndef NPOSIX
- PRINTF ((" "ID": CPU timer is POSIX times ( ) routine.\n",
- (Int) INDEX (UMFPACK_COMPILED_WITH_GETRUSAGE))) ;
-#else
-#ifdef GETRUSAGE
- PRINTF ((" "ID": CPU timer is getrusage.\n",
- (Int) INDEX (UMFPACK_COMPILED_WITH_GETRUSAGE))) ;
-#else
- PRINTF ((" "ID": CPU timer is ANSI C clock (may wrap around).\n",
- (Int) INDEX (UMFPACK_COMPILED_WITH_GETRUSAGE))) ;
-#endif
-#endif
-#endif
-
-#ifndef NDEBUG
- PRINTF ((
-"**** Debugging enabled (UMFPACK will be exceedingly slow!) *****************\n"
-" "ID": compiled with debugging enabled. ",
- (Int) INDEX (UMFPACK_COMPILED_IN_DEBUG_MODE))) ;
+#ifdef SUITESPARSE_TIMER_ENABLED
+ PRINTF ((" POSIX C clock_getttime.\n")) ;
#else
- PRINTF ((" "ID": compiled for normal operation (debugging disabled)\n",
- (Int) INDEX (UMFPACK_COMPILED_IN_DEBUG_MODE))) ;
+ PRINTF ((" no timer used.\n")) ;
#endif
PRINTF ((" computer/operating system: %s\n", UMFPACK_ARCHITECTURE)) ;
- PRINTF ((" size of int: %g UF_long: %g Int: %g pointer: %g"
+ PRINTF ((" size of int: %g SuiteSparse_long: %g Int: %g pointer: %g"
" double: %g Entry: %g (in bytes)\n\n", (double) sizeof (int),
- (double) sizeof (UF_long), (double) sizeof (Int),
+ (double) sizeof (SuiteSparse_long), (double) sizeof (Int),
(double) sizeof (void *), (double) sizeof (double),
(double) sizeof (Entry))) ;
}
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_info.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_info.c
index a85caa6..03aacfd 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_info.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_info.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -81,8 +80,8 @@ GLOBAL void UMFPACK_report_info
{
double lnz_est, unz_est, lunz_est, lnz, unz, lunz, tsym, tnum, fnum, tsolve,
- fsolve, ttot, ftot, twsym, twnum, twsolve, twtot, n2 ;
- Int n_row, n_col, n_inner, prl, is_sym ;
+ fsolve, ftot, twsym, twnum, twsolve, twtot, n2 ;
+ Int n_row, n_col, n_inner, prl, is_sym, strategy ;
/* ---------------------------------------------------------------------- */
/* get control settings and status to determine what to print */
@@ -120,7 +119,7 @@ GLOBAL void UMFPACK_report_info
#endif
#ifdef DLONG
PRINTF ((" matrix entry defined as: double\n")) ;
- PRINTF ((" Int (generic integer) defined as: UF_long\n")) ;
+ PRINTF ((" Int (generic integer) defined as: SuiteSparse_long\n")) ;
#endif
#ifdef ZINT
PRINTF ((" matrix entry defined as: double complex\n")) ;
@@ -128,7 +127,7 @@ GLOBAL void UMFPACK_report_info
#endif
#ifdef ZLONG
PRINTF ((" matrix entry defined as: double complex\n")) ;
- PRINTF ((" Int (generic integer) defined as: UF_long\n")) ;
+ PRINTF ((" Int (generic integer) defined as: SuiteSparse_long\n")) ;
#endif
/* ---------------------------------------------------------------------- */
@@ -156,18 +155,10 @@ GLOBAL void UMFPACK_report_info
#endif
PRINTF ((" CPU timer: ")) ;
-#ifdef NO_TIMER
- PRINTF (("none.\n")) ;
-#else
-#ifndef NPOSIX
- PRINTF (("POSIX times ( ) routine.\n")) ;
-#else
-#ifdef GETRUSAGE
- PRINTF (("getrusage ( ) routine.\n")) ;
+#ifdef SUITESPARSE_TIMER_ENABLED
+ PRINTF (("POSIX C clock_getttime ( ) routine.\n")) ;
#else
- PRINTF (("ANSI clock ( ) routine.\n")) ;
-#endif
-#endif
+ PRINTF (("none.\n")) ;
#endif
/* ---------------------------------------------------------------------- */
@@ -187,7 +178,7 @@ GLOBAL void UMFPACK_report_info
PRINT_INFO (" size of int: "ID" bytes\n",
(Int) Info [UMFPACK_SIZE_OF_INT]) ;
- PRINT_INFO (" size of UF_long: "ID" bytes\n",
+ PRINT_INFO (" size of SuiteSparse_long: "ID" bytes\n",
(Int) Info [UMFPACK_SIZE_OF_LONG]) ;
PRINT_INFO (" size of pointer: "ID" bytes\n",
(Int) Info [UMFPACK_SIZE_OF_POINTER]) ;
@@ -198,32 +189,62 @@ GLOBAL void UMFPACK_report_info
/* symbolic parameters */
/* ---------------------------------------------------------------------- */
- if (Info [UMFPACK_STRATEGY_USED] == UMFPACK_STRATEGY_SYMMETRIC)
+ strategy = Info [UMFPACK_STRATEGY_USED] ;
+ if (strategy == UMFPACK_STRATEGY_SYMMETRIC)
{
PRINTF (("\n strategy used: symmetric\n")) ;
+ if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_AMD)
+ {
+ PRINTF ((" ordering used: amd on A+A'\n")) ;
+ }
+ else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_GIVEN)
+ {
+ PRINTF ((" ordering used: user perm.\n")) ;
+ }
+ else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_USER)
+ {
+ PRINTF ((" ordering used: user function\n")) ;
+ }
+ else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_NONE)
+ {
+ PRINTF ((" ordering used: none\n")) ;
+ }
+ else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_METIS)
+ {
+ PRINTF ((" ordering used: metis on A+A'\n")) ;
+ }
+ else
+ {
+ PRINTF ((" ordering used: not computed\n")) ;
+ }
}
- else /* if (Info [UMFPACK_STRATEGY_USED] == UMFPACK_STRATEGY_UNSYMMETRIC)*/
+ else
{
PRINTF (("\n strategy used: unsymmetric\n")) ;
- }
-#if 0
- else if (Info [UMFPACK_STRATEGY_USED] == UMFPACK_STRATEGY_2BY2)
- {
- PRINTF (("\n strategy used: symmetric 2-by-2\n"));
- }
-#endif
-
- if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_AMD)
- {
- PRINTF ((" ordering used: amd on A+A'\n")) ;
- }
- else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_COLAMD)
- {
- PRINTF ((" ordering used: colamd on A\n")) ;
- }
- else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_GIVEN)
- {
- PRINTF ((" ordering used: provided by user\n")) ;
+ if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_AMD)
+ {
+ PRINTF ((" ordering used: colamd on A\n")) ;
+ }
+ else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_GIVEN)
+ {
+ PRINTF ((" ordering used: user perm.\n")) ;
+ }
+ else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_USER)
+ {
+ PRINTF ((" ordering used: user function\n")) ;
+ }
+ else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_NONE)
+ {
+ PRINTF ((" ordering used: none\n")) ;
+ }
+ else if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_METIS)
+ {
+ PRINTF ((" ordering used: metis on A'A\n")) ;
+ }
+ else
+ {
+ PRINTF ((" ordering used: not computed\n")) ;
+ }
}
if (Info [UMFPACK_QFIXED] == 1)
@@ -293,35 +314,11 @@ GLOBAL void UMFPACK_report_info
}
/* ---------------------------------------------------------------------- */
- /* statistics from 2-by-2 permutation */
- /* ---------------------------------------------------------------------- */
-
-#if 0
-
- PRINT_INFO (" 2-by-2 pivoting to place large entries on diagonal:\n"
- " # of small diagonal entries of S: %.0f\n",
- Info [UMFPACK_2BY2_NWEAK]) ;
- PRINT_INFO (" # unmatched: %.0f\n",
- Info [UMFPACK_2BY2_UNMATCHED]) ;
- PRINT_INFO (" symmetry of P2*S: %.6f\n",
- Info [UMFPACK_2BY2_PATTERN_SYMMETRY]) ;
- PRINT_INFO (" nz in P2*S+(P2*S)' (excl. diag.): %.0f\n",
- Info [UMFPACK_2BY2_NZ_PA_PLUS_PAT]) ;
- PRINT_INFO (" nz on diagonal of P2*S: %.0f\n",
- Info [UMFPACK_2BY2_NZDIAG]) ;
- if (Info [UMFPACK_2BY2_NZDIAG] >= 0 && n2 > 0)
- {
- PRINTF ((" fraction of nz on diag of P2*S: %.6f\n",
- Info [UMFPACK_2BY2_NZDIAG] / n2)) ;
- }
-
-#endif
-
- /* ---------------------------------------------------------------------- */
/* statistics from AMD */
/* ---------------------------------------------------------------------- */
- if (Info [UMFPACK_ORDERING_USED] == UMFPACK_ORDERING_AMD)
+ if (strategy == UMFPACK_STRATEGY_SYMMETRIC &&
+ Info [UMFPACK_ORDERING_USED] != UMFPACK_ORDERING_GIVEN)
{
double dmax = Info [UMFPACK_SYMMETRIC_DMAX] ;
PRINTF ((" AMD statistics, for strict diagonal pivoting:\n")) ;
@@ -329,8 +326,12 @@ GLOBAL void UMFPACK_report_info
Info [UMFPACK_SYMMETRIC_FLOPS]) ;
PRINT_INFO (" est. nz in L+U (incl. diagonal): %.0f\n",
Info [UMFPACK_SYMMETRIC_LUNZ]) ;
- PRINT_INFO (" est. largest front (# entries): %.0f\n",
+ if (dmax > 0)
+ {
+ PRINT_INFO
+ (" est. largest front (# entries): %.0f\n",
dmax*dmax) ;
+ }
PRINT_INFO (" est. max nz in any column of L: %.0f\n",
dmax) ;
PRINT_INFO (
@@ -355,8 +356,6 @@ GLOBAL void UMFPACK_report_info
Info [UMFPACK_SYMBOLIC_SIZE]) ;
PRINT_INFO (" Symbolic size (MBytes): %.0f\n",
MBYTES (Info [UMFPACK_SYMBOLIC_SIZE])) ;
- PRINT_INFO (" symbolic factorization CPU time (sec): %.2f\n",
- tsym) ;
PRINT_INFO (" symbolic factorization wallclock time(sec): %.2f\n",
twsym) ;
@@ -489,19 +488,11 @@ GLOBAL void UMFPACK_report_info
Info [UMFPACK_NUMERIC_REALLOC]) ;
PRINT_INFO (" costly numeric factorization reallocations: %.0f\n",
Info [UMFPACK_NUMERIC_COSTLY_REALLOC]) ;
- PRINT_INFO (" numeric factorization CPU time (sec): %.2f\n",
- tnum) ;
PRINT_INFO (" numeric factorization wallclock time (sec): %.2f\n",
twnum) ;
#define TMIN 0.001
- if (tnum > TMIN && fnum > 0)
- {
- PRINT_INFO (
- " numeric factorization mflops (CPU time): %.2f\n",
- 1e-6 * fnum / tnum) ;
- }
if (twnum > TMIN && fnum > 0)
{
PRINT_INFO (
@@ -509,20 +500,7 @@ GLOBAL void UMFPACK_report_info
1e-6 * fnum / twnum) ;
}
- ttot = EMPTY ;
ftot = fnum ;
- if (tsym >= TMIN && tnum >= 0)
- {
- ttot = tsym + tnum ;
- PRINT_INFO (" symbolic + numeric CPU time (sec): %.2f\n",
- ttot) ;
- if (ftot > 0 && ttot > TMIN)
- {
- PRINT_INFO (
- " symbolic + numeric mflops (CPU time): %.2f\n",
- 1e-6 * ftot / ttot) ;
- }
- }
twtot = EMPTY ;
if (twsym >= TMIN && twnum >= TMIN)
@@ -556,16 +534,8 @@ GLOBAL void UMFPACK_report_info
Info [UMFPACK_OMEGA1]) ;
PRINT_INFO (" sparse backward error omega2: %.2e\n",
Info [UMFPACK_OMEGA2]) ;
- PRINT_INFO (" solve CPU time (sec): %.2f\n",
- tsolve) ;
PRINT_INFO (" solve wall clock time (sec): %.2f\n",
twsolve) ;
- if (fsolve > 0 && tsolve > TMIN)
- {
- PRINT_INFO (
- " solve mflops (CPU time): %.2f\n",
- 1e-6 * fsolve / tsolve) ;
- }
if (fsolve > 0 && twsolve > TMIN)
{
PRINT_INFO (
@@ -580,23 +550,6 @@ GLOBAL void UMFPACK_report_info
"\n total symbolic + numeric + solve flops: %.5e\n", ftot) ;
}
- if (tsolve >= TMIN)
- {
- if (ttot >= TMIN && ftot >= 0)
- {
- ttot += tsolve ;
- PRINT_INFO (
- " total symbolic + numeric + solve CPU time: %.2f\n",
- ttot) ;
- if (ftot > 0 && ttot > TMIN)
- {
- PRINT_INFO (
- " total symbolic + numeric + solve mflops (CPU): %.2f\n",
- 1e-6 * ftot / ttot) ;
- }
- }
- }
-
if (twsolve >= TMIN)
{
if (twtot >= TMIN && ftot >= 0)
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_matrix.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_matrix.c
index 6074ea4..68b478c 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_matrix.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_matrix.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -31,7 +30,7 @@ GLOBAL Int UMFPACK_report_matrix
{
Entry a ;
Int prl, i, k, length, ilast, p, nz, prl1, p1, p2, n, n_i, do_values ;
- char *vector, *index ;
+ char *vector_kind, *index_kind ;
#ifdef COMPLEX
Int split = SPLIT (Az) ;
#endif
@@ -49,20 +48,21 @@ GLOBAL Int UMFPACK_report_matrix
if (col_form)
{
- vector = "column" ; /* column vectors */
- index = "row" ; /* with row indices */
+ vector_kind = "column" ; /* column vectors */
+ index_kind = "row" ; /* with row indices */
n = n_col ;
n_i = n_row ;
}
else
{
- vector = "row" ; /* row vectors */
- index = "column" ; /* with column indices */
+ vector_kind = "row" ; /* row vectors */
+ index_kind = "column" ; /* with column indices */
n = n_row ;
n_i = n_col ;
}
- PRINTF (("%s-form matrix, n_row "ID" n_col "ID", ", vector, n_row, n_col)) ;
+ PRINTF (("%s-form matrix, n_row "ID" n_col "ID", ",
+ vector_kind, n_row, n_col)) ;
if (n_row <= 0 || n_col <= 0)
{
@@ -125,7 +125,7 @@ GLOBAL Int UMFPACK_report_matrix
if (length < 0)
{
PRINTF (("ERROR: # entries in %s "ID" is < 0\n\n",
- vector, INDEX (k))) ;
+ vector_kind, INDEX (k))) ;
return (UMFPACK_ERROR_invalid_matrix) ;
}
}
@@ -148,12 +148,12 @@ GLOBAL Int UMFPACK_report_matrix
p2 = Ap [k+1] ;
length = p2 - p1 ;
PRINTF4 (("\n %s "ID": start: "ID" end: "ID" entries: "ID"\n",
- vector, INDEX (k), p1, p2-1, length)) ;
+ vector_kind, INDEX (k), p1, p2-1, length)) ;
ilast = EMPTY ;
for (p = p1 ; p < p2 ; p++)
{
i = Ai [p] ;
- PRINTF4 (("\t%s "ID" ", index, INDEX (i))) ;
+ PRINTF4 (("\t%s "ID" ", index_kind, INDEX (i))) ;
if (do_values && prl >= 4)
{
PRINTF ((":")) ;
@@ -163,13 +163,14 @@ GLOBAL Int UMFPACK_report_matrix
if (i < 0 || i >= n_i)
{
PRINTF ((" ERROR: %s index "ID" out of range in %s "ID"\n\n",
- index, INDEX (i), vector, INDEX (k))) ;
+ index_kind, INDEX (i), vector_kind, INDEX (k))) ;
return (UMFPACK_ERROR_invalid_matrix) ;
}
if (i <= ilast)
{
PRINTF ((" ERROR: %s index "ID" out of order (or duplicate) in "
- "%s "ID"\n\n", index, INDEX (i), vector, INDEX (k))) ;
+ "%s "ID"\n\n", index_kind, INDEX (i),
+ vector_kind, INDEX (k))) ;
return (UMFPACK_ERROR_invalid_matrix) ;
}
PRINTF4 (("\n")) ;
@@ -194,7 +195,7 @@ GLOBAL Int UMFPACK_report_matrix
/* return the status of the matrix */
/* ---------------------------------------------------------------------- */
- PRINTF4 ((" %s-form matrix ", vector)) ;
+ PRINTF4 ((" %s-form matrix ", vector_kind)) ;
PRINTF (("OK\n\n")) ;
return (UMFPACK_OK) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_numeric.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_numeric.c
index f70555f..21cb6c5 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_numeric.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_numeric.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_perm.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_perm.c
index 5f3baab..9a3810b 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_perm.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_perm.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_status.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_status.c
index 5e4e142..dd923d1 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_status.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_status.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -100,6 +99,10 @@ GLOBAL void UMFPACK_report_status
PRINTF (("ERROR: pattern of matrix (Ap and/or Ai) has changed\n")) ;
break ;
+ case UMFPACK_ERROR_ordering_failed:
+ PRINTF (("ERROR: ordering failed\n")) ;
+ break ;
+
case UMFPACK_ERROR_internal_error:
PRINTF (("INTERNAL ERROR!\n"
"Input arguments might be corrupted or aliased, or an internal\n"
@@ -107,7 +110,8 @@ GLOBAL void UMFPACK_report_status
"umfpack_*_report_* routines before calling the umfpack_*\n"
"computational routines. Recompile UMFPACK with debugging\n"
"enabled, and look for failed assertions. If all else fails\n"
- "please report this error to Tim Davis (davis at cise.ufl.edu).\n"
+ "please report this error to Tim Davis\n"
+ "(DrTimothyAldenDavis at gmail.com).\n"
)) ;
break ;
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_symbolic.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_symbolic.c
index 7b8a491..4b96294 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_symbolic.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_symbolic.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -83,32 +82,45 @@ GLOBAL Int UMFPACK_report_symbolic
/* strategy cannot be auto */
if (Symbolic->strategy == UMFPACK_STRATEGY_SYMMETRIC)
{
- PRINTF (("symmetric")) ;
+ PRINTF (("symmetric\n")) ;
+ PRINTF ((" ordering used: ")) ;
+ if (Symbolic->ordering == UMFPACK_ORDERING_AMD)
+ {
+ PRINTF (("amd on A\n")) ;
+ }
+ else if (Symbolic->ordering == UMFPACK_ORDERING_GIVEN)
+ {
+ PRINTF (("user permutation")) ;
+ }
+ else if (Symbolic->ordering == UMFPACK_ORDERING_USER)
+ {
+ PRINTF (("user function")) ;
+ }
+ else if (Symbolic->ordering == UMFPACK_ORDERING_METIS)
+ {
+ PRINTF (("metis on A")) ;
+ }
}
else /* if (Symbolic->strategy == UMFPACK_STRATEGY_UNSYMMETRIC) */
{
- PRINTF (("unsymmetric")) ;
- }
-#if 0
- else if (Symbolic->strategy == UMFPACK_STRATEGY_2BY2)
- {
- PRINTF (("symmetric 2-by-2")) ;
- }
-#endif
- PRINTF (("\n")) ;
-
- PRINTF ((" ordering used: ")) ;
- if (Symbolic->ordering == UMFPACK_ORDERING_COLAMD)
- {
- PRINTF (("colamd on A\n")) ;
- }
- else if (Symbolic->ordering == UMFPACK_ORDERING_AMD)
- {
- PRINTF (("amd on A+A'\n")) ;
- }
- else if (Symbolic->ordering == UMFPACK_ORDERING_GIVEN)
- {
- PRINTF (("provided by user")) ;
+ PRINTF (("unsymmetric\n")) ;
+ PRINTF ((" ordering used: ")) ;
+ if (Symbolic->ordering == UMFPACK_ORDERING_AMD)
+ {
+ PRINTF (("colamd on A\n")) ;
+ }
+ else if (Symbolic->ordering == UMFPACK_ORDERING_GIVEN)
+ {
+ PRINTF (("user permutation")) ;
+ }
+ else if (Symbolic->ordering == UMFPACK_ORDERING_USER)
+ {
+ PRINTF (("user function")) ;
+ }
+ else if (Symbolic->ordering == UMFPACK_ORDERING_METIS)
+ {
+ PRINTF (("metis on A'A")) ;
+ }
}
PRINTF (("\n")) ;
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_triplet.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_triplet.c
index ba11a69..3ee7f5e 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_triplet.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_triplet.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_vector.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_vector.c
index a88804c..7140352 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_vector.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_report_vector.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_save_numeric.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_save_numeric.c
index 0e4d8a2..cc8a5aa 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_save_numeric.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_save_numeric.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -24,6 +23,7 @@
fclose (f) ; \
return (UMFPACK_ERROR_file_IO) ; \
} \
+ fflush (f) ; \
}
/* ========================================================================== */
@@ -83,6 +83,9 @@ GLOBAL Int UMFPACK_save_numeric
{
WRITE (Numeric->Upattern, Int, Numeric->ulen+1) ;
}
+ /* It is possible that some parts of Numeric->Memory are
+ unitialized and unused; this is OK, but it can generate
+ a valgrind warning. */
WRITE (Numeric->Memory, Unit, Numeric->size) ;
/* close the file */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_save_symbolic.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_save_symbolic.c
index ae00189..74a0d50 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_save_symbolic.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_save_symbolic.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -24,6 +23,7 @@
fclose (f) ; \
return (UMFPACK_ERROR_file_IO) ; \
} \
+ fflush (f) ; \
}
/* ========================================================================== */
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_scale.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_scale.c
index 49467a5..419b2af 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_scale.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_scale.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_solve.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_solve.c
index c4e8263..604f26f 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_solve.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_solve.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_symbolic.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_symbolic.c
index 41be72b..7f75e7d 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_symbolic.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_symbolic.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -30,10 +29,9 @@ GLOBAL Int UMFPACK_symbolic
double Info [UMFPACK_INFO]
)
{
- Int *Qinit = (Int *) NULL ;
return (UMFPACK_qsymbolic (n_row, n_col, Ap, Ai, Ax,
#ifdef COMPLEX
- Az,
+ Az,
#endif
- Qinit, SymbolicHandle, Control, Info)) ;
+ (Int *) NULL, SymbolicHandle, Control, Info)) ;
}
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c
index 62e0e07..188ba39 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c
@@ -3,119 +3,32 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
- User-callable. Returns the time in seconds used by the process, and
- the current wall clock time. BE CAREFUL: if you compare the run time of
- UMFPACK with other sparse matrix packages, be sure to use the same timer.
- See umfpack_tictoc.h for details.
+ User-callable. Returns the current wall clock time. BE CAREFUL: if you
+ compare the run time of UMFPACK with other sparse matrix packages, be sure
+ to use the same timer. See umfpack_tictoc.h for details.
These routines conform to the POSIX standard. See umf_config.h for
more details.
+
+ In a prior version, two timings were returned: wall clock and cpu time.
+ In the current version, both times are set to the wall clock time.
*/
#include "umf_internal.h"
-#ifdef NO_TIMER
-
-/* -------------------------------------------------------------------------- */
-/* no timer used if -DNO_TIMER is defined at compile time */
-/* -------------------------------------------------------------------------- */
-
void umfpack_tic (double stats [2])
{
- stats [0] = 0 ;
- stats [1] = 0 ;
-}
-
-void umfpack_toc (double stats [2])
-{
- stats [0] = 0 ;
- stats [1] = 0 ;
-}
-
-#else
-
-/* -------------------------------------------------------------------------- */
-/* timer routines, using either times() or clock() */
-/* -------------------------------------------------------------------------- */
-
-#ifdef LIBRT
-
-/* Linux/Unix, must compile with -lrt */
-#include <time.h>
-
-void umfpack_tic (double stats [2])
-{
- /* get the current real time and return as a double */
- stats [0] = umfpack_timer ( ) ;
+ stats [0] = SuiteSparse_time ( ) ;
stats [1] = stats [0] ;
}
-#else
-
-#define TINY_TIME 1e-4
-
-#ifndef NPOSIX
-
-#include <unistd.h>
-#include <sys/times.h>
-
-void umfpack_tic (double stats [2])
-{
- /* Return the current time */
- /* stats [0]: current wallclock time, in seconds */
- /* stats [1]: user + system time for the process, in seconds */
-
- double ticks ;
- struct tms t ;
-
- ticks = (double) sysconf (_SC_CLK_TCK) ;
- stats [0] = (double) times (&t) / ticks ;
- stats [1] = (double) (t.tms_utime + t.tms_stime) / ticks ;
-
- /* if time is tiny, just return zero */
- if (stats [0] < TINY_TIME) stats [0] = 0 ;
- if (stats [1] < TINY_TIME) stats [1] = 0 ;
-}
-
-#else
-
-/* Generic ANSI C: use the ANSI clock function. No wallclock time. */
-
-#include <time.h>
-
-void umfpack_tic (double stats [2])
-{
- stats [0] = 0 ;
- stats [1] = ((double) (clock ( ))) / ((double) (CLOCKS_PER_SEC)) ;
- if (stats [1] < TINY_TIME) stats [1] = 0 ;
-}
-
-#endif
-#endif
-
-/* -------------------------------------------------------------------------- */
-
void umfpack_toc (double stats [2])
{
- /* Return the current time since the last call to umfpack_tic. */
- /* On input, stats holds the values returned by umfpack_tic. */
- /* On ouput, stats holds the time since the last umfpack_tic. */
-
- double done [2] ;
- umfpack_tic (done) ;
-
- stats [0] = done [0] - stats [0] ;
- stats [1] = done [1] - stats [1] ;
-
- if (stats [0] < 0) stats [0] = 0 ;
- if (stats [1] < 0) stats [1] = 0 ;
-
+ stats [0] = SuiteSparse_time ( ) - stats [0] ;
+ stats [1] = stats [0] ;
}
-
-#endif
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_timer.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_timer.c
index 3818a18..3c53a35 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_timer.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_timer.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
@@ -16,85 +15,9 @@
*/
#include "umfpack_timer.h"
-
-#ifdef NO_TIMER
-
-/* -------------------------------------------------------------------------- */
-/* no timer used if -DNO_TIMER is defined at compile time */
-/* -------------------------------------------------------------------------- */
-
-double umfpack_timer ( void )
-{
- return (0) ;
-}
-
-#else
-
-#ifdef LIBRT
-
-#include <time.h>
-double umfpack_timer ( void ) /* returns time in seconds */
-{
- /* get the current real time and return as a double */
- struct timespec now ;
- clock_gettime (CLOCK_REALTIME, &now) ;
- return ((double) (now.tv_sec ) + (double) (now.tv_nsec) * 1e-9) ;
-}
-
-
-#else
-
-#ifdef GETRUSAGE
-
-/* -------------------------------------------------------------------------- */
-/* use getrusage for accurate process times (and no overflow) */
-/* -------------------------------------------------------------------------- */
-
-/*
- This works under Solaris, SGI Irix, Linux, IBM RS 6000 (AIX), and Compaq
- Alpha. It might work on other Unix systems, too. Includes both the "user
- time" and the "system time". The system time is the time spent by the
- operating system on behalf of the process, and thus should be charged to
- the process.
-*/
-
-#include <sys/time.h>
-#include <sys/resource.h>
+#include "SuiteSparse_config.h"
double umfpack_timer ( void )
{
- struct rusage ru ;
- double user_time, sys_time ;
-
- (void) getrusage (RUSAGE_SELF, &ru) ;
-
- user_time =
- ru.ru_utime.tv_sec /* user time (seconds) */
- + 1e-6 * ru.ru_utime.tv_usec ; /* user time (microseconds) */
-
- sys_time =
- ru.ru_stime.tv_sec /* system time (seconds) */
- + 1e-6 * ru.ru_stime.tv_usec ; /* system time (microseconds) */
-
- return (user_time + sys_time) ;
+ return (SuiteSparse_time ( )) ;
}
-
-#else
-
-/* -------------------------------------------------------------------------- */
-/* Generic ANSI C: use the ANSI clock function */
-/* -------------------------------------------------------------------------- */
-
-/* This is portable, but may overflow. On Sun Solaris, when compiling in */
-/* 32-bit mode, the overflow occurs in only 2147 seconds (about 36 minutes). */
-
-#include <time.h>
-
-double umfpack_timer ( void )
-{
- return (((double) (clock ( ))) / ((double) (CLOCKS_PER_SEC))) ;
-}
-
-#endif
-#endif
-#endif
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_transpose.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_transpose.c
index 25ea211..a57c461 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_transpose.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_transpose.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse/UMFPACK/Source/umfpack_triplet_to_col.c b/src/C/SuiteSparse/UMFPACK/Source/umfpack_triplet_to_col.c
index 97750d1..5eb4aa6 100644
--- a/src/C/SuiteSparse/UMFPACK/Source/umfpack_triplet_to_col.c
+++ b/src/C/SuiteSparse/UMFPACK/Source/umfpack_triplet_to_col.c
@@ -3,9 +3,8 @@
/* ========================================================================== */
/* -------------------------------------------------------------------------- */
-/* UMFPACK Copyright (c) Timothy A. Davis, CISE, */
-/* Univ. of Florida. All Rights Reserved. See ../Doc/License for License. */
-/* web: http://www.cise.ufl.edu/research/sparse/umfpack */
+/* Copyright (c) 2005-2012 by Timothy A. Davis, http://www.suitesparse.com. */
+/* All Rights Reserved. See ../Doc/License for License. */
/* -------------------------------------------------------------------------- */
/*
diff --git a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_di_2by2.c b/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_di_2by2.c
deleted file mode 100644
index c27a474..0000000
--- a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_di_2by2.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define DINT
-#include "../../SuiteSparse/UMFPACK/Source/umf_2by2.c"
diff --git a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_dl_2by2.c b/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_dl_2by2.c
deleted file mode 100644
index 12b54c4..0000000
--- a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_dl_2by2.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define DLONG
-
-#include "../../SuiteSparse/UMFPACK/Source/umf_2by2.c"
diff --git a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_i_cholmod.c b/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_i_cholmod.c
new file mode 100644
index 0000000..3a95dc3
--- /dev/null
+++ b/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_i_cholmod.c
@@ -0,0 +1,2 @@
+#define DINT
+#include "../../SuiteSparse/UMFPACK/Source/umf_cholmod.c"
diff --git a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_l_cholmod.c b/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_l_cholmod.c
new file mode 100644
index 0000000..e2cb0ec
--- /dev/null
+++ b/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_l_cholmod.c
@@ -0,0 +1,3 @@
+#define DLONG
+
+#include "../../SuiteSparse/UMFPACK/Source/umf_cholmod.c"
diff --git a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_zi_2by2.c b/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_zi_2by2.c
deleted file mode 100644
index 7ab8cfa..0000000
--- a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_zi_2by2.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ZINT
-#include "../../SuiteSparse/UMFPACK/Source/umf_2by2.c"
diff --git a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_zl_2by2.c b/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_zl_2by2.c
deleted file mode 100644
index 2d3d097..0000000
--- a/src/C/SuiteSparse_cvxopt_extra/umfpack/umf_zl_2by2.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define ZLONG
-
-#include "../../SuiteSparse/UMFPACK/Source/umf_2by2.c"
diff --git a/src/C/amd.c b/src/C/amd.c
index fe620fe..7a11c06 100644
--- a/src/C/amd.c
+++ b/src/C/amd.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -38,7 +39,7 @@ PyDoc_STRVAR(amd__doc__,"Interface to the AMD library.\n\n"
"making an entry in the dictionary amd.options, with possible key "
"values\n"
"'AMD_DENSE' and 'AMD_AGGRESSIVE'.\n\n"
-"AMD is available from http://www.cise.ufl.edu/research/sparse/amd.");
+"AMD is available from www.suitesparse.com.");
static PyObject *amd_module;
@@ -155,7 +156,7 @@ static PyObject* order_c(PyObject *self, PyObject *args, PyObject *kwrds)
return NULL;
}
if (uplo != 'U' && uplo != 'L') err_char("uplo", "'L', 'U'");
- if (!(perm = (matrix *) Matrix_New(SP_NROWS(A),1,INT)))
+ if (!(perm = (matrix *) Matrix_New((int)SP_NROWS(A),1,INT)))
return PyErr_NoMemory();
n = SP_NROWS(A);
for (nnz=0, j=0; j<n; j++) {
diff --git a/src/C/base.c b/src/C/base.c
index 17e1bb3..107074f 100644
--- a/src/C/base.c
+++ b/src/C/base.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -32,17 +33,15 @@ extern PyTypeObject matrix_tp ;
matrix * Matrix_New(int, int, int) ;
matrix * Matrix_NewFromMatrix(matrix *, int) ;
matrix * Matrix_NewFromSequence(PyObject *, int) ;
-#if PY_MAJOR_VERSION < 3
-matrix * Matrix_NewFromArrayStruct(PyObject *, int, int *) ;
-#endif
+matrix * Matrix_NewFromPyBuffer(PyObject *, int, int *) ;
extern PyTypeObject spmatrix_tp ;
-spmatrix * SpMatrix_New(int_t, int_t, int, int ) ;
+spmatrix * SpMatrix_New(int_t, int_t, int_t, int ) ;
spmatrix * SpMatrix_NewFromMatrix(matrix *, int) ;
spmatrix * SpMatrix_NewFromSpMatrix(spmatrix *, int) ;
-spmatrix * SpMatrix_NewFromIJV(matrix *, matrix *, matrix *,
- int_t, int_t, int, int) ;
-void free_ccs(ccs *) ;
+spmatrix * SpMatrix_NewFromIJV(matrix *, matrix *, matrix *, int_t, int_t, int) ;
+void free_ccs(ccs *);
+int get_id(void *val, int val_type);
extern int (*sp_axpy[])(number, void *, void *, int, int, int, void **) ;
@@ -58,7 +57,7 @@ extern int (*sp_symv[])(char, int, number, ccs *, int, void *, int,
extern int (*sp_syrk[])(char, char, number, void *, number,
void *, int, int, int, int, void **) ;
-const int E_SIZE[] = { sizeof(int_t), sizeof(double), sizeof(complex) };
+const int E_SIZE[] = { sizeof(int_t), sizeof(double), sizeof(double complex) };
const char TC_CHAR[][2] = {"i","d","z"} ;
/*
@@ -66,6 +65,7 @@ const char TC_CHAR[][2] = {"i","d","z"} ;
*/
number One[3], MinusOne[3], Zero[3];
+int intOne = 1;
static void write_inum(void *dest, int i, void *src, int j) {
((int_t *)dest)[i] = ((int_t *)src)[j];
@@ -76,7 +76,7 @@ static void write_dnum(void *dest, int i, void *src, int j) {
}
static void write_znum(void *dest, int i, void *src, int j) {
- ((complex *)dest)[i] = ((complex *)src)[j];
+ ((double complex *)dest)[i] = ((double complex *)src)[j];
}
void (*write_num[])(void *, int, void *, int) = {
@@ -92,8 +92,8 @@ static PyObject * dnum2PyObject(void *src, int i) {
static PyObject * znum2PyObject(void *src, int i) {
Py_complex z;
- z.real = creal (((complex *)src)[i]);
- z.imag = cimag (((complex *)src)[i]);
+ z.real = creal (((double complex *)src)[i]);
+ z.imag = cimag (((double complex *)src)[i]);
return Py_BuildValue("D", &z);
}
@@ -154,16 +154,16 @@ convert_znum(void *dest, void *val, int val_id, int offset)
if (val_id==0) { /* 1x1 matrix */
switch (MAT_ID(val)) {
case INT:
- *(complex *)dest = MAT_BUFI(val)[offset]; return 0;
+ *(double complex *)dest = MAT_BUFI(val)[offset]; return 0;
case DOUBLE:
- *(complex *)dest = MAT_BUFD(val)[offset]; return 0;
+ *(double complex *)dest = MAT_BUFD(val)[offset]; return 0;
case COMPLEX:
- *(complex *)dest = MAT_BUFZ(val)[offset]; return 0;
+ *(double complex *)dest = MAT_BUFZ(val)[offset]; return 0;
default: return -1;
}
} else { /* PyNumber */
Py_complex c = PyComplex_AsCComplex((PyObject *)val);
- *(complex *)dest = c.real + I*c.imag;
+ *(double complex *)dest = c.real + I*c.imag;
return 0;
}
}
@@ -256,7 +256,7 @@ static void mtx_dabs(void *src, void *dest, int n) {
static void mtx_zabs(void *src, void *dest, int n) {
int i;
for (i=0; i<n; i++)
- ((double *)dest)[i] = cabs(((complex *)src)[i]);
+ ((double *)dest)[i] = cabs(((double complex *)src)[i]);
}
void (*mtx_abs[])(void *, void *, int) = { mtx_iabs, mtx_dabs, mtx_zabs };
@@ -283,7 +283,7 @@ static int zdiv(void *dest, number a, int n) {
PY_ERR_INT(PyExc_ZeroDivisionError, "division by zero");
int _n = n, int1 = 1;
- complex _a = 1.0/a.z;
+ double complex _a = 1.0/a.z;
zscal_(&_n, (void *)&_a, dest, &int1);
return 0;
}
@@ -377,8 +377,8 @@ PyObject * base_axpy(PyObject *self, PyObject *args, PyObject *kwrds)
if (Matrix_Check(x) && Matrix_Check(y)) {
int n = X_NROWS(x)*X_NCOLS(x);
- axpy[id](&n, (ao ? &a : &One[id]), MAT_BUF(x), (int *)&One[INT],
- MAT_BUF(y), (int *)&One[INT]);
+ axpy[id](&n, (ao ? &a : &One[id]), MAT_BUF(x), &intOne,
+ MAT_BUF(y), &intOne);
}
else {
@@ -940,10 +940,16 @@ sparse(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
PyObject *Objx = NULL;
static char *kwlist[] = { "x", "tc", NULL};
+
+#if PY_MAJOR_VERSION >= 3
+ int tc = 0;
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|C:sparse", kwlist,
+ &Objx, &tc))
+#else
char tc = 0;
-
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|c:sparse", kwlist,
&Objx, &tc))
+#endif
return NULL;
if (tc && !(VALID_TC_SP(tc))) PY_ERR_TYPE("tc must be 'd' or 'z'");
@@ -963,7 +969,7 @@ sparse(PyTypeObject *type, PyObject *args, PyObject *kwds)
/* sparse matrix */
else if (SpMatrix_Check(Objx)) {
- int nnz=0, ik, jk;
+ int_t nnz = 0, ik, jk;
for (jk=0; jk<SP_NCOLS(Objx); jk++) {
for (ik=SP_COL(Objx)[jk]; ik<SP_COL(Objx)[jk+1]; ik++) {
@@ -1031,7 +1037,7 @@ spdiag(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (Matrix_Check(diag)) {
int j, id = MAX(DOUBLE, MAT_ID(diag)), n = MAT_LGT(diag);
- spmatrix *ret = SpMatrix_New(n, n, n, id);
+ spmatrix *ret = SpMatrix_New((int_t)n, (int_t)n, (int_t)n, id);
if (!ret) return PyErr_NoMemory();
SP_COL(ret)[0] = 0;
@@ -1050,7 +1056,8 @@ spdiag(PyTypeObject *type, PyObject *args, PyObject *kwds)
}
else if (SpMatrix_Check(diag)) {
- int k, id = MAX(DOUBLE, SP_ID(diag)), n = SP_LGT(diag);
+ int k, id = MAX(DOUBLE, SP_ID(diag));
+ int_t n = SP_LGT(diag);
spmatrix *ret = SpMatrix_New(n, n, SP_NNZ(diag), id);
if (!ret) return PyErr_NoMemory();
@@ -1072,7 +1079,8 @@ spdiag(PyTypeObject *type, PyObject *args, PyObject *kwds)
}
- int j, k, l, idx, id=DOUBLE, n=0, nnz=0;
+ int j, k, l, idx, id=DOUBLE;
+ int_t n=0, nnz=0;
for (k=0; k<PyList_GET_SIZE(diag); k++) {
Dk = PyList_GET_ITEM(diag, k);
@@ -1222,7 +1230,7 @@ PyObject * matrix_elem_max(PyObject *self, PyObject *args, PyObject *kwrds)
if (!(B = (PyObject *)dense((spmatrix *)B)) ) return PyErr_NoMemory();
}
- PyObject *ret = (PyObject *)Matrix_New(m, n, id);
+ PyObject *ret = (PyObject *)Matrix_New((int)m, (int)n, id);
if (!ret) {
if (freeA) { Py_DECREF(A); }
if (freeB) { Py_DECREF(B); }
diff --git a/src/C/blas.c b/src/C/blas.c
index eafb957..225cbd5 100644
--- a/src/C/blas.c
+++ b/src/C/blas.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -39,18 +40,18 @@ PyDoc_STRVAR(blas__doc__,"Interface to the double-precision real and "
/* BLAS 1 prototypes */
extern void dswap_(int *n, double *x, int *incx, double *y, int *incy);
-extern void zswap_(int *n, complex *x, int *incx, complex *y,
+extern void zswap_(int *n, double complex *x, int *incx, double complex *y,
int *incy);
extern void dscal_(int *n, double *alpha, double *x, int *incx);
-extern void zscal_(int *n, complex *alpha, complex *x, int *incx);
-extern void zdscal_(int *n, double *alpha, complex *x, int *incx);
+extern void zscal_(int *n, double complex *alpha, double complex *x, int *incx);
+extern void zdscal_(int *n, double *alpha, double complex *x, int *incx);
extern void dcopy_(int *n, double *x, int *incx, double *y, int *incy);
-extern void zcopy_(int *n, complex *x, int *incx, complex *y,
+extern void zcopy_(int *n, double complex *x, int *incx, double complex *y,
int *incy);
extern void daxpy_(int *n, double *alpha, double *x, int *incx,
double *y, int *incy);
-extern void zaxpy_(int *n, complex *alpha, complex *x, int *incx,
- complex *y, int *incy);
+extern void zaxpy_(int *n, double complex *alpha, double complex *x, int *incx,
+ double complex *y, int *incy);
extern double ddot_(int *n, double *x, int *incx, double *y, int *incy);
#if USE_CBLAS_ZDOT
extern void cblas_zdotc_sub(int n, void *x, int incx, void *y,
@@ -59,66 +60,66 @@ extern void cblas_zdotu_sub(int n, void *x, int incx, void *y, int incy,
void *result);
#endif
extern double dnrm2_(int *n, double *x, int *incx);
-extern double dznrm2_(int *n, complex *x, int *incx);
+extern double dznrm2_(int *n, double complex *x, int *incx);
extern double dasum_(int *n, double *x, int *incx);
-extern double dzasum_(int *n, complex *x, int *incx);
+extern double dzasum_(int *n, double complex *x, int *incx);
extern int idamax_(int *n, double *x, int *incx);
-extern int izamax_(int *n, complex *x, int *incx);
+extern int izamax_(int *n, double complex *x, int *incx);
/* BLAS 2 prototypes */
extern void dgemv_(char* trans, int *m, int *n, double *alpha,
double *A, int *lda, double *x, int *incx, double *beta, double *y,
int *incy);
-extern void zgemv_(char* trans, int *m, int *n, complex *alpha,
- complex *A, int *lda, complex *x, int *incx, complex *beta,
- complex *y, int *incy);
+extern void zgemv_(char* trans, int *m, int *n, double complex *alpha,
+ double complex *A, int *lda, double complex *x, int *incx, double complex *beta,
+ double complex *y, int *incy);
extern void dgbmv_(char* trans, int *m, int *n, int *kl, int *ku,
double *alpha, double *A, int *lda, double *x, int *incx,
double *beta, double *y, int *incy);
extern void zgbmv_(char* trans, int *m, int *n, int *kl, int *ku,
- complex *alpha, complex *A, int *lda, complex *x, int *incx,
- complex *beta, complex *y, int *incy);
+ double complex *alpha, double complex *A, int *lda, double complex *x, int *incx,
+ double complex *beta, double complex *y, int *incy);
extern void dsymv_(char *uplo, int *n, double *alpha, double *A,
int *lda, double *x, int *incx, double *beta, double *y, int *incy);
-extern void zhemv_(char *uplo, int *n, complex *alpha, complex *A,
- int *lda, complex *x, int *incx, complex *beta, complex *y,
+extern void zhemv_(char *uplo, int *n, double complex *alpha, double complex *A,
+ int *lda, double complex *x, int *incx, double complex *beta, double complex *y,
int *incy);
extern void dsbmv_(char *uplo, int *n, int *k, double *alpha, double *A,
int *lda, double *x, int *incx, double *beta, double *y, int *incy);
-extern void zhbmv_(char *uplo, int *n, int *k, complex *alpha,
- complex *A, int *lda, complex *x, int *incx, complex *beta,
- complex *y, int *incy);
+extern void zhbmv_(char *uplo, int *n, int *k, double complex *alpha,
+ double complex *A, int *lda, double complex *x, int *incx, double complex *beta,
+ double complex *y, int *incy);
extern void dtrmv_(char *uplo, char *trans, char *diag, int *n,
double *A, int *lda, double *x, int *incx);
extern void ztrmv_(char *uplo, char *trans, char *diag, int *n,
- complex *A, int *lda, complex *x, int *incx);
+ double complex *A, int *lda, double complex *x, int *incx);
extern void dtbmv_(char *uplo, char *trans, char *diag, int *n, int *k,
double *A, int *lda, double *x, int *incx);
extern void ztbmv_(char *uplo, char *trans, char *diag, int *n, int *k,
- complex *A, int *lda, complex *x, int *incx);
+ double complex *A, int *lda, double complex *x, int *incx);
extern void dtrsv_(char *uplo, char *trans, char *diag, int *n,
double *A, int *lda, double *x, int *incx);
extern void ztrsv_(char *uplo, char *trans, char *diag, int *n,
- complex *A, int *lda, complex *x, int *incx);
+ double complex *A, int *lda, double complex *x, int *incx);
extern void dtbsv_(char *uplo, char *trans, char *diag, int *n, int *k,
double *A, int *lda, double *x, int *incx);
extern void ztbsv_(char *uplo, char *trans, char *diag, int *n, int *k,
- complex *A, int *lda, complex *x, int *incx);
+ double complex *A, int *lda, double complex *x, int *incx);
extern void dger_(int *m, int *n, double *alpha, double *x, int *incx,
double *y, int *incy, double *A, int *lda);
-extern void zgerc_(int *m, int *n, complex *alpha, complex *x,
- int *incx, complex *y, int *incy, complex *A, int *lda);
-extern void zgeru_(int *m, int *n, complex *alpha, complex *x,
- int *incx, complex *y, int *incy, complex *A, int *lda);
+extern void zgerc_(int *m, int *n, double complex *alpha, double complex *x,
+ int *incx, double complex *y, int *incy, double complex *A, int *lda);
+extern void zgeru_(int *m, int *n, double complex *alpha, double complex *x,
+ int *incx, double complex *y, int *incy, double complex *A, int *lda);
extern void dsyr_(char *uplo, int *n, double *alpha, double *x,
int *incx, double *A, int *lda);
-extern void zher_(char *uplo, int *n, double *alpha, complex *x,
- int *incx, complex *A, int *lda);
+extern void zher_(char *uplo, int *n, double *alpha, double complex *x,
+ int *incx, double complex *A, int *lda);
extern void dsyr2_(char *uplo, int *n, double *alpha, double *x,
int *incx, double *y, int *incy, double *A, int *lda);
-extern void zher2_(char *uplo, int *n, complex *alpha, complex *x,
- int *incx, complex *y, int *incy, complex *A, int *lda);
+extern void zher2_(char *uplo, int *n, double complex *alpha, double complex *x,
+ int *incx, double complex *y, int *incy, double complex *A, int *lda);
/* BLAS 3 prototypes */
@@ -126,46 +127,46 @@ extern void dgemm_(char *transa, char *transb, int *m, int *n, int *k,
double *alpha, double *A, int *lda, double *B, int *ldb,
double *beta, double *C, int *ldc);
extern void zgemm_(char *transa, char *transb, int *m, int *n, int *k,
- complex *alpha, complex *A, int *lda, complex *B, int *ldb,
- complex *beta, complex *C, int *ldc);
+ double complex *alpha, double complex *A, int *lda, double complex *B, int *ldb,
+ double complex *beta, double complex *C, int *ldc);
extern void dsymm_(char *side, char *uplo, int *m, int *n,
double *alpha, double *A, int *lda, double *B, int *ldb,
double *beta, double *C, int *ldc);
extern void zsymm_(char *side, char *uplo, int *m, int *n,
- complex *alpha, complex *A, int *lda, complex *B, int *ldb,
- complex *beta, complex *C, int *ldc);
+ double complex *alpha, double complex *A, int *lda, double complex *B, int *ldb,
+ double complex *beta, double complex *C, int *ldc);
extern void zhemm_(char *side, char *uplo, int *m, int *n,
- complex *alpha, complex *A, int *lda, complex *B, int *ldb,
- complex *beta, complex *C, int *ldc);
+ double complex *alpha, double complex *A, int *lda, double complex *B, int *ldb,
+ double complex *beta, double complex *C, int *ldc);
extern void dsyrk_(char *uplo, char *trans, int *n, int *k,
double *alpha, double *A, int *lda, double *beta, double *B,
int *ldb);
extern void zsyrk_(char *uplo, char *trans, int *n, int *k,
- complex *alpha, complex *A, int *lda, complex *beta, complex *B,
+ double complex *alpha, double complex *A, int *lda, double complex *beta, double complex *B,
int *ldb);
extern void zherk_(char *uplo, char *trans, int *n, int *k,
- double *alpha, complex *A, int *lda, double *beta, complex *B,
+ double *alpha, double complex *A, int *lda, double *beta, double complex *B,
int *ldb);
extern void dsyr2k_(char *uplo, char *trans, int *n, int *k,
double *alpha, double *A, int *lda, double *B, int *ldb,
double *beta, double *C, int *ldc);
extern void zsyr2k_(char *uplo, char *trans, int *n, int *k,
- complex *alpha, complex *A, int *lda, complex *B, int *ldb,
- complex *beta, complex *C, int *ldc);
+ double complex *alpha, double complex *A, int *lda, double complex *B, int *ldb,
+ double complex *beta, double complex *C, int *ldc);
extern void zher2k_(char *uplo, char *trans, int *n, int *k,
- complex *alpha, complex *A, int *lda, complex *B, int *ldb,
- double *beta, complex *C, int *ldc);
+ double complex *alpha, double complex *A, int *lda, double complex *B, int *ldb,
+ double *beta, double complex *C, int *ldc);
extern void dtrmm_(char *side, char *uplo, char *transa, char *diag,
int *m, int *n, double *alpha, double *A, int *lda, double *B,
int *ldb);
extern void ztrmm_(char *side, char *uplo, char *transa, char *diag,
- int *m, int *n, complex *alpha, complex *A, int *lda, complex *B,
+ int *m, int *n, double complex *alpha, double complex *A, int *lda, double complex *B,
int *ldb);
extern void dtrsm_(char *side, char *uplo, char *transa, char *diag,
int *m, int *n, double *alpha, double *A, int *lda, double *B,
int *ldb);
extern void ztrsm_(char *side, char *uplo, char *transa, char *diag,
- int *m, int *n, complex *alpha, complex *A, int *lda, complex *B,
+ int *m, int *n, double complex *alpha, double complex *A, int *lda, double complex *B,
int *ldb);
diff --git a/src/C/cholmod.c b/src/C/cholmod.c
index 67c7e51..f88c695 100644
--- a/src/C/cholmod.c
+++ b/src/C/cholmod.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -25,7 +26,7 @@
#include "cholmod.h"
#include "complex.h"
-const int E_SIZE[] = { sizeof(int_t), sizeof(double), sizeof(complex) };
+const int E_SIZE[] = { sizeof(int_t), sizeof(double), sizeof(double complex) };
/* defined in pyconfig.h */
#if (SIZEOF_INT < SIZEOF_LONG)
@@ -44,26 +45,29 @@ PyDoc_STRVAR(cholmod__doc__, "Interface to the CHOLMOD library.\n\n"
"entry in the dictionary cholmod.options, with key value 'supernodal', "
"\n'print', 'nmethods', 'postorder', or 'dbound', respectively.\n \n"
"These parameters have the following meaning.\n\n"
-"options['supernodal']: If equal to 0, an LDL^T or LDL^H factorization"
-"\n is computed using a simplicial algorithm. If equal to 2, an\n"
+"options['supernodal']: If equal to 0, an LDL^T or LDL^H factorization\n"
+" is computed using a simplicial algorithm. If equal to 2, an\n"
" LL^T or LL^H factorization is computed using a supernodal\n"
" algorithm. If equal to 1, the most efficient of the two\n"
" factorizations is selected, based on the sparsity pattern.\n\n"
"options['print']: A nonnegative integer that controls the amount of\n"
" output printed to the screen.\n\n"
"options['nmethods']: A nonnegative integer that specifies how many\n"
-" orderings are attempted prior to factorization. If equal to 0,\n"
-" the AMD ordering and the user-provided permutation (if any) are\n"
-" compared, and the best one is used. If equal to 1, the AMD\n"
-" ordering is used when no permutation is provided by the user,\n"
-" and the user-provided permutation is used otherwise. Default: 0."
-"\n\noptions['postorder']: True or False. If True the symbolic\n"
+" orderings are attempted prior to factorization. If equal to 2,\n"
+" the user-provided ordering and the AMD ordering are compared, and \n"
+" the best ordering is used. (If the user does not provide an \n"
+" ordering the AMD ordering is used.) If nmethods is equal to 1, \n"
+" the user-provided ordering is used. (In this case, the user must \n"
+" provide an ordering. If nmethods is equal to 0, the user-provided\n"
+" ordering (if any), the AMD ordering, and (if installed during the \n"
+" the CHOLMOD installation) a number of other orderings are compared,\n"
+" and the best ordering is used. Default: 0.\n\n"
+"noptions['postorder']: True or False. If True the symbolic\n"
" analysis is followed by a postordering. Default: True.\n\n"
"options['dbound']: Smallest absolute value for the diagonal\n"
" elements of D in an LDL^T factorization, or the diagonal\n"
" elements of L in a Cholesky factorization. Default: 0.0.\n\n"
-"CHOLMOD is available from http://www.cise.ufl.edu/research/sparse.");
-
+"CHOLMOD is available from www.suitesparse.com.");
static PyObject *cholmod_module;
static cholmod_common Common;
@@ -158,7 +162,7 @@ static cholmod_sparse *pack(spmatrix *A, char uplo)
if (SP_ID(A) == DOUBLE)
((double *)B->x)[cnt] = SP_VALD(A)[k];
else
- ((complex *)B->x)[cnt] = SP_VALZ(A)[k];
+ ((double complex *)B->x)[cnt] = SP_VALZ(A)[k];
((int_t *)B->p)[j+1]++;
((int_t *)B->i)[cnt++] = SP_ROW(A)[k];
}
@@ -179,7 +183,7 @@ static cholmod_sparse *pack(spmatrix *A, char uplo)
if (SP_ID(A) == DOUBLE)
((double *)B->x)[cnt] = SP_VALD(A)[k];
else
- ((complex *)B->x)[cnt] = SP_VALZ(A)[k];
+ ((double complex *)B->x)[cnt] = SP_VALZ(A)[k];
((int_t *)B->p)[j+1]++;
((int_t *)B->i)[cnt++] = SP_ROW(A)[k];
}
@@ -950,7 +954,7 @@ static char doc_diag[] =
" cholmod.numeric computed with options['supernodal'] = 2";
extern void dcopy_(int *n, double *x, int *incx, double *y, int *incy);
-extern void zcopy_(int *n, complex *x, int *incx, complex *y, int *incy);
+extern void zcopy_(int *n, double complex *x, int *incx, double complex *y, int *incy);
static PyObject* diag(PyObject *self, PyObject *args)
{
@@ -1003,7 +1007,7 @@ static PyObject* diag(PyObject *self, PyObject *args)
dcopy_(&ncols, ((double *) L->x) + ((int_t *) L->px)[k],
&incy, MAT_BUFD(d)+strt, &incx);
else
- zcopy_(&ncols, ((complex *) L->x) + ((int_t *) L->px)[k],
+ zcopy_(&ncols, ((double complex *) L->x) + ((int_t *) L->px)[k],
&incy, MAT_BUFZ(d)+strt, &incx);
strt += ncols;
}
diff --git a/src/C/cvxopt.h b/src/C/cvxopt.h
index 6802bcb..354b313 100644
--- a/src/C/cvxopt.h
+++ b/src/C/cvxopt.h
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -28,7 +29,7 @@
#ifndef NO_ANSI99_COMPLEX
#include "complex.h"
-#define MAT_BUFZ(O) ((complex *)((matrix *)O)->buffer)
+#define MAT_BUFZ(O) ((double complex *)((matrix *)O)->buffer)
#endif
#ifndef __CVXOPT__
@@ -38,20 +39,16 @@
#define DOUBLE 1
#define COMPLEX 2
-#define int_t Py_ssize_t
+#define int_t Py_ssize_t
typedef struct {
PyObject_HEAD
void *buffer; /* in column-major-mode array of type 'id' */
-#if PY_MAJOR_VERSION >= 3
int nrows, ncols; /* number of rows and columns */
+ int id; /* DOUBLE, INT, COMPLEX */
int_t shape[2];
int_t strides[2];
int_t ob_exports;
-#else
- int_t nrows, ncols; /* number of rows and columns */
-#endif
- int id; /* DOUBLE, INT, COMPLEX */
} matrix;
typedef struct {
@@ -76,7 +73,7 @@ typedef struct {
static void **cvxopt_API;
-#define Matrix_New (*(matrix * (*)(int_t, int_t, int)) cvxopt_API[0])
+#define Matrix_New (*(matrix * (*)(int, int, int)) cvxopt_API[0])
#define Matrix_NewFromMatrix (*(matrix * (*)(matrix *, int)) cvxopt_API[1])
#define Matrix_NewFromList (*(matrix * (*)(PyObject *, int)) cvxopt_API[2])
#define Matrix_Check (*(int * (*)(void *)) cvxopt_API[3])
@@ -120,7 +117,7 @@ import_cvxopt(void)
#define MAT_BUF(O) ((matrix *)O)->buffer
#define MAT_BUFI(O) ((int_t *)((matrix *)O)->buffer)
#define MAT_BUFD(O) ((double *)((matrix *)O)->buffer)
-#define MAT_BUFZ(O) ((complex *)((matrix *)O)->buffer)
+#define MAT_BUFZ(O) ((double complex *)((matrix *)O)->buffer)
#define MAT_NROWS(O) ((matrix *)O)->nrows
#define MAT_NCOLS(O) ((matrix *)O)->ncols
@@ -136,7 +133,7 @@ import_cvxopt(void)
#define SP_ROW(O) ((spmatrix *)O)->obj->rowind
#define SP_VAL(O) ((spmatrix *)O)->obj->values
#define SP_VALD(O) ((double *)((spmatrix *)O)->obj->values)
-#define SP_VALZ(O) ((complex *)((spmatrix *)O)->obj->values)
+#define SP_VALZ(O) ((double complex *)((spmatrix *)O)->obj->values)
#define CCS_NROWS(O) ((ccs *)O)->nrows
#define CCS_NCOLS(O) ((ccs *)O)->ncols
diff --git a/src/C/dense.c b/src/C/dense.c
index b8d65f7..cbf239d 100644
--- a/src/C/dense.c
+++ b/src/C/dense.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,25 +24,8 @@
#include "Python.h"
#include "cvxopt.h"
#include "misc.h"
-
#include <complexobject.h>
-#if PY_MAJOR_VERSION < 3
-/* NumPy array protocol */
-typedef struct {
- int version;
- int nd;
- char typekind;
- int itemsize;
- int flags;
- int_t *shape;
- int_t *strides;
- void *data;
-} PyArrayInterface;
-#endif
-
-static const char PY_ARRAY_TC[3] = { 'i', 'f', 'c' };
-
/* prototyping and forward declarations */
extern void (*axpy[])(int *, number *, void *, int *, void *, int *) ;
extern void (*scal[])(int *, number *, void *, int *) ;
@@ -59,25 +43,32 @@ int get_id(void *, int ) ;
extern const int E_SIZE[];
extern const char TC_CHAR[][2];
extern number One[3], MinusOne[3], Zero[3];
+static char FMT_STR[][4] = {"l","d","Zd","i"};
extern PyObject *base_mod;
-
extern PyTypeObject spmatrix_tp ;
PyTypeObject matrix_tp ;
-matrix * Matrix_NewFromNumber(int_t , int_t , int_t , void *, int ) ;
+matrix * Matrix_New(int, int, int);
+matrix * Matrix_NewFromMatrix(matrix *, int);
+matrix * Matrix_NewFromSequence(PyObject *, int);
+matrix * Matrix_NewFromNumber(int , int , int , void *, int ) ;
+matrix * Matrix_NewFromPyBuffer(PyObject *, int, int *);
+matrix * dense(spmatrix *);
+matrix * dense_concat(PyObject *, int);
+matrix * create_indexlist(int_t, PyObject *);
static PyNumberMethods matrix_as_number ;
static PyObject * matrix_iter(matrix *) ;
void dscal_(int *, double *, double *, int *) ;
-void zscal_(int *, complex *, complex *, int *) ;
+void zscal_(int *, double complex *, double complex *, int *) ;
void daxpy_(int *, double *, double *, int *, double *, int *) ;
-void zaxpy_(int *, complex *, complex *, int *, complex *, int *) ;
+void zaxpy_(int *, double complex *, double complex *, int *, double complex *, int *) ;
void dgemm_(char *, char *, int *, int *, int *, double *, double *,
int *, double *, int *, double *, double *, int *) ;
-void zgemm_(char *, char *, int *, int *, int *, complex *, complex *,
- int *, complex *, int *, complex *, complex *, int *) ;
+void zgemm_(char *, char *, int *, int *, int *, double complex *, double complex *,
+ int *, double complex *, int *, double complex *, double complex *, int *) ;
@@ -134,7 +125,7 @@ void * convert_mtx_alloc(matrix *src, int id)
/*
Creates an unpopulated "empty" matrix. In API
*/
-matrix * Matrix_New(int_t nrows, int_t ncols, int id)
+matrix * Matrix_New(int nrows, int ncols, int id)
{
matrix *a;
if ((nrows < 0) || (ncols < 0) || (id < INT) || (id > COMPLEX)) {
@@ -146,7 +137,11 @@ matrix * Matrix_New(int_t nrows, int_t ncols, int id)
return NULL;
a->id = id; a->nrows = nrows; a->ncols = ncols;
- if (!(a->buffer = calloc(nrows*ncols,E_SIZE[id]))) {
+ if ((a->buffer = calloc(nrows*ncols,E_SIZE[id])))
+ return a;
+ else if (nrows*ncols == 0)
+ return a;
+ else {
#if PY_MAJOR_VERSION >= 3
Py_TYPE(a)->tp_free((PyObject*)a);
#else
@@ -154,8 +149,6 @@ matrix * Matrix_New(int_t nrows, int_t ncols, int id)
#endif
return (matrix *)PyErr_NoMemory();
}
-
- return a;
}
/*
@@ -178,99 +171,116 @@ matrix *Matrix_NewFromMatrix(matrix *src, int id)
return a;
}
-#if PY_MAJOR_VERSION < 3
/*
- Creates a matrix from a PyArrayInterface.
+ Creates a matrix from buffer interface.
*/
-matrix *Matrix_NewFromArrayStruct(PyObject *obj, int id, int_t *ndim)
+matrix *Matrix_NewFromPyBuffer(PyObject *obj, int id, int *ndim)
{
- PyObject *cobj = PyObject_GetAttrString(obj, "__array_struct__");
- PyArrayInterface *src = (PyArrayInterface *)PyCObject_AsVoidPtr(cobj);
-
- if (src->version != 2)
- PY_ERR(PyExc_AssertionError, "unexpected format in array structure");
-
- if (src->nd != 1 && src->nd != 2)
- PY_ERR(PyExc_TypeError, "imported array must have 1 or 2 dimensions");
+ /* flags: buffer must provide format and stride information */
+ int flags = PyBUF_FORMAT | PyBUF_STRIDES;
+ Py_buffer *view = (Py_buffer *)malloc(sizeof(Py_buffer));
+ if (PyObject_GetBuffer(obj, view, flags)) {
+ free(view);
+ PY_ERR_TYPE("buffer not supported");
+ }
+ if (view->ndim != 1 && view->ndim != 2) {
+ free(view);
+ PY_ERR_TYPE("imported array must have 1 or 2 dimensions");
+ }
+
+ /* check buffer format */
+ int int_to_int_t = !strcmp(view->format, FMT_STR[3]);
int src_id;
- switch (src->typekind) {
- case 'i' : src_id = INT; break;
- case 'f' : src_id = DOUBLE; break;
- case 'c' : src_id = COMPLEX; break;
- default:
- Py_DECREF(cobj); PY_ERR_TYPE("invalid array type");
+ if (!strcmp(view->format, FMT_STR[0]) || int_to_int_t)
+ src_id = INT;
+ else if (!strcmp(view->format, FMT_STR[1]))
+ src_id = DOUBLE;
+ else if (!strcmp(view->format, FMT_STR[2]))
+ src_id = COMPLEX;
+ else {
+ PyBuffer_Release(view);
+ free(view);
+ PY_ERR_TYPE("buffer format not supported");
}
if (id == -1) id = src_id;
- if ((src_id > id) || (src->itemsize != E_SIZE[src_id])) {
- Py_DECREF(cobj);
+ if ((src_id > id) || (view->itemsize != E_SIZE[src_id] && !int_to_int_t)) {
+ PyBuffer_Release(view);
+ free(view);
PY_ERR_TYPE("invalid array type");
}
- /* XXX: revise flags check */
- if (!(src->flags & 0x001) && !(src->flags & 0x002)) {
- Py_DECREF(cobj);
- PY_ERR_TYPE("error converting array");
- }
-
- *ndim = src->nd;
- matrix *a = Matrix_New(src->shape[0], src->nd == 2 ? src->shape[1] : 1, id);
- if (!a) {
- Py_DECREF(cobj); return (matrix *)PyErr_NoMemory();
- }
-
- int_t i, j, cnt;
-
- for (j=0, cnt=0; j<MAT_NCOLS(a); j++) {
- for (i=0; i<src->shape[0]; i++, cnt++) {
-
- number n;
- switch (id) {
- case INT :
- MAT_BUFI(a)[cnt] =
- *(int_t *)(src->data+i*src->strides[0]+j*src->strides[1]);
- break;
- case DOUBLE:
- switch (src_id) {
- case INT:
- n.d = *(int_t *)(src->data + i*src->strides[0]+j*src->strides[1]);
- break;
- case DOUBLE:
- n.d = *(double *)(src->data + i*src->strides[0]+j*src->strides[1]);
- break;
- }
- MAT_BUFD(a)[cnt] = n.d;
- break;
- case COMPLEX:
- switch (src_id) {
- case INT:
- n.z = *(int_t *)(src->data+i*src->strides[0]+j*src->strides[1]);
- break;
- case DOUBLE:
- n.z = *(double *)(src->data+i*src->strides[0]+j*src->strides[1]);
- break;
- case COMPLEX:
- n.z = *(complex *)(src->data+i*src->strides[0]+j*src->strides[1]);
- break;
- }
- MAT_BUFZ(a)[cnt] = n.z;
- break;
- }
- }
- }
-
- Py_DECREF(cobj);
- return a;
+ *ndim = view->ndim;
+
+ matrix *a = Matrix_New((int)view->shape[0], view->ndim == 2 ? (int)view->shape[1] : 1, id);
+ if (!a) {
+ PyBuffer_Release(view);
+ free(view);
+ return (matrix *)PyErr_NoMemory();
+ }
+
+ int i, j, cnt;
+
+ for (j=0, cnt=0; j<MAT_NCOLS(a); j++) {
+ for (i=0; i< (int)view->shape[0]; i++, cnt++) {
+
+ number n;
+ switch (id) {
+ case INT :
+ if (int_to_int_t)
+ MAT_BUFI(a)[cnt] =
+ *(int *)(view->buf+i*view->strides[0]+j*view->strides[1]);
+ else
+ MAT_BUFI(a)[cnt] =
+ *(int_t *)(view->buf+i*view->strides[0]+j*view->strides[1]);
+ break;
+ case DOUBLE:
+ switch (src_id) {
+ case INT:
+ if (int_to_int_t)
+ n.d = *(int *)(view->buf + i*view->strides[0]+j*view->strides[1]);
+ else
+ n.d = *(int_t *)(view->buf + i*view->strides[0]+j*view->strides[1]);
+ break;
+ case DOUBLE:
+ n.d = *(double *)(view->buf + i*view->strides[0]+j*view->strides[1]);
+ break;
+ }
+ MAT_BUFD(a)[cnt] = n.d;
+ break;
+ case COMPLEX:
+ switch (src_id) {
+ case INT:
+ if (int_to_int_t)
+ n.z = *(int *)(view->buf + i*view->strides[0]+j*view->strides[1]);
+ else
+ n.z = *(int_t *)(view->buf + i*view->strides[0]+j*view->strides[1]);
+ break;
+ case DOUBLE:
+ n.z = *(double *)(view->buf+i*view->strides[0]+j*view->strides[1]);
+ break;
+ case COMPLEX:
+ n.z = *(double complex *)(view->buf+i*view->strides[0]+j*view->strides[1]);
+ break;
+ }
+ MAT_BUFZ(a)[cnt] = n.z;
+ break;
+ }
+ }
+ }
+
+ PyBuffer_Release(view);
+ free(view);
+ return a;
}
-#endif
/*
Generates a matrix with all entries equal.
*/
matrix *
-Matrix_NewFromNumber(int_t nrows, int_t ncols, int_t id, void *val, int val_id)
+Matrix_NewFromNumber(int nrows, int ncols, int id, void *val, int val_id)
{
int_t i;
@@ -306,7 +316,7 @@ matrix * Matrix_NewFromSequence(PyObject *x, int id)
}
}
- if (!len) return Matrix_New(0, 1, (id < 0 ? INT : id));
+ if (!len) { Py_DECREF(seq); return Matrix_New(0, 1, (id < 0 ? INT : id)); }
matrix *L = Matrix_New(len,1,id);
if (!L) { Py_DECREF(seq); return (matrix *)PyErr_NoMemory(); }
@@ -466,12 +476,13 @@ matrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static char *kwlist[] = { "x", "size", "tc", NULL};
int_t nrows=0, ncols=0;
- char tc = 0;
#if PY_MAJOR_VERSION >= 3
+ int tc = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OOC:matrix", kwlist,
&Objx, &size, &tc))
#else
+ char tc = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OOc:matrix", kwlist,
&Objx, &size, &tc))
#endif
@@ -494,8 +505,8 @@ matrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
/* x is a number */
if (PY_NUMBER(Objx))
return (PyObject *)
- Matrix_NewFromNumber(MAX(nrows, size ? 0 : 1),
- MAX(ncols, size ? 0 : 1), (id == -1 ? get_id(Objx,1):id),Objx,1);
+ Matrix_NewFromNumber(MAX((int)nrows, size ? 0 : 1),
+ MAX((int)ncols, size ? 0 : 1), (id == -1 ? get_id(Objx,1):id),Objx,1);
/* a matrix */
else if (Matrix_Check(Objx))
@@ -513,13 +524,11 @@ matrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
}
}
-#if PY_MAJOR_VERSION < 3
- /* PyArrayStructure */
- else if (PyObject_HasAttrString(Objx,"__array_struct__")) {
- int_t ndim = 0;
- ret = Matrix_NewFromArrayStruct(Objx, id, &ndim);
+ /* buffer interface */
+ else if (PyObject_CheckBuffer(Objx)) {
+ int ndim = 0;
+ ret = Matrix_NewFromPyBuffer(Objx, id, &ndim);
}
-#endif
/* x is a list */
else if (PyList_Check(Objx)) {
@@ -536,6 +545,7 @@ matrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
else if (PySequence_Check(Objx)) {
ret = Matrix_NewFromSequence(Objx, id);
}
+
else PY_ERR_TYPE("invalid matrix initialization");
if (ret && size) {
@@ -553,8 +563,12 @@ PyObject *matrix_sub(PyObject *, PyObject *);
static PyObject *
matrix_richcompare(PyObject *self, PyObject *other, int op) {
+ Py_INCREF(Py_NotImplemented);
+ return Py_NotImplemented;
+}
- PY_ERR(PyExc_NotImplementedError, "matrix comparison not implemented");
+int * matrix_compare(PyObject *self, PyObject *other) {
+ PyErr_SetString(PyExc_NotImplementedError, "matrix comparison not implemented"); return 0;
}
static PyObject *
@@ -630,7 +644,7 @@ matrix * create_indexlist(int_t dim, PyObject *A)
&start, &stop, &step, &lgt) < 0) return NULL;
#endif
- if ((x = Matrix_New(lgt, 1, INT)))
+ if ((x = Matrix_New((int)lgt, 1, INT)))
for (i=start, j=0; j<lgt; i += step, j++) MAT_BUFI(x)[j] = i;
else {
return (matrix *)PyErr_NoMemory();
@@ -733,7 +747,7 @@ matrix_subscr(matrix* self, PyObject* args)
&colstart, &colstop, &colstep, &collgt) < 0)) return NULL;
#endif
- if (!(ret = Matrix_New(rowlgt, collgt, self->id)))
+ if (!(ret = Matrix_New((int)rowlgt, (int)collgt, self->id)))
return PyErr_NoMemory();
int i, j, icnt, jcnt, cnt=0;
@@ -783,21 +797,18 @@ static int
matrix_ass_subscr(matrix* self, PyObject* args, PyObject* val)
{
matrix *Il = NULL, *Jl = NULL;
- int_t i, j, id = self->id, decref_val = 0, arraystruct_nd = 0;
+ int_t i, j, id = self->id, decref_val = 0;
+ int ndim = 0;
if (!val) PY_ERR_INT(PyExc_NotImplementedError,
"cannot delete matrix entries");
if (!(PY_NUMBER(val) || Matrix_Check(val) || SpMatrix_Check(val))) {
-#if PY_MAJOR_VERSION >= 3
- val = (PyObject *)Matrix_NewFromSequence(val, MAT_ID(self));
-#else
- if (PyObject_HasAttrString(val,"__array_struct__"))
- val = (PyObject *)Matrix_NewFromArrayStruct(val, -1, &arraystruct_nd);
+ if (PyObject_CheckBuffer(val))
+ val = (PyObject *)Matrix_NewFromPyBuffer(val, -1, &ndim);
else
val = (PyObject *)Matrix_NewFromSequence(val, MAT_ID(self));
-#endif
if (!val)
PY_ERR_INT(PyExc_NotImplementedError, "invalid type in assignment");
@@ -919,7 +930,7 @@ matrix_ass_subscr(matrix* self, PyObject* args, PyObject* val)
free_lists_exit(argI,argJ,Il,Jl,-1);
}
- if (decref_val && arraystruct_nd < 2 &&
+ if (decref_val && ndim < 2 &&
MAT_LGT(val) == MAT_LGT(Il)*MAT_LGT(Jl)) {
MAT_NROWS(val) = MAT_LGT(Il); MAT_NCOLS(val) = MAT_LGT(Jl);
}
@@ -1099,7 +1110,8 @@ matrix_tofile(matrix *self, PyObject *args, PyObject *kwrds)
if (!(fp = PyFile_AsFile(file_obj)))
PY_ERR(PyExc_IOError,"file not open for writing");
- if (fwrite(self->buffer, E_SIZE[self->id], MAT_LGT(self), fp)) ;
+ if (fwrite(self->buffer, E_SIZE[self->id], MAT_LGT(self), fp))
+ ;
return Py_BuildValue("");
}
@@ -1292,34 +1304,41 @@ static PyObject * matrix_get_typecode(matrix *self, void *closure)
#endif
}
-#if PY_MAJOR_VERSION >= 3
-
static int
matrix_buffer_getbuf(matrix *self, Py_buffer *view, int flags)
{
- if (view==NULL) return 0;
+ if (flags & PyBUF_FORMAT) {
+ if (self->id == INT || self->id == DOUBLE || self->id == COMPLEX)
+ view->format = FMT_STR[self->id];
+ else
+ PY_ERR_INT(PyExc_TypeError, "unknown type");
+ }
+ else
+ view->format = NULL;
+
+ if (flags & PyBUF_STRIDES) {
+ view->len = MAT_LGT(self)*E_SIZE[self->id];
+ view->itemsize = E_SIZE[self->id];
+ self->strides[0] = view->itemsize;
+ self->strides[1] = self->nrows*view->itemsize;
+ view->strides = self->strides;
+ }
+ else PY_ERR_INT(PyExc_TypeError, "stride-less requests not supported");
view->buf = self->buffer;
- view->len = MAT_LGT(self)*E_SIZE[self->id];
view->readonly = 0;
- view->format = NULL; //FIXME
- view->ndim = 2;
-
- view->obj = (PyObject*)self;
- Py_INCREF(self);
-
- view->itemsize = E_SIZE[self->id];
view->suboffsets = NULL;
+ view->ndim = 2;
self->shape[0] = self->nrows; self->shape[1] = self->ncols;
view->shape = self->shape;
- self->strides[0] = view->itemsize;
- self->strides[1] = self->nrows*view->itemsize;
- view->strides = self->strides;
-
+ view->obj = (PyObject*)self;
view->internal = NULL;
+
+ Py_INCREF(self);
self->ob_exports++;
+
return 0;
}
@@ -1330,48 +1349,15 @@ matrix_buffer_relbuf(matrix *self, Py_buffer *view)
}
static PyBufferProcs matrix_as_buffer = {
- (getbufferproc)matrix_buffer_getbuf,
- (releasebufferproc)matrix_buffer_relbuf
-};
-
-
-#else
-
-static void matrix_free_array_struct(void *a_struct, void *descr)
-{
- free(((PyArrayInterface *)a_struct)->shape);
- free(((PyArrayInterface *)a_struct)->strides);
- free(a_struct);
-}
-
-static PyObject * matrix_array_struct(matrix *self, void *closure) {
-
- PyArrayInterface *a = malloc(sizeof(PyArrayInterface));
- if (!a) return PyErr_NoMemory();
-
- a->shape = malloc(2*sizeof(int_t));
- a->strides = malloc(2*sizeof(int_t));
- if (!a->shape || !a->strides) {
- free(a->shape); free(a->strides); free(a);
- return PyErr_NoMemory();
- }
-
- a->version = 2;
- a->nd = 2;
- a->typekind = PY_ARRAY_TC[self->id];
- a->itemsize = E_SIZE[self->id];
- a->flags = 0x001 + 0x002 + 0x100 + 0x200 + 0x400;
- a->shape[0] = self->nrows;
- a->shape[1] = self->ncols;
- a->strides[0] = E_SIZE[self->id];
- a->strides[1] = self->nrows*E_SIZE[self->id];
- a->data = self->buffer;
-
- return (PyObject *) PyCObject_FromVoidPtrAndDesc((void *) a,
- "CVXOPT ARRAY STRUCT", matrix_free_array_struct);
-
-}
+#if PY_MAJOR_VERSION < 3
+ NULL,
+ NULL,
+ NULL,
+ NULL,
#endif
+ (getbufferproc)matrix_buffer_getbuf,
+ (releasebufferproc)matrix_buffer_relbuf
+};
static PyObject * matrix_get_T(matrix *self, void *closure)
{
@@ -1384,25 +1370,15 @@ static PyObject * matrix_get_H(matrix *self, void *closure)
}
static PyGetSetDef matrix_getsets[] = {
- {"size", (getter) matrix_get_size, (setter) matrix_set_size,
- "matrix dimensions"},
+ {"size", (getter) matrix_get_size, (setter) matrix_set_size, "matrix dimensions"},
{"typecode", (getter) matrix_get_typecode, NULL, "typecode character"},
-#if PY_MAJOR_VERSION <3
- {"__array_struct__", (getter) matrix_array_struct, NULL,
- "C object implementing the NumPy array protocol"},
-#endif
{"T", (getter) matrix_get_T, NULL, "transpose"},
{"H", (getter) matrix_get_H, NULL, "conjugate transpose"},
{NULL} /* Sentinel */
};
PyTypeObject matrix_tp = {
-#if PY_MAJOR_VERSION >= 3
PyVarObject_HEAD_INIT(NULL, 0)
-#else
- PyObject_HEAD_INIT(NULL)
- 0,
-#endif
"cvxopt.base.matrix",
sizeof(matrix),
0,
@@ -1410,7 +1386,11 @@ PyTypeObject matrix_tp = {
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
+#if PY_MAJOR_VERSION >= 3
0, /* tp_compare */
+#else
+ (cmpfunc)matrix_compare, /* tp_compare */
+#endif
(reprfunc)matrix_repr, /* tp_repr */
&matrix_as_number, /* tp_as_number */
0, /* tp_as_sequence */
@@ -1420,13 +1400,12 @@ PyTypeObject matrix_tp = {
(reprfunc)matrix_str, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
-#if PY_MAJOR_VERSION >= 3
&matrix_as_buffer, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+#if PY_MAJOR_VERSION >= 3
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
#else
- 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
- Py_TPFLAGS_CHECKTYPES, /* tp_flags */
+ Py_TPFLAGS_CHECKTYPES | Py_TPFLAGS_HAVE_NEWBUFFER, /* tp_flags */
#endif
0, /* tp_doc */
0, /* tp_traverse */
@@ -1478,16 +1457,28 @@ matrix_add_generic(PyObject *self, PyObject *other, int inplace)
matrix *ret = Matrix_NewFromMatrix((matrix *)other, id);
if (!ret) return PyErr_NoMemory();
- int lgt = MAT_LGT(ret), int1 = 1, int0 = 0;
- axpy[id](&lgt, &One[id], &n, &int0, ret->buffer, &int1);
+ int lgt = MAT_LGT(ret); int i;
+ switch (id) {
+ case INT:
+ for (i=0; i<lgt; i++) MAT_BUFI(ret)[i] += n.i;
+ break;
+ case DOUBLE:
+ for (i=0; i<lgt; i++) MAT_BUFD(ret)[i] += n.d;
+ break;
+ case COMPLEX:
+ for (i=0; i<lgt; i++) MAT_BUFZ(ret)[i] += n.z;
+ break;
+ }
return (PyObject *)ret;
}
else {
convert_num[id](&n,other,(Matrix_Check(other) ? 0 : 1),0);
- int int1 = 1, int0 = 0;
- axpy[id](&int1, &One[id], &n, &int0, MAT_BUF(self), &int1);
-
+ switch (id) {
+ case INT: MAT_BUFI(self)[0] += n.i; break;
+ case DOUBLE: MAT_BUFD(self)[0] += n.d; break;
+ case COMPLEX: MAT_BUFZ(self)[0] += n.z; break;
+ }
Py_INCREF(self);
return self;
}
@@ -1503,14 +1494,34 @@ matrix_add_generic(PyObject *self, PyObject *other, int inplace)
matrix *ret = Matrix_NewFromMatrix((matrix *)self, id);
if (!ret) return PyErr_NoMemory();
- int lgt = MAT_LGT(self), int1 = 1, int0 = 0;
- axpy[id](&lgt, &One[id], &n, &int0, ret->buffer, &int1);
+ int lgt = MAT_LGT(self); int i;
+ switch (id) {
+ case INT:
+ for (i=0; i<lgt; i++) MAT_BUFI(ret)[i] += n.i;
+ break;
+ case DOUBLE:
+ for (i=0; i<lgt; i++) MAT_BUFD(ret)[i] += n.d;
+ break;
+ case COMPLEX:
+ for (i=0; i<lgt; i++) MAT_BUFZ(ret)[i] += n.z;
+ break;
+ }
return (PyObject *)ret;
}
else {
- int lgt = MAT_LGT(self), int1 = 1, int0 = 0;
- axpy[id](&lgt, &One[id], &n, &int0, MAT_BUF(self), &int1);
+ int lgt = MAT_LGT(self); int i;
+ switch (id) {
+ case INT:
+ for (i=0; i<lgt; i++) MAT_BUFI(self)[i] += n.i;
+ break;
+ case DOUBLE:
+ for (i=0; i<lgt; i++) MAT_BUFD(self)[i] += n.d;
+ break;
+ case COMPLEX:
+ for (i=0; i<lgt; i++) MAT_BUFZ(self)[i] += n.z;
+ break;
+ }
Py_INCREF(self);
return self;
@@ -1584,16 +1595,28 @@ matrix_sub_generic(PyObject *self, PyObject *other, int inplace)
matrix *ret = Matrix_NewFromMatrix((matrix *)other, id);
if (!ret) return PyErr_NoMemory();
- int lgt = MAT_LGT(ret), int1 = 1, int0 = 0;
- scal[id](&lgt, &MinusOne[id], ret->buffer, &int1);
- axpy[id](&lgt, &One[id], &n, &int0, ret->buffer, &int1);
+ int lgt = MAT_LGT(ret); int i;
+ switch (id) {
+ case INT:
+ for (i=0; i<lgt; i++) MAT_BUFI(ret)[i] = n.i - MAT_BUFI(ret)[i];
+ break;
+ case DOUBLE:
+ for (i=0; i<lgt; i++) MAT_BUFD(ret)[i] = n.d - MAT_BUFD(ret)[i];
+ break;
+ case COMPLEX:
+ for (i=0; i<lgt; i++) MAT_BUFZ(ret)[i] = n.z - MAT_BUFZ(ret)[i];
+ break;
+ }
return (PyObject *)ret;
}
else {
convert_num[id](&n,other,(Matrix_Check(other) ? 0 : 1),0);
- int int1 = 1, int0 = 0;
- axpy[id](&int1, &MinusOne[id], &n, &int0, MAT_BUF(self), &int1);
+ switch (id) {
+ case INT: MAT_BUFI(self)[0] -= n.i; break;
+ case DOUBLE: MAT_BUFD(self)[0] -= n.d; break;
+ case COMPLEX: MAT_BUFZ(self)[0] -= n.z; break;
+ }
Py_INCREF(self);
return self;
@@ -1609,14 +1632,34 @@ matrix_sub_generic(PyObject *self, PyObject *other, int inplace)
matrix *ret = Matrix_NewFromMatrix((matrix *)self, id);
if (!ret) return PyErr_NoMemory();
- int lgt = MAT_LGT(self), int1 = 1, int0 = 0;
- axpy[id](&lgt, &MinusOne[id], &n, &int0, ret->buffer, &int1);
+ int lgt = MAT_LGT(self); int i;
+ switch (id) {
+ case INT:
+ for (i=0; i<lgt; i++) MAT_BUFI(ret)[i] -= n.i;
+ break;
+ case DOUBLE:
+ for (i=0; i<lgt; i++) MAT_BUFD(ret)[i] -= n.d;
+ break;
+ case COMPLEX:
+ for (i=0; i<lgt; i++) MAT_BUFZ(ret)[i] -= n.z;
+ break;
+ }
return (PyObject *)ret;
}
else {
- int lgt = MAT_LGT(self), int1 = 1, int0 = 0;
- axpy[id](&lgt, &MinusOne[id], &n, &int0, MAT_BUF(self), &int1);
+ int lgt = MAT_LGT(self); int i;
+ switch (id) {
+ case INT:
+ for (i=0; i<lgt; i++) MAT_BUFI(self)[i] -= n.i;
+ break;
+ case DOUBLE:
+ for (i=0; i<lgt; i++) MAT_BUFD(self)[i] -= n.d;
+ break;
+ case COMPLEX:
+ for (i=0; i<lgt; i++) MAT_BUFZ(self)[i] -= n.z;
+ break;
+ }
Py_INCREF(self);
return self;
@@ -2066,12 +2109,7 @@ matrixiter_next(matrixiter *it)
}
static PyTypeObject matrixiter_tp = {
-#if PY_MAJOR_VERSION >= 3
PyVarObject_HEAD_INIT(NULL, 0)
-#else
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
-#endif
"matrixiter", /* tp_name */
sizeof(matrixiter), /* tp_basicsize */
0, /* tp_itemsize */
diff --git a/src/C/dsdp.c b/src/C/dsdp.c
index 3f1428c..462e49d 100644
--- a/src/C/dsdp.c
+++ b/src/C/dsdp.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/C/fftw.c b/src/C/fftw.c
index 37c1589..776f4c3 100644
--- a/src/C/fftw.c
+++ b/src/C/fftw.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,7 +25,7 @@
PyDoc_STRVAR(fftw__doc__, "Interface to the FFTW3 library.\n");
-extern void zscal_(int *n, complex *alpha, complex *x, int *incx);
+extern void zscal_(int *n, double complex *alpha, double complex *x, int *incx);
extern void dscal_(int *n, double *alpha, double *x, int *incx);
static char doc_dft[] =
diff --git a/src/C/glpk.c b/src/C/glpk.c
index c74e4fa..51b9ed2 100644
--- a/src/C/glpk.c
+++ b/src/C/glpk.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,76 +21,36 @@
#include "cvxopt.h"
#include "misc.h"
-#include "glpk.h"
+#include <glpk.h>
+#include <float.h>
+#include <limits.h>
PyDoc_STRVAR(glpk__doc__,
"Interface to the simplex and mixed integer LP algorithms in GLPK.\n\n"
"The GLPK control parameters have the default values listed in \n"
- "the GLPK documentation, except for 'LPX_K_PRESOL', which is set\n"
- "to 1 and cannot be modified. The other parameters can be\n"
- "modified by making an entry in the dictionary glpk.options.\n"
- "For example, the command glpk.options['LPX_K_MSGLEV'] = 0 turns\n"
- "off the printed output during execution of glpk.simplex().\n"
- "See the documentation at www.gnu.org/software/glpk/glpk.html for\n"
- "the list of GLPK control parameters and their default values.");
+ "the GLPK documentation (section 2.8.1 for the simplex solver and \n"
+ "section 2.10.5 for the MILP solver). The control parameters can \n"
+ "be modified by making an entry in the dictionary glpk.options.\n"
+ "For example, glpk.options['msg_lev'] = 'GLP_MSG_OFF' turns off the \n"
+ "printed output will be turned off during execution of glpk.lp().\n"
+ "Setting glpk.options['it_lim'] = 10 sets the simplex iteration \n"
+ "limit to 10. Unrecognized entries in glpk.options are ignored.");
static PyObject *glpk_module;
-typedef struct {
- char name[20];
- int idx;
- char type;
-} param_tuple;
-
-static const param_tuple GLPK_PARAM_LIST[] = {
- {"LPX_K_MSGLEV", LPX_K_MSGLEV, 'i'},
- {"LPX_K_SCALE", LPX_K_SCALE, 'i'},
- {"LPX_K_DUAL", LPX_K_DUAL, 'i'},
- {"LPX_K_PRICE", LPX_K_PRICE, 'i'},
- {"LPX_K_RELAX", LPX_K_RELAX, 'f'},
- {"LPX_K_TOLBND", LPX_K_TOLBND, 'f'},
- {"LPX_K_TOLDJ", LPX_K_TOLDJ, 'f'},
- {"LPX_K_TOLPIV", LPX_K_TOLPIV, 'f'},
- {"LPX_K_ROUND", LPX_K_ROUND, 'i'},
- {"LPX_K_OBJLL", LPX_K_OBJLL, 'f'},
- {"LPX_K_OBJUL", LPX_K_OBJUL, 'f'},
- {"LPX_K_ITLIM", LPX_K_ITLIM, 'i'},
- {"LPX_K_ITCNT", LPX_K_ITCNT, 'i'},
- {"LPX_K_TMLIM", LPX_K_TMLIM, 'f'},
- {"LPX_K_OUTFRQ", LPX_K_OUTFRQ, 'i'},
- {"LPX_K_OUTDLY", LPX_K_OUTDLY, 'f'},
- {"LPX_K_BRANCH", LPX_K_BRANCH, 'i'},
- {"LPX_K_BTRACK", LPX_K_BTRACK, 'i'},
- {"LPX_K_TOLINT", LPX_K_TOLINT, 'f'},
- {"LPX_K_TOLOBJ", LPX_K_TOLOBJ, 'f'},
- {"LPX_K_MPSINFO", LPX_K_MPSINFO, 'i'},
- {"LPX_K_MPSOBJ", LPX_K_MPSOBJ, 'i'},
- {"LPX_K_MPSORIG", LPX_K_MPSORIG, 'i'},
- {"LPX_K_MPSWIDE", LPX_K_MPSWIDE, 'i'},
- {"LPX_K_MPSFREE", LPX_K_MPSFREE, 'i'},
- {"LPX_K_MPSSKIP", LPX_K_MPSSKIP, 'i'},
- {"LPX_K_LPTORIG", LPX_K_LPTORIG, 'i'},
- {"LPX_K_PRESOL", LPX_K_PRESOL, 'i'},
-}; /* 28 paramaters */
-
-
#if PY_MAJOR_VERSION >= 3
-static int get_param_idx(const char *str, int *idx, char *type)
+#define PYINT_CHECK(value) PyLong_Check(value)
+#define PYINT_AS_LONG(value) PyLong_AS_LONG(value)
+#define PYSTRING_FROMSTRING(str) PyUnicode_FromString(str)
+#define PYSTRING_CHECK(a) PyUnicode_Check(a)
+#define PYSTRING_COMPARE(a,b) PyUnicode_CompareWithASCIIString(a, b)
#else
-static int get_param_idx(char *str, int *idx, char *type)
+#define PYINT_CHECK(value) PyInt_Check(value)
+#define PYINT_AS_LONG(value) PyInt_AS_LONG(value)
+#define PYSTRING_FROMSTRING(str) PyString_FromString(str)
+#define PYSTRING_CHECK(a) PyString_Check(a)
+#define PYSTRING_COMPARE(a,b) strcmp(PyString_AsString(a), b)
#endif
-{
- int i;
-
- for (i=0; i<28; i++) {
- if (!strcmp(GLPK_PARAM_LIST[i].name, str)) {
- *idx = GLPK_PARAM_LIST[i].idx;
- *type = GLPK_PARAM_LIST[i].type;
- return 1;
- }
- }
- return 0;
-}
static char doc_simplex[] =
@@ -97,13 +58,13 @@ static char doc_simplex[] =
"(status, x, z, y) = lp(c, G, h, A, b)\n"
"(status, x, z) = lp(c, G, h)\n\n"
"PURPOSE\n"
- "(status, x, z, y) = lp(c, G, h, A, b) solves the pair\n"
- "of primal and dual LPs\n\n"
+ "(status, x, z, y) = lp(c, G, h, A, b) solves the pair of primal and\n"
+ "dual LPs\n\n"
" minimize c'*x maximize -h'*z + b'*y\n"
" subject to G*x <= h subject to G'*z + A'*y + c = 0\n"
" A*x = b z >= 0.\n\n"
- "(status, x, z) = lp(c, G, h) solves the pair of primal\n"
- "and dual LPs\n\n"
+ "(status, x, z) = lp(c, G, h) solves the pair of primal and dual LPs"
+ "\n\n"
" minimize c'*x maximize -h'*z \n"
" subject to G*x <= h subject to G'*z + c = 0\n"
" z >= 0.\n\n"
@@ -112,7 +73,7 @@ static char doc_simplex[] =
"G mxn dense or sparse 'd' matrix with m>=1\n\n"
"h mx1 dense 'd' matrix\n\n"
"A pxn dense or sparse 'd' matrix with p>=0\n\n"
- "b px1 dnese 'd' matrix\n\n"
+ "b px1 dense 'd' matrix\n\n"
"status 'optimal', 'primal infeasible', 'dual infeasible' \n"
" or 'unknown'\n\n"
"x if status is 'optimal', a primal optimal solution;\n"
@@ -121,21 +82,15 @@ static char doc_simplex[] =
" None otherwise";
-static PyObject *simplex(PyObject *self, PyObject *args,
- PyObject *kwrds)
+static PyObject *simplex(PyObject *self, PyObject *args, PyObject *kwrds)
{
matrix *c, *h, *b=NULL, *x=NULL, *z=NULL, *y=NULL;
PyObject *G, *A=NULL, *t=NULL, *param, *key, *value;
- LPX *lp;
- int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id;
+ glp_prob *lp;
+ glp_smcp smcp;
+ int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL;
int_t pos=0;
double *a=NULL, val;
- char param_type, err_str[100];
-#if PY_MAJOR_VERSION >= 3
- const char *keystr;
-#else
- char *keystr;
-#endif
char *kwlist[] = {"c", "G", "h", "A", "b", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OO", kwlist, &c,
@@ -182,18 +137,18 @@ static PyObject *simplex(PyObject *self, PyObject *args,
return NULL;
}
- lp = lpx_create_prob();
- lpx_add_rows(lp, m+p);
- lpx_add_cols(lp, n);
+ lp = glp_create_prob();
+ glp_add_rows(lp, m+p);
+ glp_add_cols(lp, n);
for (i=0; i<n; i++){
- lpx_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
- lpx_set_col_bnds(lp, i+1, LPX_FR, 0.0, 0.0);
+ glp_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
+ glp_set_col_bnds(lp, i+1, GLP_FR, 0.0, 0.0);
}
for (i=0; i<m; i++)
- lpx_set_row_bnds(lp, i+1, LPX_UP, 0.0, MAT_BUFD(h)[i]);
+ glp_set_row_bnds(lp, i+1, GLP_UP, 0.0, MAT_BUFD(h)[i]);
for (i=0; i<p; i++)
- lpx_set_row_bnds(lp, i+m+1, LPX_FX, MAT_BUFD(b)[i],
+ glp_set_row_bnds(lp, i+m+1, GLP_FX, MAT_BUFD(b)[i],
MAT_BUFD(b)[i]);
nnzmax = (SpMatrix_Check(G) ? SP_NNZ(G) : m*n ) +
@@ -202,7 +157,8 @@ static PyObject *simplex(PyObject *self, PyObject *args,
rn = (int *) calloc(nnzmax+1, sizeof(int));
cn = (int *) calloc(nnzmax+1, sizeof(int));
if (!a || !rn || !cn){
- free(a); free(rn); free(cn); lpx_delete_prob(lp);
+ free(a); free(rn); free(cn);
+ glp_delete_prob(lp);
return PyErr_NoMemory();
}
@@ -241,153 +197,229 @@ static PyObject *simplex(PyObject *self, PyObject *args,
nnz++;
}
- lpx_load_matrix(lp, nnz, rn, cn, a);
+ glp_load_matrix(lp, nnz, rn, cn, a);
free(rn); free(cn); free(a);
if (!(t = PyTuple_New(A ? 4 : 3))){
- lpx_delete_prob(lp);
+ glp_delete_prob(lp);
return PyErr_NoMemory();
}
if (!(param = PyObject_GetAttrString(glpk_module, "options"))
|| !PyDict_Check(param)){
- lpx_delete_prob(lp);
+ glp_delete_prob(lp);
PyErr_SetString(PyExc_AttributeError,
"missing glpk.options dictionary");
return NULL;
}
+ glp_init_smcp(&smcp);
+
while (PyDict_Next(param, &pos, &key, &value))
-#if PY_MAJOR_VERSION >= 3
- if ((PyUnicode_Check(key)) &&
- get_param_idx(_PyUnicode_AsString(key), ¶m_id,
- ¶m_type)){
- keystr = _PyUnicode_AsString(key);
-#else
- if ((keystr = PyString_AsString(key)) && get_param_idx(keystr,
- ¶m_id, ¶m_type)){
-#endif
- if (param_type == 'i'){
-#if PY_MAJOR_VERSION >= 3
- if (!PyLong_Check(value)){
-#else
- if (!PyInt_Check(value)){
-#endif
- sprintf(err_str, "invalid value for integer "
- "GLPK parameter: %-.20s", keystr);
- PyErr_SetString(PyExc_ValueError, err_str);
- lpx_delete_prob(lp);
- Py_DECREF(param);
- return NULL;
- }
- if (!strcmp("LPX_K_PRESOL", keystr) &&
-#if PY_MAJOR_VERSION >= 3
- PyLong_AS_LONG(value) != 1){
-#else
- PyInt_AS_LONG(value) != 1){
-#endif
- PyErr_Warn(PyExc_UserWarning, "ignoring value of "
- "GLPK parameter 'LPX_K_PRESOL'");
+ if (PYSTRING_CHECK(key)){
+ if (!PYSTRING_COMPARE(key, "msg_lev"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_MSG_OFF"))
+ smcp.msg_lev = GLP_MSG_OFF;
+ else if (!PYSTRING_COMPARE(value, "GLP_MSG_ERR"))
+ smcp.msg_lev = GLP_MSG_ERR;
+ else if (!PYSTRING_COMPARE(value, "GLP_MSG_ON"))
+ smcp.msg_lev = GLP_MSG_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_MSG_ALL"))
+ smcp.msg_lev = GLP_MSG_ALL;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['msg_lev'] with default value",
+ 1);
}
- else lpx_set_int_parm(lp, param_id,
-#if PY_MAJOR_VERSION >= 3
- PyLong_AS_LONG(value));
-#else
- PyInt_AS_LONG(value));
-#endif
- }
- else {
-#if PY_MAJOR_VERSION >= 3
- if (!PyLong_Check(value) && !PyFloat_Check(value)){
-#else
- if (!PyInt_Check(value) && !PyFloat_Check(value)){
-#endif
- sprintf(err_str, "invalid value for floating point "
- "GLPK parameter: %-.20s", keystr);
- PyErr_SetString(PyExc_ValueError, err_str);
- lpx_delete_prob(lp);
- Py_DECREF(param);
- return NULL;
- }
- lpx_set_real_parm(lp, param_id,
- PyFloat_AsDouble(value));
- }
- }
- lpx_set_int_parm(lp, LPX_K_PRESOL, 1);
- Py_DECREF(param);
-
- switch (lpx_simplex(lp)){
-
- case LPX_E_OK:
-
- x = (matrix *) Matrix_New(n,1,DOUBLE);
- z = (matrix *) Matrix_New(m,1,DOUBLE);
- if (A) y = (matrix *) Matrix_New(p,1,DOUBLE);
- if (!x || !z || (A && !y)){
- Py_XDECREF(x);
- Py_XDECREF(z);
- Py_XDECREF(y);
- Py_XDECREF(t);
- lpx_delete_prob(lp);
- return PyErr_NoMemory();
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['msg_lev'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "meth"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_PRIMAL"))
+ smcp.meth = GLP_PRIMAL;
+ else if (!PYSTRING_COMPARE(value, "GLP_DUAL"))
+ smcp.meth = GLP_DUAL;
+ else if (!PYSTRING_COMPARE(value, "GLP_DUALP"))
+ smcp.meth = GLP_DUALP;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['meth'] with default value", 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['meth'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "pricing"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_PT_STD"))
+ smcp.pricing = GLP_PT_STD;
+ else if (!PYSTRING_COMPARE(value, "GLP_PT_PSE"))
+ smcp.pricing = GLP_PT_PSE;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['pricing'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['pricing'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "r_test"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_RT_STD"))
+ smcp.r_test = GLP_RT_STD;
+ else if (!PYSTRING_COMPARE(value, "GLP_RT_HAR"))
+ smcp.r_test = GLP_RT_HAR;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['r_test'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['r_test'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "tol_bnd"))
+ if (PyFloat_Check(value))
+ smcp.tol_bnd = PyFloat_AsDouble(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['tol_bnd'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "tol_dj"))
+ if (PyFloat_Check(value))
+ smcp.tol_dj = PyFloat_AsDouble(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['tol_dj'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "tol_piv"))
+ if (PyFloat_Check(value))
+ smcp.tol_piv = PyFloat_AsDouble(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['tol_piv'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "obj_ll"))
+ if (PyFloat_Check(value))
+ smcp.obj_ll = PyFloat_AsDouble(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['obj_ll'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "obj_ul"))
+ if (PyFloat_Check(value))
+ smcp.obj_ul = PyFloat_AsDouble(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['obj_ul'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "it_lim"))
+ if (PYINT_CHECK(value))
+ smcp.it_lim = PYINT_AS_LONG(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['it_lim'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "tm_lim"))
+ if (PYINT_CHECK(value))
+ smcp.tm_lim = PYINT_AS_LONG(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['tm_lim'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "out_frq"))
+ if (PYINT_CHECK(value))
+ smcp.out_frq = PYINT_AS_LONG(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['out_frq'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "out_dly"))
+ if (PYINT_CHECK(value))
+ smcp.out_dly = PYINT_AS_LONG(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['out_dly'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "presolve")){
+ if (PYSTRING_CHECK(value)) {
+ if (!PYSTRING_COMPARE(value, "GLP_ON"))
+ smcp.presolve = GLP_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_OFF"))
+ smcp.presolve = GLP_OFF;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['presolve'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['presolve'] with default value", 1);
}
+ }
- PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("optimal"));
-#else
- PyString_FromString("optimal"));
-#endif
-
- for (i=0; i<n; i++)
- MAT_BUFD(x)[i] = lpx_get_col_prim(lp, i+1);
- PyTuple_SET_ITEM(t, 1, (PyObject *) x);
-
- for (i=0; i<m; i++)
- MAT_BUFD(z)[i] = -lpx_get_row_dual(lp, i+1);
- PyTuple_SET_ITEM(t, 2, (PyObject *) z);
+ Py_DECREF(param);
- if (A){
- for (i=0; i<p; i++)
- MAT_BUFD(y)[i] = -lpx_get_row_dual(lp, m+i+1);
- PyTuple_SET_ITEM(t, 3, (PyObject *) y);
+ switch (glp_simplex(lp, &smcp)){
+
+ case 0:
+ switch(glp_get_status(lp)){
+ case GLP_OPT:
+ x = (matrix *) Matrix_New(n,1,DOUBLE);
+ z = (matrix *) Matrix_New(m,1,DOUBLE);
+ if (A) y = (matrix *) Matrix_New(p,1,DOUBLE);
+ if (!x || !z || (A && !y)){
+ Py_XDECREF(x);
+ Py_XDECREF(z);
+ Py_XDECREF(y);
+ Py_XDECREF(t);
+ glp_delete_prob(lp);
+ return PyErr_NoMemory();
+ }
+
+ PyTuple_SET_ITEM(t, 0, (PyObject *)
+ PYSTRING_FROMSTRING("optimal"));
+
+ for (i=0; i<n; i++)
+ MAT_BUFD(x)[i] = glp_get_col_prim(lp, i+1);
+ PyTuple_SET_ITEM(t, 1, (PyObject *) x);
+
+ for (i=0; i<m; i++)
+ MAT_BUFD(z)[i] = -glp_get_row_dual(lp, i+1);
+ PyTuple_SET_ITEM(t, 2, (PyObject *) z);
+
+ if (A){
+ for (i=0; i<p; i++)
+ MAT_BUFD(y)[i] = -glp_get_row_dual(lp, m+i+1);
+ PyTuple_SET_ITEM(t, 3, (PyObject *) y);
+ }
+ glp_delete_prob(lp);
+ return (PyObject *) t;
+ break;
+
+ case GLP_NOFEAS:
+ PyTuple_SET_ITEM(t, 0, (PyObject *)
+ PYSTRING_FROMSTRING("primal infeasible"));
+ break;
+
+ case GLP_UNBND:
+ PyTuple_SET_ITEM(t, 0, (PyObject *)
+ PYSTRING_FROMSTRING("dual infeasible"));
+ break;
+
+ default:
+ PyTuple_SET_ITEM(t, 0, (PyObject *)
+ PYSTRING_FROMSTRING("unknown"));
}
+ break;
- lpx_delete_prob(lp);
- return (PyObject *) t;
-
- case LPX_E_NOPFS:
-
+ case GLP_ENOPFS:
PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("primal infeasible"));
-#else
- PyString_FromString("primal infeasible"));
-#endif
+ PYSTRING_FROMSTRING("primal infeasible"));
break;
- case LPX_E_NODFS:
-
+ case GLP_ENODFS:
PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("dual infeasible"));
-#else
- PyString_FromString("dual infeasible"));
-#endif
+ PYSTRING_FROMSTRING("dual infeasible"));
break;
default:
-
PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("unknown"));
-#else
- PyString_FromString("unknown"));
-#endif
+ PYSTRING_FROMSTRING("unknown"));
}
- lpx_delete_prob(lp);
-
+ glp_delete_prob(lp);
PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
PyTuple_SET_ITEM(t, 2, Py_BuildValue(""));
if (A) PyTuple_SET_ITEM(t, 3, Py_BuildValue(""));
@@ -405,21 +437,25 @@ static char doc_integer[] =
" minimize c'*x\n"
" subject to G*x <= h\n"
" A*x = b\n"
- " x[I] are all integer\n"
- " x[B] are all binary\n\n"
+ " x[k] is integer for k in I\n"
+ " x[k] is binary for k in B\n\n"
"ARGUMENTS\n"
"c nx1 dense 'd' matrix with n>=1\n\n"
"G mxn dense or sparse 'd' matrix with m>=1\n\n"
"h mx1 dense 'd' matrix\n\n"
"A pxn dense or sparse 'd' matrix with p>=0\n\n"
"b px1 dense 'd' matrix\n\n"
- "I set with indices of integer variables\n\n"
- "B set with indices of binary variables\n\n"
- "status 'optimal', 'primal infeasible', 'dual infeasible', \n"
- " 'invalid MIP formulation', 'maxiters exceeded', \n"
- " 'time limit exceeded', 'unknown'\n\n"
- "x an optimal solution if status is 'optimal';\n"
- " None otherwise";
+ "I set of indices of integer variables\n\n"
+ "B set of indices of binary variables\n\n"
+ "status if status is 'optimal', 'feasible', or 'undefined',\n"
+ " a value of x is returned and the status string \n"
+ " gives the status of x. Other possible values of "
+ " status are: 'invalid formulation', \n"
+ " 'infeasible problem', 'LP relaxation is primal \n"
+ " infeasible', 'LP relaxation is dual infeasible', \n"
+ " 'unknown'.\n\n"
+ "x a (sub-)optimal solution if status is 'optimal', \n"
+ " 'feasible', or 'undefined'. None otherwise";
static PyObject *integer(PyObject *self, PyObject *args,
PyObject *kwrds)
@@ -427,16 +463,11 @@ static PyObject *integer(PyObject *self, PyObject *args,
matrix *c, *h, *b=NULL, *x=NULL;
PyObject *G, *A=NULL, *IntSet=NULL, *BinSet = NULL;
PyObject *t=NULL, *param, *key, *value;
- LPX *lp;
- int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id;
+ glp_prob *lp;
+ glp_iocp iocp;
+ int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, info, status;
int_t pos=0;
double *a=NULL, val;
- char param_type, err_str[100];
-#if PY_MAJOR_VERSION >= 3
- const char *keystr;
-#else
- char *keystr;
-#endif
char *kwlist[] = {"c", "G", "h", "A", "b", "I", "B", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OOOO", kwlist, &c,
@@ -484,23 +515,23 @@ static PyObject *integer(PyObject *self, PyObject *args,
}
if ((IntSet) && (!PyAnySet_Check(IntSet)))
- PY_ERR_TYPE("invalid integer index set");
+ PY_ERR_TYPE("invalid integer index set");
if ((BinSet) && (!PyAnySet_Check(BinSet)))
- PY_ERR_TYPE("invalid binary index set");
+ PY_ERR_TYPE("invalid binary index set");
- lp = lpx_create_prob();
- lpx_add_rows(lp, m+p);
- lpx_add_cols(lp, n);
+ lp = glp_create_prob();
+ glp_add_rows(lp, m+p);
+ glp_add_cols(lp, n);
for (i=0; i<n; i++){
- lpx_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
- lpx_set_col_bnds(lp, i+1, LPX_FR, 0.0, 0.0);
+ glp_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
+ glp_set_col_bnds(lp, i+1, GLP_FR, 0.0, 0.0);
}
for (i=0; i<m; i++)
- lpx_set_row_bnds(lp, i+1, LPX_UP, 0.0, MAT_BUFD(h)[i]);
+ glp_set_row_bnds(lp, i+1, GLP_UP, 0.0, MAT_BUFD(h)[i]);
for (i=0; i<p; i++)
- lpx_set_row_bnds(lp, i+m+1, LPX_FX, MAT_BUFD(b)[i],
+ glp_set_row_bnds(lp, i+m+1, GLP_FX, MAT_BUFD(b)[i],
MAT_BUFD(b)[i]);
nnzmax = (SpMatrix_Check(G) ? SP_NNZ(G) : m*n ) +
@@ -509,7 +540,7 @@ static PyObject *integer(PyObject *self, PyObject *args,
rn = (int *) calloc(nnzmax+1, sizeof(int));
cn = (int *) calloc(nnzmax+1, sizeof(int));
if (!a || !rn || !cn){
- free(a); free(rn); free(cn); lpx_delete_prob(lp);
+ free(a); free(rn); free(cn); glp_delete_prob(lp);
return PyErr_NoMemory();
}
@@ -548,232 +579,399 @@ static PyObject *integer(PyObject *self, PyObject *args,
nnz++;
}
- lpx_load_matrix(lp, nnz, rn, cn, a);
+ glp_load_matrix(lp, nnz, rn, cn, a);
free(rn); free(cn); free(a);
if (!(t = PyTuple_New(2))) {
- lpx_delete_prob(lp);
+ glp_delete_prob(lp);
return PyErr_NoMemory();
}
if (!(param = PyObject_GetAttrString(glpk_module, "options"))
|| !PyDict_Check(param)){
- lpx_delete_prob(lp);
+ glp_delete_prob(lp);
PyErr_SetString(PyExc_AttributeError,
"missing glpk.options dictionary");
return NULL;
}
+ glp_init_iocp(&iocp);
+
while (PyDict_Next(param, &pos, &key, &value))
-#if PY_MAJOR_VERSION >= 3
- if ((PyUnicode_Check(key)) && (keystr = PyUnicode_AS_DATA(key))
- && get_param_idx(keystr, ¶m_id, ¶m_type)){
-#else
- if ((keystr = PyString_AsString(key)) && get_param_idx(keystr,
- ¶m_id, ¶m_type)){
-#endif
- if (param_type == 'i'){
-#if PY_MAJOR_VERSION >= 3
- if (!PyLong_Check(value)){
-#else
- if (!PyInt_Check(value)){
-#endif
- sprintf(err_str, "invalid value for integer "
- "GLPK parameter: %-.20s", keystr);
- PyErr_SetString(PyExc_ValueError, err_str);
- lpx_delete_prob(lp);
- Py_DECREF(param);
- return NULL;
- }
- if (!strcmp("LPX_K_PRESOL", keystr) &&
-#if PY_MAJOR_VERSION >= 3
- PyLong_AS_LONG(value) != 1){
-#else
- PyInt_AS_LONG(value) != 1){
-#endif
- PyErr_Warn(PyExc_UserWarning, "ignoring value of "
- "GLPK parameter 'LPX_K_PRESOL'");
+ if (PYSTRING_CHECK(key)){
+ if (!PYSTRING_COMPARE(key, "msg_lev"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_MSG_OFF"))
+ iocp.msg_lev = GLP_MSG_OFF;
+ else if (!PYSTRING_COMPARE(value, "GLP_MSG_ERR"))
+ iocp.msg_lev = GLP_MSG_ERR;
+ else if (!PYSTRING_COMPARE(value, "GLP_MSG_ON"))
+ iocp.msg_lev = GLP_MSG_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_MSG_ALL"))
+ iocp.msg_lev = GLP_MSG_ALL;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['msg_lev'] with default value",
+ 1);
}
else
-#if PY_MAJOR_VERSION >= 3
- lpx_set_int_parm(lp, param_id, PyLong_AS_LONG(value));
-#else
- lpx_set_int_parm(lp, param_id, PyInt_AS_LONG(value));
-#endif
- }
- else {
-#if PY_MAJOR_VERSION >= 3
- if (!PyLong_Check(value) && !PyFloat_Check(value)){
-#else
- if (!PyInt_Check(value) && !PyFloat_Check(value)){
+ PyErr_WarnEx(NULL, "replacing glpk.options['msg_lev'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "br_tech"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_BR_FFV"))
+ iocp.br_tech= GLP_BR_FFV;
+ else if (!PYSTRING_COMPARE(value, "GLP_BR_LFV"))
+ iocp.br_tech = GLP_BR_LFV;
+ else if (!PYSTRING_COMPARE(value, "GLP_BR_MFV"))
+ iocp.br_tech = GLP_BR_MFV;
+ else if (!PYSTRING_COMPARE(value, "GLP_BR_DTH"))
+ iocp.br_tech = GLP_BR_DTH;
+ else if (!PYSTRING_COMPARE(value, "GLP_BR_PCH"))
+ iocp.br_tech = GLP_BR_PCH;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['br_tech'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['br_tech'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "bt_tech"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_BT_DFS"))
+ iocp.bt_tech = GLP_BT_DFS;
+ else if (!PYSTRING_COMPARE(value, "GLP_BT_BFS"))
+ iocp.bt_tech = GLP_BT_BFS;
+ else if (!PYSTRING_COMPARE(value, "GLP_BT_BLB"))
+ iocp.bt_tech = GLP_BT_BLB;
+ else if (!PYSTRING_COMPARE(value, "GLP_BT_BPH"))
+ iocp.bt_tech = GLP_BT_BPH;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['bt_tech'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['bt_tech'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "pp_tech"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_PP_NONE"))
+ iocp.pp_tech = GLP_PP_NONE;
+ else if (!PYSTRING_COMPARE(value, "GLP_PP_ROOT"))
+ iocp.pp_tech = GLP_PP_ROOT;
+ else if (!PYSTRING_COMPARE(value, "GLP_PP_ALL"))
+ iocp.pp_tech = GLP_PP_ALL;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['pp_tech'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['pp_tech'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "fp_heur"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_ON"))
+ iocp.fp_heur = GLP_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_OFF"))
+ iocp.fp_heur = GLP_OFF;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['fp_heur'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['fp_heur'] "
+ "with default value", 1);
+#if 0
+ else if (!PYSTRING_COMPARE(key, "ps_heur"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_ON"))
+ iocp.ps_heur = GLP_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_OFF"))
+ iocp.ps_heur = GLP_OFF;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['ps_heur'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['ps_heur'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "ps_tm_lim"))
+ if (PYINT_CHECK(value))
+ iocp.ps_tm_lim = PYINT_AS_LONG(value);
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['ps_tm_lim'] with default value", 1);
#endif
- sprintf(err_str, "invalid value for floating point "
- "GLPK parameter: %-.20s", keystr);
- PyErr_SetString(PyExc_ValueError, err_str);
- lpx_delete_prob(lp);
- Py_DECREF(param);
- return NULL;
- }
- lpx_set_real_parm(lp, param_id,
- PyFloat_AsDouble(value));
- }
- }
- lpx_set_int_parm(lp, LPX_K_PRESOL, 1);
+ else if (!PYSTRING_COMPARE(key, "gmi_cuts"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_ON"))
+ iocp.gmi_cuts = GLP_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_OFF"))
+ iocp.gmi_cuts = GLP_OFF;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['gmi_cuts'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['gmi_cuts'] with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "mir_cuts"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_ON"))
+ iocp.mir_cuts = GLP_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_OFF"))
+ iocp.mir_cuts = GLP_OFF;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['mir_cuts'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['mir_cuts'] with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "cov_cuts"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_ON"))
+ iocp.cov_cuts = GLP_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_OFF"))
+ iocp.cov_cuts = GLP_OFF;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['cov_cuts'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['cov_cuts'] with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "clq_cuts"))
+ if (PYSTRING_CHECK(value)){
+ if (!PYSTRING_COMPARE(value, "GLP_ON"))
+ iocp.clq_cuts = GLP_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_OFF"))
+ iocp.clq_cuts = GLP_OFF;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['clq_cuts'] with default value",
+ 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['clq_cuts'] with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "tol_int"))
+ if (PyFloat_Check(value))
+ iocp.tol_int = PyFloat_AsDouble(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['tol_int'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "tol_obj"))
+ if (PyFloat_Check(value))
+ iocp.tol_obj = PyFloat_AsDouble(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['tol_obj'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "mip_gap"))
+ if (PyFloat_Check(value))
+ iocp.mip_gap = PyFloat_AsDouble(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['mip_gap'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "tm_lim"))
+ if (PYINT_CHECK(value))
+ iocp.tm_lim = PYINT_AS_LONG(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['tm_lim'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "out_frq"))
+ if (PYINT_CHECK(value))
+ iocp.out_frq = PYINT_AS_LONG(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['out_frq'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "out_dly"))
+ if (PYINT_CHECK(value))
+ iocp.out_dly = PYINT_AS_LONG(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['out_dly'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "glp_tree"))
+ PyErr_WarnEx(NULL, "replacing glpk.options['glp_tree'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "cb_info"))
+ PyErr_WarnEx(NULL, "replacing glpk.options['cb_info'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "cb_size"))
+ if (PYINT_CHECK(value))
+ iocp.cb_size = PYINT_AS_LONG(value);
+ else
+ PyErr_WarnEx(NULL, "replacing glpk.options['cb_size'] "
+ "with default value", 1);
+ else if (!PYSTRING_COMPARE(key, "presolve"))
+ if (PYSTRING_CHECK(value)) {
+ if (!PYSTRING_COMPARE(value, "GLP_ON"))
+ iocp.presolve = GLP_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_OFF")){
+ iocp.presolve = GLP_ON;
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['presolve'] with GLP_ON", 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['presolve'] with GLP_ON", 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['presolve'] with GLP_ON", 1);
+ else if (!PYSTRING_COMPARE(key, "binarize")) {
+ if (PYSTRING_CHECK(value)) {
+ if (!PYSTRING_COMPARE(value, "GLP_ON"))
+ iocp.binarize = GLP_ON;
+ else if (!PYSTRING_COMPARE(value, "GLP_OFF"))
+ iocp.binarize = GLP_OFF;
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['binarize'] with default "
+ "value", 1);
+ }
+ else
+ PyErr_WarnEx(NULL, "replacing "
+ "glpk.options['binarize'] with default value", 1);
+ }
+ }
+
Py_DECREF(param);
+ iocp.presolve = GLP_ON;
if (IntSet) {
- PyObject *iter = PySequence_Fast(IntSet, "Critical error: not sequence");
-
- for (i=0; i<PySet_GET_SIZE(IntSet); i++) {
-
- PyObject *tmp = PySequence_Fast_GET_ITEM(iter, i);
-#if PY_MAJOR_VERSION >= 3
- if (!PyLong_Check(tmp)) {
-#else
- if (!PyInt_Check(tmp)) {
-#endif
- lpx_delete_prob(lp);
- Py_DECREF(iter);
- PY_ERR_TYPE("non-integer element in I");
- }
-#if PY_MAJOR_VERSION >= 3
- int k = PyLong_AS_LONG(tmp);
-#else
- int k = PyInt_AS_LONG(tmp);
-#endif
- if ((k < 0) || (k >= n)) {
- lpx_delete_prob(lp);
- Py_DECREF(iter);
- PY_ERR(PyExc_IndexError, "index element out of range in I");
- }
- glp_set_col_kind(lp, k+1, GLP_IV);
- }
-
- Py_DECREF(iter);
+ PyObject *iter = PySequence_Fast(IntSet,
+ "Critical error: not sequence");
+ for (i=0; i<PySet_GET_SIZE(IntSet); i++) {
+ PyObject *tmp = PySequence_Fast_GET_ITEM(iter, i);
+ if (!PYINT_CHECK(tmp)) {
+ glp_delete_prob(lp);
+ Py_DECREF(iter);
+ PY_ERR_TYPE("non-integer element in I");
+ }
+ int k = PYINT_AS_LONG(tmp);
+ if ((k < 0) || (k >= n)) {
+ glp_delete_prob(lp);
+ Py_DECREF(iter);
+ PY_ERR(PyExc_IndexError, "index element out of range "
+ "in I");
+ }
+ glp_set_col_kind(lp, k+1, GLP_IV);
+ }
+ Py_DECREF(iter);
}
- if (BinSet) {
- PyObject *iter = PySequence_Fast(BinSet, "Critical error: not sequence");
-
- for (i=0; i<PySet_GET_SIZE(BinSet); i++) {
-
- PyObject *tmp = PySequence_Fast_GET_ITEM(iter, i);
-#if PY_MAJOR_VERSION >= 3
- if (!PyLong_Check(tmp)) {
-#else
- if (!PyInt_Check(tmp)) {
-#endif
- lpx_delete_prob(lp);
- Py_DECREF(iter);
- PY_ERR_TYPE("non-binary element in I");
- }
-#if PY_MAJOR_VERSION >= 3
- int k = PyLong_AS_LONG(tmp);
-#else
- int k = PyInt_AS_LONG(tmp);
-#endif
- if ((k < 0) || (k >= n)) {
- lpx_delete_prob(lp);
- Py_DECREF(iter);
- PY_ERR(PyExc_IndexError, "index element out of range in B");
- }
- glp_set_col_kind(lp, k+1, GLP_BV);
- }
-
- Py_DECREF(iter);
-
+ if (BinSet){
+ PyObject *iter = PySequence_Fast(BinSet,
+ "Critical error: not sequence");
+ for (i=0; i<PySet_GET_SIZE(BinSet); i++) {
+ PyObject *tmp = PySequence_Fast_GET_ITEM(iter, i);
+ if (!PYINT_CHECK(tmp)) {
+ glp_delete_prob(lp);
+ Py_DECREF(iter);
+ PY_ERR_TYPE("non-binary element in I");
+ }
+ int k = PYINT_AS_LONG(tmp);
+ if ((k < 0) || (k >= n)) {
+ glp_delete_prob(lp);
+ Py_DECREF(iter);
+ PY_ERR(PyExc_IndexError,
+ "index element out of range in B");
+ }
+ glp_set_col_kind(lp, k+1, GLP_BV);
+ }
+ Py_DECREF(iter);
}
-
-
- switch (lpx_intopt(lp)){
-
- case LPX_E_OK:
-
- x = (matrix *) Matrix_New(n,1,DOUBLE);
- if (!x) {
- Py_XDECREF(t);
- lpx_delete_prob(lp);
- return PyErr_NoMemory();
+ info = glp_intopt(lp, &iocp);
+ status = glp_mip_status(lp);
+
+ switch (info){
+
+ case 0:
+ case GLP_EMIPGAP:
+ case GLP_ETMLIM:
+ switch(status){
+ case GLP_OPT: /* x is optimal */
+ case GLP_FEAS: /* x is integer feasible */
+ case GLP_UNDEF: /* x is undefined */
+ x = (matrix *) Matrix_New(n,1,DOUBLE);
+ if (!x) {
+ Py_XDECREF(t);
+ glp_delete_prob(lp);
+ return PyErr_NoMemory();
+ }
+ if (status == GLP_OPT)
+ PyTuple_SET_ITEM(t, 0,
+ (PyObject *) PYSTRING_FROMSTRING("optimal"));
+ else if (status == GLP_FEAS)
+ PyTuple_SET_ITEM(t, 0,
+ (PyObject *)PYSTRING_FROMSTRING("feasible"));
+ else
+ PyTuple_SET_ITEM(t, 0,
+ (PyObject *)PYSTRING_FROMSTRING("undefined"));
+ for (i=0; i<n; i++)
+ MAT_BUFD(x)[i] = glp_mip_col_val(lp, i+1);
+ PyTuple_SET_ITEM(t, 1, (PyObject *) x);
+ glp_delete_prob(lp);
+ return (PyObject *) t;
+ break;
+
+ case GLP_NOFEAS:
+ PyTuple_SET_ITEM(t, 0, (PyObject *)
+ PYSTRING_FROMSTRING("infeasible problem"));
+ PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
+ break;
+
+ default:
+ PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
+ PyTuple_SET_ITEM(t, 0, (PyObject *)
+ PYSTRING_FROMSTRING("unknown"));
}
- PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("optimal"));
-#else
- PyString_FromString("optimal"));
-#endif
-
- for (i=0; i<n; i++)
- MAT_BUFD(x)[i] = lpx_mip_col_val(lp, i+1);
- PyTuple_SET_ITEM(t, 1, (PyObject *) x);
-
- lpx_delete_prob(lp);
- return (PyObject *) t;
+ break;
- case LPX_E_FAULT:
- PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("invalid MIP formulation"));
-#else
- PyString_FromString("invalid MIP formulation"));
-#endif
+#if 0
+ case GLP_EBADB:
- case LPX_E_NOPFS:
- PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("primal infeasible"));
-#else
- PyString_FromString("primal infeasible"));
+ case GLP_ECOND:
#endif
- case LPX_E_NODFS:
-
+ case GLP_EBOUND:
PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("dual infeasible"));
-#else
- PyString_FromString("dual infeasible"));
-#endif
-
- case LPX_E_ITLIM:
+ PYSTRING_FROMSTRING("invalid MIP formulation"));
+ break;
+ case GLP_ENOPFS:
PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("maxiters exceeded"));
-#else
- PyString_FromString("maxiters exceeded"));
-#endif
-
- case LPX_E_TMLIM:
+ PYSTRING_FROMSTRING("LP relaxation is primal infeasible"));
+ break;
+ case GLP_ENODFS:
PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("time limit exceeded"));
-#else
- PyString_FromString("time limit exceeded"));
-#endif
-
- case LPX_E_SING:
+ PYSTRING_FROMSTRING("LP relaxation is dual infeasible"));
+ break;
+ case GLP_EFAIL:
PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("singular or ill-conditioned basis"));
-#else
- PyString_FromString("singular or ill-conditioned basis"));
-#endif
+ PYSTRING_FROMSTRING("solver failure"));
+ break;
+ case GLP_EROOT: /* only occurs if presolver is off */
+ case GLP_ESTOP: /* only occurs when advanced interface is used */
default:
-
PyTuple_SET_ITEM(t, 0, (PyObject *)
-#if PY_MAJOR_VERSION >= 3
- PyUnicode_FromString("unknown"));
-#else
- PyString_FromString("unknown"));
-#endif
+ PYSTRING_FROMSTRING("unknown"));
}
- lpx_delete_prob(lp);
-
+ glp_delete_prob(lp);
PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
return (PyObject *) t;
}
diff --git a/src/C/gsl.c b/src/C/gsl.c
index 8286bb8..0033807 100644
--- a/src/C/gsl.c
+++ b/src/C/gsl.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/C/lapack.c b/src/C/lapack.c
index dc185ac..d208e6d 100644
--- a/src/C/lapack.c
+++ b/src/C/lapack.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -51,204 +52,225 @@ PyDoc_STRVAR(lapack__doc__, "Interface to the LAPACK library.\n\n"
extern int ilaenv_(int *ispec, char **name, char **opts, int *n1,
int *n2, int *n3, int *n4);
+extern void dlarfg_(int *n, double *alpha, double *x, int *incx,
+ double *tau);
+extern void zlarfg_(int *n, double complex *alpha, double complex *x,
+ int *incx, double complex *tau);
+extern void dlarfx_(char *side, int *m, int *n, double *V, double *tau,
+ double *C, int *ldc, double *work);
+extern void zlarfx_(char *side, int *m, int *n, double complex *V,
+ double complex *tau, double complex *C, int *ldc,
+ double complex *work);
+
extern void dlacpy_(char *uplo, int *m, int *n, double *A, int *lda,
double *B, int *ldb);
-extern void zlacpy_(char *uplo, int *m, int *n, complex *A, int *lda,
- complex *B, int *ldb);
+extern void zlacpy_(char *uplo, int *m, int *n, double complex *A,
+ int *lda, double complex *B, int *ldb);
extern void dgetrf_(int *m, int *n, double *A, int *lda, int *ipiv,
int *info);
-extern void zgetrf_(int *m, int *n, complex *A, int *lda, int *ipiv,
+extern void zgetrf_(int *m, int *n, double complex *A, int *lda, int *ipiv,
int *info);
extern void dgetrs_(char *trans, int *n, int *nrhs, double *A, int *lda,
int *ipiv, double *B, int *ldb, int *info);
-extern void zgetrs_(char *trans, int *n, int *nrhs, complex *A, int *lda,
- int *ipiv, complex *B, int *ldb, int *info);
+extern void zgetrs_(char *trans, int *n, int *nrhs, double complex *A,
+ int *lda, int *ipiv, double complex *B, int *ldb, int *info);
extern void dgetri_(int *n, double *A, int *lda, int *ipiv, double *work,
int *lwork, int *info);
-extern void zgetri_(int *n, complex *A, int *lda, int *ipiv, complex *work,
- int *lwork, int *info);
+extern void zgetri_(int *n, double complex *A, int *lda, int *ipiv,
+ double complex *work, int *lwork, int *info);
extern void dgesv_(int *n, int *nrhs, double *A, int *lda, int *ipiv,
double *B, int *ldb, int *info);
-extern void zgesv_(int *n, int *nrhs, complex *A, int *lda, int *ipiv,
- complex *B, int *ldb, int *info);
+extern void zgesv_(int *n, int *nrhs, double complex *A, int *lda,
+ int *ipiv, double complex *B, int *ldb, int *info);
extern void dgbtrf_(int *m, int *n, int *kl, int *ku, double *AB,
int *ldab, int *ipiv, int *info);
-extern void zgbtrf_(int *m, int *n, int *kl, int *ku, complex *AB,
+extern void zgbtrf_(int *m, int *n, int *kl, int *ku, double complex *AB,
int *ldab, int *ipiv, int *info);
extern void dgbtrs_(char *trans, int *n, int *kl, int *ku, int *nrhs,
double *AB, int *ldab, int *ipiv, double *B, int *ldB, int *info);
extern void zgbtrs_(char *trans, int *n, int *kl, int *ku, int *nrhs,
- complex *AB, int *ldab, int *ipiv, complex *B, int *ldB, int *info);
+ double complex *AB, int *ldab, int *ipiv, double complex *B,
+ int *ldB, int *info);
extern void dgbsv_(int *n, int *kl, int *ku, int *nrhs, double *ab,
int *ldab, int *ipiv, double *b, int *ldb, int *info);
-extern void zgbsv_(int *n, int *kl, int *ku, int *nrhs, complex *ab,
- int *ldab, int *ipiv, complex *b, int *ldb, int *info);
+extern void zgbsv_(int *n, int *kl, int *ku, int *nrhs, double complex *ab,
+ int *ldab, int *ipiv, double complex *b, int *ldb, int *info);
extern void dgttrf_(int *n, double *dl, double *d, double *du,
double *du2, int *ipiv, int *info);
-extern void zgttrf_(int *n, complex *dl, complex *d, complex *du,
- complex *du2, int *ipiv, int *info);
+extern void zgttrf_(int *n, double complex *dl, double complex *d,
+ double complex *du, double complex *du2, int *ipiv, int *info);
extern void dgttrs_(char *trans, int *n, int *nrhs, double *dl, double *d,
double *du, double *du2, int *ipiv, double *B, int *ldB, int *info);
-extern void zgttrs_(char *trans, int *n, int *nrhs, complex *dl,
- complex *d, complex *du, complex *du2, int *ipiv, complex *B,
- int *ldB, int *info);
+extern void zgttrs_(char *trans, int *n, int *nrhs, double complex *dl,
+ double complex *d, double complex *du, double complex *du2,
+ int *ipiv, double complex *B, int *ldB, int *info);
extern void dgtsv_(int *n, int *nrhs, double *dl, double *d, double *du,
double *B, int *ldB, int *info);
-extern void zgtsv_(int *n, int *nrhs, complex *dl, complex *d, complex *du,
- complex *B, int *ldB, int *info);
+extern void zgtsv_(int *n, int *nrhs, double complex *dl,
+ double complex *d, double complex *du, double complex *B, int *ldB,
+ int *info);
extern void dpotrf_(char *uplo, int *n, double *A, int *lda, int *info);
-extern void zpotrf_(char *uplo, int *n, complex *A, int *lda, int *info);
+extern void zpotrf_(char *uplo, int *n, double complex *A, int *lda,
+ int *info);
extern void dpotrs_(char *uplo, int *n, int *nrhs, double *A, int *lda,
double *B, int *ldb, int *info);
-extern void zpotrs_(char *uplo, int *n, int *nrhs, complex *A, int *lda,
- complex *B, int *ldb, int *info);
+extern void zpotrs_(char *uplo, int *n, int *nrhs, double complex *A,
+ int *lda, double complex *B, int *ldb, int *info);
extern void dpotri_(char *uplo, int *n, double *A, int *lda, int *info);
-extern void zpotri_(char *uplo, int *n, complex *A, int *lda, int *info);
+extern void zpotri_(char *uplo, int *n, double complex *A, int *lda,
+ int *info);
extern void dposv_(char *uplo, int *n, int *nrhs, double *A, int *lda,
double *B, int *ldb, int *info);
-extern void zposv_(char *uplo, int *n, int *nrhs, complex *A, int *lda,
- complex *B, int *ldb, int *info);
+extern void zposv_(char *uplo, int *n, int *nrhs, double complex *A,
+ int *lda, double complex *B, int *ldb, int *info);
extern void dpbtrf_(char *uplo, int *n, int *kd, double *AB, int *ldab,
int *info);
-extern void zpbtrf_(char *uplo, int *n, int *kd, complex *AB, int *ldab,
- int *info);
+extern void zpbtrf_(char *uplo, int *n, int *kd, double complex *AB,
+ int *ldab, int *info);
extern void dpbtrs_(char *uplo, int *n, int *kd, int *nrhs, double *AB,
int *ldab, double *B, int *ldb, int *info);
-extern void zpbtrs_(char *uplo, int *n, int *kd, int *nrhs, complex *AB,
- int *ldab, complex *B, int *ldb, int *info);
+extern void zpbtrs_(char *uplo, int *n, int *kd, int *nrhs,
+ double complex *AB, int *ldab, double complex *B, int *ldb, int *info);
extern void dpbsv_(char *uplo, int *n, int *kd, int *nrhs, double *A,
int *lda, double *B, int *ldb, int *info);
-extern void zpbsv_(char *uplo, int *n, int *kd, int *nrhs, complex *A,
- int *lda, complex *B, int *ldb, int *info);
+extern void zpbsv_(char *uplo, int *n, int *kd, int *nrhs,
+ double complex *A, int *lda, double complex *B, int *ldb, int *info);
extern void dpttrf_(int *n, double *d, double *e, int *info);
-extern void zpttrf_(int *n, double *d, complex *e, int *info);
+extern void zpttrf_(int *n, double *d, double complex *e, int *info);
extern void dpttrs_(int *n, int *nrhs, double *d, double *e, double *B,
int *ldB, int *info);
-extern void zpttrs_(char *uplo, int *n, int *nrhs, double *d, complex *e,
- complex *B, int *ldB, int *info);
+extern void zpttrs_(char *uplo, int *n, int *nrhs, double *d,
+ double complex *e, double complex *B, int *ldB, int *info);
extern void dptsv_(int *n, int *nrhs, double *d, double *e, double *B,
int *ldB, int *info);
-extern void zptsv_(int *n, int *nrhs, double *d, complex *e, complex *B,
- int *ldB, int *info);
+extern void zptsv_(int *n, int *nrhs, double *d, double complex *e,
+ double complex *B, int *ldB, int *info);
extern void dsytrf_(char *uplo, int *n, double *A, int *lda, int *ipiv,
double *work, int *lwork, int *info);
-extern void zsytrf_(char *uplo, int *n, complex *A, int *lda, int *ipiv,
- complex *work, int *lwork, int *info);
-extern void zhetrf_(char *uplo, int *n, complex *A, int *lda, int *ipiv,
- complex *work, int *lwork, int *info);
+extern void zsytrf_(char *uplo, int *n, double complex *A, int *lda,
+ int *ipiv, double complex *work, int *lwork, int *info);
+extern void zhetrf_(char *uplo, int *n, double complex *A, int *lda,
+ int *ipiv, double complex *work, int *lwork, int *info);
extern void dsytrs_(char *uplo, int *n, int *nrhs, double *A, int *lda,
int *ipiv, double *B, int *ldb, int *info);
-extern void zsytrs_(char *uplo, int *n, int *nrhs, complex *A, int *lda,
- int *ipiv, complex *B, int *ldb, int *info);
-extern void zhetrs_(char *uplo, int *n, int *nrhs, complex *A, int *lda,
- int *ipiv, complex *B, int *ldb, int *info);
+extern void zsytrs_(char *uplo, int *n, int *nrhs, double complex *A,
+ int *lda, int *ipiv, double complex *B, int *ldb, int *info);
+extern void zhetrs_(char *uplo, int *n, int *nrhs, double complex *A,
+ int *lda, int *ipiv, double complex *B, int *ldb, int *info);
extern void dsytri_(char *uplo, int *n, double *A, int *lda, int *ipiv,
double *work, int *info);
-extern void zsytri_(char *uplo, int *n, complex *A, int *lda, int *ipiv,
- complex *work, int *info);
-extern void zhetri_(char *uplo, int *n, complex *A, int *lda, int *ipiv,
- complex *work, int *info);
+extern void zsytri_(char *uplo, int *n, double complex *A, int *lda,
+ int *ipiv, double complex *work, int *info);
+extern void zhetri_(char *uplo, int *n, double complex *A, int *lda,
+ int *ipiv, double complex *work, int *info);
extern void dsysv_(char *uplo, int *n, int *nrhs, double *A, int *lda,
int *ipiv, double *B, int *ldb, double *work, int *lwork,
int *info);
-extern void zsysv_(char *uplo, int *n, int *nrhs, complex *A, int *lda,
- int *ipiv, complex *B, int *ldb, complex *work, int *lwork, int *info);
-extern void zhesv_(char *uplo, int *n, int *nrhs, complex *A, int *lda,
- int *ipiv, complex *B, int *ldb, complex *work, int *lwork, int *info);
+extern void zsysv_(char *uplo, int *n, int *nrhs, double complex *A,
+ int *lda, int *ipiv, double complex *B, int *ldb,
+ double complex *work, int *lwork, int *info);
+extern void zhesv_(char *uplo, int *n, int *nrhs, double complex *A,
+ int *lda, int *ipiv, double complex *B, int *ldb,
+ double complex *work, int *lwork, int *info);
extern void dtrtrs_(char *uplo, char *trans, char *diag, int *n, int *nrhs,
double *a, int *lda, double *b, int *ldb, int *info);
extern void ztrtrs_(char *uplo, char *trans, char *diag, int *n, int *nrhs,
- complex *a, int *lda, complex *b, int *ldb, int *info);
+ double complex *a, int *lda, double complex *b, int *ldb, int *info);
extern void dtrtri_(char *uplo, char *diag, int *n, double *a, int *lda,
int *info);
-extern void ztrtri_(char *uplo, char *diag, int *n, complex *a, int *lda,
- int *info);
+extern void ztrtri_(char *uplo, char *diag, int *n, double complex *a,
+ int *lda, int *info);
extern void dtbtrs_(char *uplo, char *trans, char *diag, int *n, int *kd,
int *nrhs, double *ab, int *ldab, double *b, int *ldb, int *info);
extern void ztbtrs_(char *uplo, char *trans, char *diag, int *n, int *kd,
- int *nrhs, complex *ab, int *ldab, complex *b, int *ldb, int *info);
+ int *nrhs, double complex *ab, int *ldab, double complex *b,
+ int *ldb, int *info);
extern void dgels_(char *trans, int *m, int *n, int *nrhs, double *a,
int *lda, double *b, int *ldb, double *work, int *lwork, int *info);
-extern void zgels_(char *trans, int *m, int *n, int *nrhs, complex *a,
- int *lda, complex *b, int *ldb, complex *work, int *lwork, int *info);
+extern void zgels_(char *trans, int *m, int *n, int *nrhs,
+ double complex *a, int *lda, double complex *b, int *ldb,
+ double complex *work, int *lwork, int *info);
extern void dgeqrf_(int *m, int *n, double *a, int *lda, double *tau,
double *work, int *lwork, int *info);
-extern void zgeqrf_(int *m, int *n, complex *a, int *lda, complex *tau,
- complex *work, int *lwork, int *info);
+extern void zgeqrf_(int *m, int *n, double complex *a, int *lda,
+ double complex *tau, double complex *work, int *lwork, int *info);
extern void dormqr_(char *side, char *trans, int *m, int *n, int *k,
double *a, int *lda, double *tau, double *c, int *ldc, double *work,
int *lwork, int *info);
extern void zunmqr_(char *side, char *trans, int *m, int *n, int *k,
- complex *a, int *lda, complex *tau, complex *c, int *ldc,
- complex *work, int *lwork, int *info);
+ double complex *a, int *lda, double complex *tau, double complex *c,
+ int *ldc, double complex *work, int *lwork, int *info);
extern void dorgqr_(int *m, int *n, int *k, double *A, int *lda,
double *tau, double *work, int *lwork, int *info);
-extern void zungqr_(int *m, int *n, int *k, complex *A, int *lda,
- complex *tau, complex *work, int *lwork, int *info);
+extern void zungqr_(int *m, int *n, int *k, double complex *A, int *lda,
+ double complex *tau, double complex *work, int *lwork, int *info);
extern void dorglq_(int *m, int *n, int *k, double *A, int *lda,
double *tau, double *work, int *lwork, int *info);
-extern void zunglq_(int *m, int *n, int *k, complex *A, int *lda,
- complex *tau, complex *work, int *lwork, int *info);
+extern void zunglq_(int *m, int *n, int *k, double complex *A, int *lda,
+ double complex *tau, double complex *work, int *lwork, int *info);
extern void dgelqf_(int *m, int *n, double *a, int *lda, double *tau,
double *work, int *lwork, int *info);
-extern void zgelqf_(int *m, int *n, complex *a, int *lda, complex *tau,
- complex *work, int *lwork, int *info);
+extern void zgelqf_(int *m, int *n, double complex *a, int *lda,
+ double complex *tau, double complex *work, int *lwork, int *info);
extern void dormlq_(char *side, char *trans, int *m, int *n, int *k,
double *a, int *lda, double *tau, double *c, int *ldc, double *work,
int *lwork, int *info);
extern void zunmlq_(char *side, char *trans, int *m, int *n, int *k,
- complex *a, int *lda, complex *tau, complex *c, int *ldc,
- complex *work, int *lwork, int *info);
+ double complex *a, int *lda, double complex *tau, double complex *c,
+ int *ldc, double complex *work, int *lwork, int *info);
extern void dgeqp3_(int *m, int *n, double *a, int *lda, int *jpvt,
double *tau, double *work, int *lwork, int *info);
-extern void zgeqp3_(int *m, int *n, complex *a, int *lda, int *jpvt,
- complex *tau, complex *work, int *lwork, double *rwork, int *info);
+extern void zgeqp3_(int *m, int *n, double complex *a, int *lda, int *jpvt,
+ double complex *tau, double complex *work, int *lwork, double *rwork,
+ int *info);
extern void dsyev_(char *jobz, char *uplo, int *n, double *A, int *lda,
double *W, double *work, int *lwork, int *info);
-extern void zheev_(char *jobz, char *uplo, int *n, complex *A, int *lda,
- double *W, complex *work, int *lwork, double *rwork, int *info);
+extern void zheev_(char *jobz, char *uplo, int *n, double complex *A,
+ int *lda, double *W, double complex *work, int *lwork, double *rwork,
+ int *info);
extern void dsyevx_(char *jobz, char *range, char *uplo, int *n, double *A,
int *lda, double *vl, double *vu, int *il, int *iu, double *abstol,
int *m, double *W, double *Z, int *ldz, double *work, int *lwork,
int *iwork, int *ifail, int *info);
extern void zheevx_(char *jobz, char *range, char *uplo, int *n,
- complex *A, int *lda, double *vl, double *vu, int *il, int *iu,
- double *abstol, int *m, double *W, complex *Z, int *ldz, complex *work,
- int *lwork, double *rwork, int *iwork, int *ifail, int *info);
+ double complex *A, int *lda, double *vl, double *vu, int *il, int *iu,
+ double *abstol, int *m, double *W, double complex *Z, int *ldz,
+ double complex *work, int *lwork, double *rwork, int *iwork,
+ int *ifail, int *info);
extern void dsyevd_(char *jobz, char *uplo, int *n, double *A, int *ldA,
double *W, double *work, int *lwork, int *iwork, int *liwork,
int *info);
-extern void zheevd_(char *jobz, char *uplo, int *n, complex *A, int *ldA,
- double *W, complex *work, int *lwork, double *rwork, int *lrwork,
- int *iwork, int *liwork, int *info);
+extern void zheevd_(char *jobz, char *uplo, int *n, double complex *A,
+ int *ldA, double *W, double complex *work, int *lwork, double *rwork,
+ int *lrwork, int *iwork, int *liwork, int *info);
extern void dsyevr_(char *jobz, char *range, char *uplo, int *n, double *A,
int *ldA, double *vl, double *vu, int *il, int *iu, double *abstol,
int *m, double *W, double *Z, int *ldZ, int *isuppz, double *work,
int *lwork, int *iwork, int *liwork, int *info);
extern void zheevr_(char *jobz, char *range, char *uplo, int *n,
- complex *A, int *ldA, double *vl, double *vu, int *il, int *iu,
- double *abstol, int *m, double *W, complex *Z, int *ldZ, int *isuppz,
- complex *work, int *lwork, double *rwork, int *lrwork, int *iwork,
- int *liwork, int *info);
+ double complex *A, int *ldA, double *vl, double *vu, int *il, int *iu,
+ double *abstol, int *m, double *W, double complex *Z, int *ldZ,
+ int *isuppz, double complex *work, int *lwork, double *rwork,
+ int *lrwork, int *iwork, int *liwork, int *info);
extern void dsygv_(int *itype, char *jobz, char *uplo, int *n, double *A,
int *lda, double *B, int *ldb, double *W, double *work, int *lwork,
int *info);
-extern void zhegv_(int *itype, char *jobz, char *uplo, int *n, complex *A,
- int *lda, complex *B, int *ldb, double *W, complex *work, int *lwork,
- double *rwork, int *info);
+extern void zhegv_(int *itype, char *jobz, char *uplo, int *n,
+ double complex *A, int *lda, double complex *B, int *ldb, double *W,
+ double complex *work, int *lwork, double *rwork, int *info);
extern void dgesvd_(char *jobu, char *jobvt, int *m, int *n, double *A,
int *ldA, double *S, double *U, int *ldU, double *Vt, int *ldVt,
@@ -256,31 +278,65 @@ extern void dgesvd_(char *jobu, char *jobvt, int *m, int *n, double *A,
extern void dgesdd_(char *jobz, int *m, int *n, double *A, int *ldA,
double *S, double *U, int *ldU, double *Vt, int *ldVt, double *work,
int *lwork, int *iwork, int *info);
-extern void zgesvd_(char *jobu, char *jobvt, int *m, int *n, complex *A,
- int *ldA, double *S, complex *U, int *ldU, complex *Vt, int *ldVt,
- complex *work, int *lwork, double *rwork, int *info);
-extern void zgesdd_(char *jobz, int *m, int *n, complex *A, int *ldA,
- double *S, complex *U, int *ldU, complex *Vt, int *ldVt, complex *work,
- int *lwork, double *rwork, int *iwork, int *info);
+extern void zgesvd_(char *jobu, char *jobvt, int *m, int *n,
+ double complex *A, int *ldA, double *S, double complex *U, int *ldU,
+ double complex *Vt, int *ldVt, double complex *work, int *lwork,
+ double *rwork, int *info);
+extern void zgesdd_(char *jobz, int *m, int *n, double complex *A,
+ int *ldA, double *S, double complex *U, int *ldU, double complex *Vt,
+ int *ldVt, double complex *work, int *lwork, double *rwork,
+ int *iwork, int *info);
extern void dgees_(char *jobvs, char *sort, void *select, int *n,
double *A, int *ldA, int *sdim, double *wr, double *wi, double *vs,
int *ldvs, double *work, int *lwork, int *bwork, int *info);
extern void zgees_(char *jobvs, char *sort, void *select, int *n,
- complex *A, int *ldA, int *sdim, complex *w, complex *vs, int *ldvs,
- complex *work, int *lwork, complex *rwork, int *bwork, int *info);
+ double complex *A, int *ldA, int *sdim, double complex *w,
+ double complex *vs, int *ldvs, double complex *work, int *lwork,
+ double complex *rwork, int *bwork, int *info);
extern void dgges_(char *jobvsl, char *jobvsr, char *sort, void *delctg,
int *n, double *A, int *ldA, double *B, int *ldB, int *sdim,
double *alphar, double *alphai, double *beta, double *vsl, int *ldvsl,
double *vsr, int *ldvsr, double *work, int *lwork, int *bwork,
int *info);
extern void zgges_(char *jobvsl, char *jobvsr, char *sort, void *delctg,
- int *n, complex *A, int *ldA, complex *B, int *ldB, int *sdim,
- complex *alpha, complex *beta, complex *vsl, int *ldvsl, complex *vsr,
- int *ldvsr, complex *work, int *lwork, double *rwork, int *bwork,
+ int *n, double complex *A, int *ldA, double complex *B, int *ldB,
+ int *sdim, double complex *alpha, double complex *beta,
+ double complex *vsl, int *ldvsl, double complex *vsr, int *ldvsr,
+ double complex *work, int *lwork, double *rwork, int *bwork,
int *info);
+static int number_from_pyobject(PyObject *o, number *a, int id)
+{
+ switch (id){
+ case DOUBLE:
+#if PY_MAJOR_VERSION >= 3
+ if (!PyLong_Check(o) && !PyLong_Check(o) &&
+ !PyFloat_Check(o)) return -1;
+#else
+ if (!PyInt_Check(o) && !PyLong_Check(o) &&
+ !PyFloat_Check(o)) return -1;
+#endif
+ (*a).d = PyFloat_AsDouble(o);
+ return 0;
+
+ case COMPLEX:
+#if PY_MAJOR_VERSION >= 3
+ if (!PyLong_Check(o) && !PyLong_Check(o) &&
+ !PyFloat_Check(o) && !PyComplex_Check(o)) return -1;
+#else
+ if (!PyInt_Check(o) && !PyLong_Check(o) &&
+ !PyFloat_Check(o) && !PyComplex_Check(o)) return -1;
+#endif
+ (*a).z = PyComplex_RealAsDouble(o) +
+ I*PyComplex_ImagAsDouble(o);
+ return 0;
+ }
+ return -1;
+}
+
+
static char doc_getrf[] =
"LU factorization of a general real or complex m by n matrix.\n\n"
"getrf(A, ipiv, m=A.size[0], n=A.size[1], ldA=max(1,A.size[0]),\n"
@@ -551,7 +607,7 @@ static PyObject* getri(PyObject *self, PyObject *args, PyObject *kwrds)
zgetri_(&n, NULL, &ldA, NULL, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex)))){
+ if (!(work = (void *) calloc(lwork, sizeof(double complex)))){
#if (SIZEOF_INT < SIZEOF_LONG)
free(ipiv_ptr);
#endif
@@ -559,7 +615,7 @@ static PyObject* getri(PyObject *self, PyObject *args, PyObject *kwrds)
}
Py_BEGIN_ALLOW_THREADS
zgetri_(&n, MAT_BUFZ(A)+oA, &ldA, ipiv_ptr,
- (complex *) work, &lwork, &info);
+ (double complex *) work, &lwork, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -682,14 +738,14 @@ static PyObject* gesv(PyObject *self, PyObject *args, PyObject *kwrds)
MAT_BUFZ(B)+oB, &ldB, &info);
Py_END_ALLOW_THREADS
else {
- if (!(Ac = (void *) calloc(n*n, sizeof(complex)))){
+ if (!(Ac = (void *) calloc(n*n, sizeof(double complex)))){
free(ipivc);
return PyErr_NoMemory();
}
- for (k=0; k<n; k++) memcpy((complex *) Ac + k*n,
- MAT_BUFZ(A)+oA+k*ldA, n*sizeof(complex));
+ for (k=0; k<n; k++) memcpy((double complex *) Ac + k*n,
+ MAT_BUFZ(A)+oA+k*ldA, n*sizeof(double complex));
Py_BEGIN_ALLOW_THREADS
- zgesv_(&n, &nrhs, (complex *) Ac, &n, ipivc,
+ zgesv_(&n, &nrhs, (double complex *) Ac, &n, ipivc,
MAT_BUFZ(B)+oB, &ldB, &info);
Py_END_ALLOW_THREADS
free(Ac);
@@ -1040,18 +1096,18 @@ static PyObject* gbsv(PyObject *self, PyObject *args, PyObject *kwrds)
Py_END_ALLOW_THREADS
else {
if (!(Ac = (void *) calloc((2*kl+ku+1)*n,
- sizeof(complex)))){
+ sizeof(double complex)))){
free(ipivc);
return PyErr_NoMemory();
}
for (k=0; k<n; k++)
- memcpy((complex *) Ac + kl + k*(2*kl+ku+1),
+ memcpy((double complex *) Ac + kl + k*(2*kl+ku+1),
MAT_BUFZ(A) + oA + k*ldA,
- (kl+ku+1)*sizeof(complex));
+ (kl+ku+1)*sizeof(double complex));
ldA = 2*kl+ku+1;
Py_BEGIN_ALLOW_THREADS
- zgbsv_(&n, &kl, &ku, &nrhs, (complex *) Ac, &ldA, ipivc,
- MAT_BUFZ(B)+oB, &ldB, &info);
+ zgbsv_(&n, &kl, &ku, &nrhs, (double complex *) Ac, &ldA,
+ ipivc, MAT_BUFZ(B)+oB, &ldB, &info);
Py_END_ALLOW_THREADS
free(Ac);
}
@@ -2286,7 +2342,7 @@ static PyObject* sytrf(PyObject *self, PyObject *args, PyObject *kwrds)
zsytrf_(&uplo, &n, NULL, &ldA, NULL, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex)))){
+ if (!(work = (void *) calloc(lwork, sizeof(double complex)))){
#if (SIZEOF_INT < SIZEOF_LONG)
free(ipiv_ptr);
#endif
@@ -2294,7 +2350,7 @@ static PyObject* sytrf(PyObject *self, PyObject *args, PyObject *kwrds)
}
Py_BEGIN_ALLOW_THREADS
zsytrf_(&uplo, &n, MAT_BUFZ(A)+oA, &ldA, ipiv_ptr,
- (complex *) work, &lwork, &info);
+ (double complex *) work, &lwork, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -2406,7 +2462,7 @@ static PyObject* hetrf(PyObject *self, PyObject *args, PyObject *kwrds)
zhetrf_(&uplo, &n, NULL, &ldA, NULL, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex)))){
+ if (!(work = (void *) calloc(lwork, sizeof(double complex)))){
#if (SIZEOF_INT < SIZEOF_LONG)
free(ipiv_ptr);
#endif
@@ -2414,7 +2470,7 @@ static PyObject* hetrf(PyObject *self, PyObject *args, PyObject *kwrds)
}
Py_BEGIN_ALLOW_THREADS
zhetrf_(&uplo, &n, MAT_BUFZ(A)+oA, &ldA, ipiv_ptr,
- (complex *) work, &lwork, &info);
+ (double complex *) work, &lwork, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -2740,7 +2796,7 @@ static PyObject* sytri(PyObject *self, PyObject *args, PyObject *kwrds)
break;
case COMPLEX:
- if (!(work = (void *) calloc(2*n, sizeof(complex)))){
+ if (!(work = (void *) calloc(2*n, sizeof(double complex)))){
#if (SIZEOF_INT < SIZEOF_LONG)
free(ipiv_ptr);
#endif
@@ -2748,7 +2804,7 @@ static PyObject* sytri(PyObject *self, PyObject *args, PyObject *kwrds)
}
Py_BEGIN_ALLOW_THREADS
zsytri_(&uplo, &n, MAT_BUFZ(A)+oA, &ldA, ipiv_ptr,
- (complex *) work, &info);
+ (double complex *) work, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -2850,7 +2906,7 @@ static PyObject* hetri(PyObject *self, PyObject *args, PyObject *kwrds)
break;
case COMPLEX:
- if (!(work = (void *) calloc(n, sizeof(complex)))){
+ if (!(work = (void *) calloc(n, sizeof(double complex)))){
#if (SIZEOF_INT < SIZEOF_LONG)
free(ipiv_ptr);
#endif
@@ -2858,7 +2914,7 @@ static PyObject* hetri(PyObject *self, PyObject *args, PyObject *kwrds)
}
Py_BEGIN_ALLOW_THREADS
zhetri_(&uplo, &n, MAT_BUFZ(A)+oA, &ldA, ipiv_ptr,
- (complex *) work, &info);
+ (double complex *) work, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -3009,7 +3065,7 @@ static PyObject* sysv(PyObject *self, PyObject *args, PyObject *kwrds)
zsytrf_(&uplo, &n, NULL, &ldA, NULL, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))))
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))))
return PyErr_NoMemory();
if (ipiv) {
#if (SIZEOF_INT < SIZEOF_LONG)
@@ -3023,7 +3079,8 @@ static PyObject* sysv(PyObject *self, PyObject *args, PyObject *kwrds)
#endif
Py_BEGIN_ALLOW_THREADS
zsysv_(&uplo, &n, &nrhs, MAT_BUFZ(A)+oA, &ldA, ipivc,
- MAT_BUFZ(B)+oB, &ldB, (complex *) work, &lwork, &info);
+ MAT_BUFZ(B)+oB, &ldB, (double complex *) work,
+ &lwork, &info);
Py_END_ALLOW_THREADS
#if (SIZEOF_INT < SIZEOF_LONG)
for (k=0; k<n; k++) MAT_BUFI(ipiv)[k] = ipivc[k];
@@ -3032,16 +3089,17 @@ static PyObject* sysv(PyObject *self, PyObject *args, PyObject *kwrds)
}
else {
ipivc = (int *) calloc(n, sizeof(int));
- Ac = (void *) calloc(n*n, sizeof(complex));
+ Ac = (void *) calloc(n*n, sizeof(double complex));
if (!ipivc || !Ac){
free(work); free(ipivc); free(Ac);
return PyErr_NoMemory();
}
for (k=0; k<n; k++)
- memcpy((complex *) Ac + k*n, MAT_BUFZ(A) + oA + k*ldA,
- n*sizeof(complex));
+ memcpy((double complex *) Ac + k*n,
+ MAT_BUFZ(A) + oA + k*ldA,
+ n*sizeof(double complex));
Py_BEGIN_ALLOW_THREADS
- zsysv_(&uplo, &n, &nrhs, (complex *) Ac, &n, ipivc,
+ zsysv_(&uplo, &n, &nrhs, (double complex *) Ac, &n, ipivc,
MAT_BUFZ(B)+oB, &ldB, work, &lwork, &info);
Py_END_ALLOW_THREADS
free(ipivc); free(Ac);
@@ -3188,7 +3246,7 @@ static PyObject* hesv(PyObject *self, PyObject *args, PyObject *kwrds)
lwork = -1;
zhetrf_(&uplo, &n, NULL, &ldA, NULL, &wl.z, &lwork, &info);
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))))
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))))
return PyErr_NoMemory();
if (ipiv) {
#if (SIZEOF_INT < SIZEOF_LONG)
@@ -3202,7 +3260,8 @@ static PyObject* hesv(PyObject *self, PyObject *args, PyObject *kwrds)
#endif
Py_BEGIN_ALLOW_THREADS
zhesv_(&uplo, &n, &nrhs, MAT_BUFZ(A)+oA, &ldA, ipivc,
- MAT_BUFZ(B)+oB, &ldB, (complex *) work, &lwork, &info);
+ MAT_BUFZ(B)+oB, &ldB, (double complex *) work,
+ &lwork, &info);
Py_END_ALLOW_THREADS
#if (SIZEOF_INT < SIZEOF_LONG)
for (k=0; k<n; k++) MAT_BUFI(ipiv)[k] = ipivc[k];
@@ -3211,16 +3270,17 @@ static PyObject* hesv(PyObject *self, PyObject *args, PyObject *kwrds)
}
else {
ipivc = (int *) calloc(n, sizeof(int));
- Ac = (void *) calloc(n*n, sizeof(complex));
+ Ac = (void *) calloc(n*n, sizeof(double complex));
if (!ipivc || !Ac){
free(work); free(ipivc); free(Ac);
return PyErr_NoMemory();
}
for (k=0; k<n; k++)
- memcpy((complex *) Ac + k*n, MAT_BUFZ(A) + oA + k*ldA,
- n*sizeof(complex));
+ memcpy((double complex *) Ac + k*n,
+ MAT_BUFZ(A) + oA + k*ldA,
+ n*sizeof(double complex));
Py_BEGIN_ALLOW_THREADS
- zhesv_(&uplo, &n, &nrhs, (complex *) Ac, &n, ipivc,
+ zhesv_(&uplo, &n, &nrhs, (double complex *) Ac, &n, ipivc,
MAT_BUFZ(B)+oB, &ldB, work, &lwork, &info);
Py_END_ALLOW_THREADS
free(ipivc); free(Ac);
@@ -3621,11 +3681,12 @@ static PyObject* gels(PyObject *self, PyObject *args, PyObject *kwrds)
&lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))))
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))))
return PyErr_NoMemory();
Py_BEGIN_ALLOW_THREADS
zgels_(&trans, &m, &n, &nrhs, MAT_BUFZ(A)+oA, &ldA,
- MAT_BUFZ(B)+oB, &ldB, (complex *) work, &lwork, &info);
+ MAT_BUFZ(B)+oB, &ldB, (double complex *) work, &lwork,
+ &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -3709,11 +3770,11 @@ static PyObject* geqrf(PyObject *self, PyObject *args, PyObject *kwrds)
zgeqrf_(&m, &n, NULL, &ldA, NULL, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))))
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))))
return PyErr_NoMemory();
Py_BEGIN_ALLOW_THREADS
zgeqrf_(&m, &n, MAT_BUFZ(A)+oA, &ldA, MAT_BUFZ(tau),
- (complex *) work, &lwork, &info);
+ (double complex *) work, &lwork, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -3949,12 +4010,12 @@ static PyObject* unmqr(PyObject *self, PyObject *args, PyObject *kwrds)
&ldC, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))))
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))))
return PyErr_NoMemory();
Py_BEGIN_ALLOW_THREADS
zunmqr_(&side, &trans, &m, &n, &k, MAT_BUFZ(A)+oA, &ldA,
- MAT_BUFZ(tau), MAT_BUFZ(C)+oC, &ldC, (complex *) work,
- &lwork, &info);
+ MAT_BUFZ(tau), MAT_BUFZ(C)+oC, &ldC,
+ (double complex *) work, &lwork, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -4110,11 +4171,11 @@ static PyObject* ungqr(PyObject *self, PyObject *args, PyObject *kwrds)
zungqr_(&m, &n, &k, NULL, &ldA, NULL, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))))
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))))
return PyErr_NoMemory();
Py_BEGIN_ALLOW_THREADS
zungqr_(&m, &n, &k, MAT_BUFZ(A) + oA, &ldA, MAT_BUFZ(tau),
- (complex *) work, &lwork, &info);
+ (double complex *) work, &lwork, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -4198,11 +4259,11 @@ static PyObject* gelqf(PyObject *self, PyObject *args, PyObject *kwrds)
zgelqf_(&m, &n, NULL, &ldA, NULL, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))))
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))))
return PyErr_NoMemory();
Py_BEGIN_ALLOW_THREADS
zgelqf_(&m, &n, MAT_BUFZ(A)+oA, &ldA, MAT_BUFZ(tau),
- (complex *) work, &lwork, &info);
+ (double complex *) work, &lwork, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -4436,12 +4497,12 @@ static PyObject* unmlq(PyObject *self, PyObject *args, PyObject *kwrds)
&ldC, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))))
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))))
return PyErr_NoMemory();
Py_BEGIN_ALLOW_THREADS
zunmlq_(&side, &trans, &m, &n, &k, MAT_BUFZ(A)+oA, &ldA,
- MAT_BUFZ(tau), MAT_BUFZ(C)+oC, &ldC, (complex *) work,
- &lwork, &info);
+ MAT_BUFZ(tau), MAT_BUFZ(C)+oC, &ldC,
+ (double complex *) work, &lwork, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -4597,11 +4658,11 @@ static PyObject* unglq(PyObject *self, PyObject *args, PyObject *kwrds)
zunglq_(&m, &n, &k, NULL, &ldA, NULL, &wl.z, &lwork, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))))
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))))
return PyErr_NoMemory();
Py_BEGIN_ALLOW_THREADS
zunglq_(&m, &n, &k, MAT_BUFZ(A) + oA, &ldA, MAT_BUFZ(tau),
- (complex *) work, &lwork, &info);
+ (double complex *) work, &lwork, &info);
Py_END_ALLOW_THREADS
free(work);
break;
@@ -4704,12 +4765,12 @@ static PyObject* geqp3(PyObject *self, PyObject *args, PyObject *kwrds)
&info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- if (!(work = (void *) calloc(lwork, sizeof(complex))) ||
+ if (!(work = (void *) calloc(lwork, sizeof(double complex))) ||
!(rwork = (double *) calloc(2*n, sizeof(double))))
return PyErr_NoMemory();
Py_BEGIN_ALLOW_THREADS
zgeqp3_(&m, &n, MAT_BUFZ(A)+oA, &ldA, jpvt_ptr, MAT_BUFZ(tau),
- (complex *) work, &lwork, rwork, &info);
+ (double complex *) work, &lwork, rwork, &info);
Py_END_ALLOW_THREADS
free(work);
free(rwork);
@@ -4916,7 +4977,7 @@ static PyObject* heev(PyObject *self, PyObject *args, PyObject *kwrds)
NULL, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- work = (void *) calloc(lwork, sizeof(complex));
+ work = (void *) calloc(lwork, sizeof(double complex));
rwork = (double *) calloc(3*n-2, sizeof(double));
if (!work || !rwork){
free(work); free(rwork);
@@ -4924,7 +4985,7 @@ static PyObject* heev(PyObject *self, PyObject *args, PyObject *kwrds)
}
Py_BEGIN_ALLOW_THREADS
zheev_(&jobz, &uplo, &n, MAT_BUFZ(A)+oA, &ldA,
- MAT_BUFD(W)+oW, (complex *) work, &lwork, rwork,
+ MAT_BUFD(W)+oW, (double complex *) work, &lwork, rwork,
&info);
Py_END_ALLOW_THREADS
free(work); free(rwork);
@@ -5244,7 +5305,7 @@ static PyObject* heevx(PyObject *self, PyObject *args, PyObject *kwrds)
NULL, NULL, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- work = (void *) calloc(lwork, sizeof(complex));
+ work = (void *) calloc(lwork, sizeof(double complex));
rwork = (double *) calloc(7*n, sizeof(double));
iwork = (int *) calloc(5*n, sizeof(int));
if (jobz == 'V') ifail = (int *) calloc(n, sizeof(int));
@@ -5256,7 +5317,8 @@ static PyObject* heevx(PyObject *self, PyObject *args, PyObject *kwrds)
zheevx_(&jobz, &range, &uplo, &n, MAT_BUFZ(A)+oA, &ldA, &vl,
&vu, &il, &iu, &abstol, &m, MAT_BUFD(W)+oW,
(jobz == 'V') ? MAT_BUFZ(Z)+oZ : NULL, &ldZ,
- (complex *) work, &lwork, rwork, iwork, ifail, &info);
+ (double complex *) work, &lwork, rwork, iwork, ifail,
+ &info);
Py_END_ALLOW_THREADS
free(work); free(rwork); free(iwork); free(ifail);
break;
@@ -5474,7 +5536,7 @@ static PyObject* heevd(PyObject *self, PyObject *args, PyObject *kwrds)
lwork = (int) wl.d;
lrwork = (int) rwl;
liwork = iwl;
- work = (void *) calloc(lwork, sizeof(complex));
+ work = (void *) calloc(lwork, sizeof(double complex));
rwork = (double *) calloc(lrwork, sizeof(double));
iwork = (int *) calloc(liwork, sizeof(int));
if (!work || !rwork || !iwork){
@@ -5483,7 +5545,7 @@ static PyObject* heevd(PyObject *self, PyObject *args, PyObject *kwrds)
}
Py_BEGIN_ALLOW_THREADS
zheevd_(&jobz, &uplo, &n, MAT_BUFZ(A)+oA, &ldA,
- MAT_BUFD(W)+oW, (complex *) work, &lwork, rwork,
+ MAT_BUFD(W)+oW, (double complex *) work, &lwork, rwork,
&lrwork, iwork, &liwork, &info);
Py_END_ALLOW_THREADS
free(work); free(rwork); free(iwork);
@@ -5824,7 +5886,7 @@ static PyObject* heevr(PyObject *self, PyObject *args, PyObject *kwrds)
lwork = (int) creal(wl.z);
lrwork = (int) rwl;
liwork = iwl;
- work = (void *) calloc(lwork, sizeof(complex));
+ work = (void *) calloc(lwork, sizeof(double complex));
rwork = (double *) calloc(lrwork, sizeof(double));
iwork = (int *) calloc(liwork, sizeof(int));
if (jobz == 'V')
@@ -5838,8 +5900,8 @@ static PyObject* heevr(PyObject *self, PyObject *args, PyObject *kwrds)
zheevr_(&jobz, &range, &uplo, &n, MAT_BUFZ(A)+oA, &ldA, &vl,
&vu, &il, &iu, &abstol, &m, MAT_BUFD(W)+oW,
(jobz == 'V') ? MAT_BUFZ(Z)+oZ : NULL, &ldZ,
- (jobz == 'V') ? isuppz : NULL, (complex *) work, &lwork,
- rwork, &lrwork, iwork, &liwork, &info);
+ (jobz == 'V') ? isuppz : NULL, (double complex *) work,
+ &lwork, rwork, &lrwork, iwork, &liwork, &info);
Py_END_ALLOW_THREADS
free(work); free(rwork); free(iwork); free(isuppz);
break;
@@ -6110,7 +6172,7 @@ static PyObject* hegv(PyObject *self, PyObject *args, PyObject *kwrds)
&uplol : &uplou, &n, &n2, &n3, &n4));
#endif
- work = (void *) calloc(lwork, sizeof(complex));
+ work = (void *) calloc(lwork, sizeof(double complex));
rwork = (double *) calloc(3*n-2, sizeof(double));
if (!work || !rwork){
free(work); free(rwork);
@@ -6118,8 +6180,8 @@ static PyObject* hegv(PyObject *self, PyObject *args, PyObject *kwrds)
}
Py_BEGIN_ALLOW_THREADS
zhegv_(&itype, &jobz, &uplo, &n, MAT_BUFZ(A)+oA, &ldA,
- MAT_BUFZ(B)+oB, &ldB, MAT_BUFD(W)+oW, (complex *) work,
- &lwork, rwork, &info);
+ MAT_BUFZ(B)+oB, &ldB, MAT_BUFD(W)+oW,
+ (double complex *) work, &lwork, rwork, &info);
Py_END_ALLOW_THREADS
free(work); free(rwork);
break;
@@ -6312,7 +6374,7 @@ static PyObject* gesvd(PyObject *self, PyObject *args, PyObject *kwrds)
&ldU, NULL, &ldVt, &wl.z, &lwork, NULL, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- work = (void *) calloc(lwork, sizeof(complex));
+ work = (void *) calloc(lwork, sizeof(double complex));
rwork = (double *) calloc(5*MIN(m,n), sizeof(double));
if (!work || !rwork){
free(work); free(rwork);
@@ -6323,7 +6385,7 @@ static PyObject* gesvd(PyObject *self, PyObject *args, PyObject *kwrds)
MAT_BUFD(S)+oS, (jobu == 'A' || jobu == 'S') ?
MAT_BUFZ(U)+oU : NULL, &ldU, (jobvt == 'A' ||
jobvt == 'S') ? MAT_BUFZ(Vt)+oVt : NULL, &ldVt,
- (complex *) work, &lwork, rwork, &info);
+ (double complex *) work, &lwork, rwork, &info);
Py_END_ALLOW_THREADS
free(work); free(rwork);
break;
@@ -6509,7 +6571,7 @@ static PyObject* gesdd(PyObject *self, PyObject *args, PyObject *kwrds)
&ldVt, &wl.z, &lwork, NULL, NULL, &info);
Py_END_ALLOW_THREADS
lwork = (int) creal(wl.z);
- work = (void *) calloc(lwork, sizeof(complex));
+ work = (void *) calloc(lwork, sizeof(double complex));
iwork = (int *) calloc(8*MIN(m,n), sizeof(int));
rwork = (double *) calloc( (jobz == 'N') ? 7*MIN(m,n) :
5*MIN(m,n)*(MIN(m,n)+1), sizeof(double));
@@ -6522,7 +6584,7 @@ static PyObject* gesdd(PyObject *self, PyObject *args, PyObject *kwrds)
(jobz == 'A' || jobz == 'S' || (jobz == 'O' && m<n)) ?
MAT_BUFZ(U)+oU : NULL, &ldU, (jobz == 'A' ||
jobz == 'S' || (jobz == 'O' && m>=n)) ?
- MAT_BUFZ(Vt)+oVt : NULL, &ldVt, (complex *) work,
+ MAT_BUFZ(Vt)+oVt : NULL, &ldVt, (double complex *) work,
&lwork, rwork, iwork, &info);
Py_END_ALLOW_THREADS
free(work); free(iwork); free(rwork);
@@ -6578,7 +6640,7 @@ static char doc_gees[] =
static PyObject *py_select_r;
static PyObject *py_select_c;
-extern int fselect_c(complex *w)
+extern int fselect_c(double complex *w)
{
PyObject *wpy, *result;
int a = 0;
@@ -6629,7 +6691,7 @@ static PyObject* gees(PyObject *self, PyObject *args, PyObject *kwrds)
int n=-1, ldA=0, ldVs=0, oA=0, oVs=0, oW=0, info, lwork, sdim, k,
*bwork=NULL;
double *wr=NULL, *wi=NULL, *rwork=NULL;
- complex *w=NULL;
+ double complex *w=NULL;
void *work=NULL;
number wl;
char *kwlist[] = {"A", "w", "V", "select", "n", "ldA", "ldV",
@@ -6706,10 +6768,11 @@ static PyObject* gees(PyObject *self, PyObject *args, PyObject *kwrds)
&sdim, NULL, NULL, &ldVs, &wl.z, &lwork, NULL, NULL,
&info);
lwork = (int) creal(wl.z);
- work = (void *) calloc(lwork, sizeof(complex));
- rwork = (double *) calloc(n, sizeof(complex));
+ work = (void *) calloc(lwork, sizeof(double complex));
+ rwork = (double *) calloc(n, sizeof(double complex));
if (F) bwork = (int *) calloc(n, sizeof(int));
- if (!W) w = (complex *) calloc(n, sizeof(complex));
+ if (!W)
+ w = (double complex *) calloc(n, sizeof(double complex));
if (!work || !rwork || (F && !bwork) || (!W && !w) ){
free(work); free(rwork); free(bwork); free(w);
return PyErr_NoMemory();
@@ -6718,8 +6781,8 @@ static PyObject* gees(PyObject *self, PyObject *args, PyObject *kwrds)
zgees_(Vs ? "V": "N", F ? "S" : "N", F ? &fselect_c : NULL,
&n, MAT_BUFZ(A) + oA, &ldA, &sdim,
W ? MAT_BUFZ(W) + oW : w, Vs ? MAT_BUFZ(Vs) + oVs : NULL,
- &ldVs, (complex *) work, &lwork, (complex *) rwork, bwork,
- &info);
+ &ldVs, (double complex *) work, &lwork,
+ (double complex *) rwork, bwork, &info);
free(work); free(rwork); free(bwork); free(w);
break;
@@ -6793,7 +6856,7 @@ static char doc_gges[] =
static PyObject *py_select_gr;
static PyObject *py_select_gc;
-extern int fselect_gc(complex *w, double *v)
+extern int fselect_gc(double complex *w, double *v)
{
PyObject *wpy, *vpy, *result;
int a = 0;
@@ -6848,7 +6911,7 @@ static PyObject* gges(PyObject *self, PyObject *args, PyObject *kwrds)
int n=-1, ldA=0, ldB=0, ldVsl=0, ldVsr=0, oA=0, oB=0, oa=0, ob=0,
oVsl=0, oVsr=0, info, lwork, sdim, k, *bwork=NULL;
double *ar=NULL, *ai=NULL, *rwork=NULL;
- complex *ac=NULL;
+ double complex *ac=NULL;
void *work=NULL, *bc=NULL;
number wl;
@@ -6969,11 +7032,12 @@ static PyObject* gges(PyObject *self, PyObject *args, PyObject *kwrds)
&n, NULL, &ldA, NULL, &ldB, &sdim, NULL, NULL, NULL,
&ldVsl, NULL, &ldVsr, &wl.z, &lwork, NULL, NULL, &info);
lwork = (int) creal(wl.z);
- work = (void *) calloc(lwork, sizeof(complex));
+ work = (void *) calloc(lwork, sizeof(double complex));
rwork = (double *) calloc(8*n, sizeof(double));
if (F) bwork = (int *) calloc(n, sizeof(int));
- if (!a) ac = (complex *) calloc(n, sizeof(complex));
- bc = (complex *) calloc(n, sizeof(complex));
+ if (!a)
+ ac = (double complex *) calloc(n, sizeof(double complex));
+ bc = (double complex *) calloc(n, sizeof(double complex));
if (!work || !rwork || (F && !bwork) || (!a && !ac) || !bc){
free(work); free(rwork); free(bwork); free(ac); free(bc);
return PyErr_NoMemory();
@@ -6982,11 +7046,13 @@ static PyObject* gges(PyObject *self, PyObject *args, PyObject *kwrds)
zgges_(Vsl ? "V": "N", Vsr ? "V" : "N", F ? "S" : "N",
F ? &fselect_gc : NULL, &n, MAT_BUFZ(A) + oA, &ldA,
MAT_BUFZ(B) + oB, &ldB, &sdim, a ? MAT_BUFZ(a) + oa : ac,
- (complex *) bc, Vsl ? MAT_BUFZ(Vsl) + oVsl : NULL, &ldVsl,
+ (double complex *) bc,
+ Vsl ? MAT_BUFZ(Vsl) + oVsl : NULL, &ldVsl,
Vsr ? MAT_BUFZ(Vsr) + oVsr : NULL, &ldVsr,
- (complex *) work, &lwork, rwork, bwork, &info);
+ (double complex *) work, &lwork, rwork, bwork, &info);
if (b) for (k=0; k<n; k++)
- MAT_BUFD(b)[ob + k] = (double) creal(((complex *) bc)[k]);
+ MAT_BUFD(b)[ob + k] =
+ (double) creal(((double complex *) bc)[k]);
free(work); free(rwork); free(bwork); free(ac); free(bc);
break;
@@ -7003,27 +7069,29 @@ static PyObject* gges(PyObject *self, PyObject *args, PyObject *kwrds)
static char doc_lacpy[] =
-"Copy all or part of a matrix.\n\n"
-"lacpy(A, B, uplo='N', m=A.size[0], n=A.size[1], ldA=max(1,A.size[0]),\n"
-" ldB=max(1,B.size[0]), offsetA=0, offsetB=0)\n\n"
-"PURPOSE\n"
-"Copy the m x n matrix A to B. If uplo is 'U', the upper trapezoidal\n"
-"part of A is copied. If uplo is 'L', the lower trapezoidal part is\n"
-"copied. if uplo is 'N', the entire matrix is copied.\n\n"
-"ARGUMENTS\n"
-"A 'd' or 'z' matrix\n\n"
-"B 'd' or 'z' matrix. Must have the same type as A.\n\n"
-"uplo 'N', 'L' or 'U'\n\n"
-"m nonnegative integer. If negative, the default value is used.\n"
-"\n"
-"n nonnegative integer. If negative, the default value is used.\n"
-"\n"
-"ldA positive integer. ldA >= max(1,m). If zero, the default\n"
-" value is used.\n\n"
-"ldB positive integer. ldB >= max(1,m). If zero, the default\n"
-" value is used.\n\n"
-"offsetA nonnegative integer\n\n"
-"offsetB nonnegative integer";
+ "Copy all or part of a matrix.\n\n"
+ "lacpy(A, B, uplo='N', m=A.size[0], n=A.size[1], \n"
+ " ldA=max(1,A.size[0]), ldB=max(1,B.size[0]), offsetA=0, \n"
+ " offsetB=0)\n\n"
+ "PURPOSE\n"
+ "Copy the m x n matrix A to B. If uplo is 'U', the upper\n"
+ "trapezoidal part of A is copied. If uplo is 'L', the lower \n"
+ "trapezoidal part is copied. if uplo is 'N', the entire matrix is\n"
+ "copied.\n\n"
+ "ARGUMENTS\n"
+ "A 'd' or 'z' matrix\n\n"
+ "B 'd' or 'z' matrix. Must have the same type as A.\n\n"
+ "uplo 'N', 'L' or 'U'\n\n"
+ "m nonnegative integer. If negative, the default value is\n"
+ " used.\n\n"
+ "n nonnegative integer. If negative, the default value is\n"
+ " used.\n\n"
+ "ldA positive integer. ldA >= max(1,m). If zero, the default\n"
+ " value is used.\n\n"
+ "ldB positive integer. ldB >= max(1,m). If zero, the default\n"
+ " value is used.\n\n"
+ "offsetA nonnegative integer\n\n"
+ "offsetB nonnegative integer";
static PyObject* lacpy(PyObject *self, PyObject *args, PyObject *kwrds)
{
@@ -7082,6 +7150,175 @@ static PyObject* lacpy(PyObject *self, PyObject *args, PyObject *kwrds)
}
+static char doc_larfg[] =
+ "Generate an elementary Householder reflector.\n\n"
+ "tau = larfg(alpha, x, n=None, offseta=0, offsetx=0)\n\n"
+ "PURPOSE\n"
+ "Generates a Householder reflector\n\n"
+ " H = I - tau * [1; v] * [1; v]^H\n\n"
+ "such that\n\n"
+ " H^H * [alpha; x] = [beta; 0].\n\n"
+ "In other words,\n\n"
+ " (I - tau.conjugate() * [1; v] * [1; v]^H) * [alpha; x] = "
+ "[beta; 0].\n\n"
+ "The matrix H is unitary, so\n\n"
+ " 2 * tau.real = abs(tau)**2 * ( 1.0 + ||v||**2).\n\n"
+ "On exit x contains the vector v and alpha is overwritten with beta.\n"
+ "The parameter tau is returned as the output value of the function."
+ "\n\n"
+ "ARGUMENTS\n"
+ "alpha 'd' or 'z' matrix. On exit, contains beta.\n\n"
+ "x 'd' or 'z' matrix. Must have the same type as alpha.\n"
+ " On exit, contains v. \n\n"
+ "n postive integer. The dimension of the vector [alpha; x].\n"
+ " If n <= 0, the default value is used, which is equal to\n"
+ " 1 + ( (len(x) - offsetx >= 1) ? len(x) - ox : 0 ).\n\n"
+ "offseta nonnegative integer \n\n"
+ "offsetx nonnegative integer \n\n"
+ "tau scalar of the same type as alpha and x";
+
+static PyObject* larfg(PyObject *self, PyObject *args, PyObject *kwrds)
+{
+ matrix *a, *x;
+ number tau;
+ int n = 0, oa = 0, ox = 0, ix = 1;
+ char *kwlist[] = {"alpha", "x", "n", "offseta", "offsetx", NULL};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OO|iii", kwlist,
+ &a, &x, &n, &oa, &ox)) return NULL;
+
+ if (!Matrix_Check(a)) err_mtrx("alpha");
+ if (!Matrix_Check(x)) err_mtrx("x");
+ if (MAT_ID(a) != MAT_ID(x)) err_conflicting_ids;
+ if (oa < 0) err_nn_int("offseta");
+ if (ox < 0) err_nn_int("offsetx");
+ if (n <= 0) n = 1 + ((len(x) >= ox + 1) ? len(x) - ox : 0);
+ if (len(x) < ox + n - 1) err_buf_len("x");
+ if (len(a) < oa + 1) err_buf_len("alpha");
+
+ switch (MAT_ID(a)){
+ case DOUBLE:
+ Py_BEGIN_ALLOW_THREADS
+ dlarfg_(&n, MAT_BUFD(a)+oa, MAT_BUFD(x)+ox, &ix, &tau.d);
+ Py_END_ALLOW_THREADS
+ return Py_BuildValue("d", tau.d);
+ break;
+
+ case COMPLEX:
+ Py_BEGIN_ALLOW_THREADS
+ zlarfg_(&n, MAT_BUFZ(a)+oa, MAT_BUFZ(x)+ox, &ix, &tau.z);
+ Py_END_ALLOW_THREADS
+ return PyComplex_FromDoubles(creal(tau.z), cimag(tau.z));
+ break;
+
+ default:
+ err_invalid_id;
+ }
+
+ return Py_BuildValue("");
+}
+
+
+static char doc_larfx[] =
+ "Apply an elementary Householder reflector to a matrix.\n\n"
+ "larfx(v, tau, C, side='L', m=C.size[0], n=C.size[1],\n"
+ " ldC=max(1,C.size[0]), offsetv=0, offsetC=0)\n\n"
+ "PURPOSE\n"
+ "Computes H*C (side is 'L') or C*H (side is 'R') where\n\n"
+ " H = I - tau * v * v^H.\n\n"
+ "On exit C is overwritten with the result.\n\n"
+ "ARGUMENTS\n"
+ "v 'd' or 'z' matrix\n\n"
+ "tau number. Can only be complex if v is complex.\n\n"
+ "C 'd' or 'z' matrix of the same type as v\n\n"
+ "side 'L' or 'R'\n\n"
+ "m nonnegative integer. If negative, the default value is \n"
+ " used.\n\n"
+ "n nonnegative integer. If negative, the default value is \n"
+ " used.\n\n"
+ "ldC nonnegative integer. ldC >= max(1,m). If zero, the\n"
+ " default value is used.\n\n"
+ "offsetv nonnegative integer \n\n"
+ "offsetC nonnegative integer";
+
+static PyObject* larfx(PyObject *self, PyObject *args, PyObject *kwrds)
+{
+ matrix *v, *C;
+ PyObject *tauo=NULL;
+ number tau;
+ int m = -1, n = -1, ov = 0, oC = 0, ldC = 0;
+ void *work = NULL;
+#if PY_MAJOR_VERSION >= 3
+ int side_ = 'L';
+#endif
+ char side = 'L';
+ char *kwlist[] = {"v", "tau", "C", "side", "m", "n", "ldC", "offsetv",
+ "offsetC", NULL};
+
+#if PY_MAJOR_VERSION >= 3
+ if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|Ciiiii", kwlist,
+ &v, &tauo, &C, &side_, &m, &n, &ldC, &ov, &oC))
+ return NULL;
+ side = (char) side_;
+#else
+ if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|ciiiii", kwlist,
+ &v, &tauo, &C, &side, &m, &n, &ldC, &ov, &oC))
+ return NULL;
+#endif
+
+ if (!Matrix_Check(v)) err_mtrx("v");
+ if (!Matrix_Check(C)) err_mtrx("C");
+ if (MAT_ID(v) != MAT_ID(C)) err_conflicting_ids;
+ if (tauo && number_from_pyobject(tauo, &tau, MAT_ID(v)))
+ err_type("tau")
+
+ if (side != 'L' && side != 'R') err_char("side", "'L', 'R'");
+
+ if (m < 0) m = C->nrows;
+ if (n < 0) n = C->ncols;
+
+ if (ov < 0) err_nn_int("offsetv");
+ if ((side == 'L' && len(v) - ov < m) ||
+ (side == 'R' && len(v) - ov < n)) err_buf_len("v")
+
+ if (ldC == 0) ldC = MAX(1, C->nrows);
+ if (ldC < MAX(1,m)) err_ld("ldC");
+ if (oC < 0) err_nn_int("offsetC");
+ if (oC + (n-1)*ldC + m > len(C)) err_buf_len("C");
+
+
+ switch (MAT_ID(v)){
+ case DOUBLE:
+ if (!(work = (void *) calloc((side == 'L') ? n : m,
+ sizeof(double))))
+ return PyErr_NoMemory();
+ Py_BEGIN_ALLOW_THREADS
+ dlarfx_(&side, &m, &n, MAT_BUFD(v)+ov, &tau.d,
+ MAT_BUFD(C) + oC, &ldC, (double *) work);
+ Py_END_ALLOW_THREADS
+ free(work);
+ break;
+
+ case COMPLEX:
+ if (!(work = (void *) calloc((side == 'L') ? n : m,
+ sizeof(double complex))))
+ return PyErr_NoMemory();
+ Py_BEGIN_ALLOW_THREADS
+ zlarfx_(&side, &m, &n, MAT_BUFZ(v)+ov, &tau.z,
+ MAT_BUFZ(C) + oC, &ldC, (double complex *) work);
+ Py_END_ALLOW_THREADS
+ free(work);
+ break;
+
+ default:
+ err_invalid_id;
+ }
+
+ return Py_BuildValue("");
+}
+
+
+
static PyMethodDef lapack_functions[] = {
{"getrf", (PyCFunction) getrf, METH_VARARGS|METH_KEYWORDS, doc_getrf},
{"getrs", (PyCFunction) getrs, METH_VARARGS|METH_KEYWORDS, doc_getrs},
@@ -7141,6 +7378,8 @@ static PyMethodDef lapack_functions[] = {
{"gges", (PyCFunction) gges, METH_VARARGS|METH_KEYWORDS, doc_gges},
{"lacpy", (PyCFunction) lacpy, METH_VARARGS|METH_KEYWORDS, doc_lacpy},
{"geqp3", (PyCFunction) geqp3, METH_VARARGS|METH_KEYWORDS, doc_geqp3},
+{"larfg", (PyCFunction) larfg, METH_VARARGS|METH_KEYWORDS, doc_larfg},
+{"larfx", (PyCFunction) larfx, METH_VARARGS|METH_KEYWORDS, doc_larfx},
{NULL} /* Sentinel */
};
diff --git a/src/C/misc.h b/src/C/misc.h
index 68292b4..ec01c83 100644
--- a/src/C/misc.h
+++ b/src/C/misc.h
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -31,7 +32,7 @@
typedef union {
double d;
int_t i;
- complex z;
+ double complex z;
} number;
#endif
diff --git a/src/C/misc_solvers.c b/src/C/misc_solvers.c
index 11d6633..16f2447 100644
--- a/src/C/misc_solvers.c
+++ b/src/C/misc_solvers.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/C/sparse.c b/src/C/sparse.c
index 93be88d..feef5b3 100644
--- a/src/C/sparse.c
+++ b/src/C/sparse.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -31,6 +32,7 @@
extern const int E_SIZE[];
extern const char TC_CHAR[][2];
extern number One[3], MinusOne[3], Zero[3];
+extern int intOne;
extern void (*write_num[])(void *, int, void *, int) ;
extern int (*convert_num[])(void *, void *, int, int_t) ;
@@ -45,12 +47,10 @@ extern int get_id(void *, int ) ;
extern PyTypeObject matrix_tp ;
extern matrix * Matrix_NewFromMatrix(matrix *, int) ;
extern matrix * Matrix_NewFromSequence(PyObject *, int) ;
-#if PY_MAJOR_VERSION < 3
-extern matrix * Matrix_NewFromArrayStruct(PyObject *, int, int_t *) ;
-#endif
-extern matrix * Matrix_NewFromNumber(int_t , int_t , int_t , void *, int ) ;
+extern matrix * Matrix_NewFromPyBuffer(PyObject *, int, int *) ;
+extern matrix * Matrix_NewFromNumber(int , int , int , void *, int ) ;
extern matrix * create_indexlist(int, PyObject *) ;
-extern matrix * Matrix_New(int_t, int_t, int) ;
+extern matrix * Matrix_New(int, int, int) ;
extern matrix * dense(spmatrix *) ;
extern PyObject * matrix_add(PyObject *, PyObject *) ;
extern PyObject * matrix_sub(PyObject *, PyObject *) ;
@@ -120,7 +120,7 @@ static int comp_double(const void *x, const void *y) {
}
typedef struct {
- int_t key; complex value;
+ int_t key; double complex value;
} complex_list;
static int comp_complex(const void *x, const void *y) {
@@ -159,16 +159,16 @@ convert_array(void *dest, void *src, int dest_id, int src_id, int n) {
} else {
if (src_id == INT) {
for (i=0; i<n; i++)
- ((complex *)dest)[i] = ((int *)src)[i];
+ ((double complex *)dest)[i] = ((int *)src)[i];
} else {
for (i=0; i<n; i++)
- ((complex *)dest)[i] = ((double *)src)[i];
+ ((double complex *)dest)[i] = ((double *)src)[i];
}
}
return 0;
}
-ccs * alloc_ccs(int_t nrows, int_t ncols, int nnz, int id)
+ccs * alloc_ccs(int_t nrows, int_t ncols, int_t nnz, int id)
{
ccs *obj = malloc(sizeof(ccs));
if (!obj) return NULL;
@@ -197,7 +197,7 @@ void free_ccs(ccs *obj) {
}
static int
-realloc_ccs(ccs *obj, int nnz) {
+realloc_ccs(ccs *obj, int_t nnz) {
int_t *rowind;
void *values;
@@ -210,8 +210,8 @@ realloc_ccs(ccs *obj, int nnz) {
if ((values = realloc(obj->values, nnz*E_SIZE[obj->id])))
obj->values = values;
else
-
return 0;
+
return 1;
}
@@ -248,7 +248,7 @@ spmatrix *SpMatrix_NewFromMatrix(matrix *src, int id)
}
}
- if (!(A = SpMatrix_New(MAT_NROWS(src), MAT_NCOLS(src), nnz, id)))
+ if (!(A = SpMatrix_New(MAT_NROWS(src), MAT_NCOLS(src), (int_t)nnz, id)))
return (spmatrix *)PyErr_NoMemory();
int cnt = 0;
@@ -275,10 +275,11 @@ spmatrix *SpMatrix_NewFromMatrix(matrix *src, int id)
spmatrix * sparse_concat(PyObject *L, int id_arg)
{
- int m=0, n=0, mk=0, nk=0, i=0, j, id=0, nnz=0;
+ int id=0;
+ int_t m=0, n=0, mk=0, nk=0, i=0, j, nnz=0;
PyObject *col;
- int single_col = (PyList_GET_SIZE(L) > 0 &&
+ int_t single_col = (PyList_GET_SIZE(L) > 0 &&
!PyList_Check(PyList_GET_ITEM(L, 0)));
for (j=0; j<(single_col ? 1 : PyList_GET_SIZE(L)); j++) {
@@ -293,7 +294,7 @@ spmatrix * sparse_concat(PyObject *L, int id_arg)
if (!Matrix_Check(Lij) && !SpMatrix_Check(Lij) && !PY_NUMBER(Lij))
PY_ERR_TYPE("invalid type in list");
- int blk_nrows, blk_ncols;
+ int_t blk_nrows, blk_ncols;
if (Matrix_Check(Lij) || SpMatrix_Check(Lij)) {
blk_nrows = X_NROWS(Lij); blk_ncols = X_NCOLS(Lij);
id = MAX(id, X_ID(Lij));
@@ -318,7 +319,7 @@ spmatrix * sparse_concat(PyObject *L, int id_arg)
}
}
} else if (SpMatrix_Check(Lij)) {
- int ik, jk;
+ int_t ik, jk;
for (jk=0; jk<SP_NCOLS(Lij); jk++) {
for (ik=SP_COL(Lij)[jk]; ik<SP_COL(Lij)[jk+1]; ik++) {
@@ -351,20 +352,20 @@ spmatrix * sparse_concat(PyObject *L, int id_arg)
spmatrix *A = SpMatrix_New(m, n, nnz, id);
if (!A) return (spmatrix *)PyErr_NoMemory();
- int ik = 0, jk, cnt = 0;
+ int_t ik = 0, jk, cnt = 0;
nk = 0;
for (j=0; j<(single_col ? 1 : PyList_GET_SIZE(L)); j++) {
col = (single_col ? L : PyList_GET_ITEM(L, j));
if (PyList_GET_SIZE(col) > 0) {
- int tmp = (PY_NUMBER(PyList_GET_ITEM(col, 0)) ? 1 :
+ int_t tmp = (PY_NUMBER(PyList_GET_ITEM(col, 0)) ? 1 :
X_NCOLS(PyList_GET_ITEM(col, 0)));
for (jk=0; jk<tmp; jk++) {
mk = 0;
- int blk_nrows = 0, blk_ncols = 0;
+ int_t blk_nrows = 0, blk_ncols = 0;
for (i=0; i<PyList_GET_SIZE(col); i++) {
PyObject *Lij = PyList_GET_ITEM(col, i);
@@ -465,9 +466,9 @@ static ccs * transpose(ccs *A, int conjugate) {
else
for (j=A->colptr[i]; j<A->colptr[i+1]; j++) {
B->rowind[ B->colptr[A->rowind[j]] + buf[A->rowind[j]] ] = i;
- ((complex *)B->values)[B->colptr[A->rowind[j]]+buf[A->rowind[j]]++] =
- (conjugate ? conj(((complex *)A->values)[j]) :
- ((complex *)A->values)[j]);
+ ((double complex *)B->values)[B->colptr[A->rowind[j]]+buf[A->rowind[j]]++] =
+ (conjugate ? conj(((double complex *)A->values)[j]) :
+ ((double complex *)A->values)[j]);
}
}
free(buf);
@@ -549,7 +550,7 @@ static void init_spa(spa *s, ccs *X, int col) {
} else if (X && X->id == COMPLEX) {
for (i=X->colptr[col]; i<X->colptr[col+1]; i++) {
s->nz[X->rowind[i]] = 1;
- ((complex *)s->val)[X->rowind[i]] = ((complex *)X->values)[i];
+ ((double complex *)s->val)[X->rowind[i]] = ((double complex *)X->values)[i];
s->idx[s->nnz++] = X->rowind[i];
}
}
@@ -567,12 +568,12 @@ spa_daxpy_partial (double a, ccs *X, int col, spa *y) {
}
static inline void
-spa_zaxpy_partial (complex a, ccs *X, int col, spa *y) {
+spa_zaxpy_partial (double complex a, ccs *X, int col, spa *y) {
int i;
for (i=X->colptr[col]; i<X->colptr[col+1]; i++) {
if (y->nz[X->rowind[i]]) {
- ((complex *)y->val)[X->rowind[i]] += a*((complex *)X->values)[i];
+ ((double complex *)y->val)[X->rowind[i]] += a*((double complex *)X->values)[i];
}
}
}
@@ -592,18 +593,18 @@ static inline void spa_daxpy (double a, ccs *X, int col, spa *y) {
}
}
-static inline void spa_zaxpy (complex a, ccs *X, char conjx, int col, spa *y)
+static inline void spa_zaxpy (double complex a, ccs *X, char conjx, int col, spa *y)
{
int i;
for (i=X->colptr[col]; i<X->colptr[col+1]; i++) {
if (y->nz[X->rowind[i]]) {
- ((complex *)y->val)[X->rowind[i]] +=
- a*CONJ(conjx,((complex *)X->values)[i]);
+ ((double complex *)y->val)[X->rowind[i]] +=
+ a*CONJ(conjx,((double complex *)X->values)[i]);
}
else {
- ((complex *)y->val)[X->rowind[i]] =
- a*CONJ(conjx,((complex *)X->values)[i]);
+ ((double complex *)y->val)[X->rowind[i]] =
+ a*CONJ(conjx,((double complex *)X->values)[i]);
y->nz[X->rowind[i]] = 1;
y->idx[y->nnz++] = X->rowind[i];
}
@@ -630,17 +631,17 @@ spa_daxpy_uplo (double a, ccs *X, int col, spa *y, int j, char uplo) {
}
static inline void
-spa_zaxpy_uplo (complex a, ccs *X, int col, spa *y, int j, char uplo) {
+spa_zaxpy_uplo (double complex a, ccs *X, int col, spa *y, int j, char uplo) {
int i;
for (i=X->colptr[col]; i<X->colptr[col+1]; i++) {
if ((uplo == 'U' && X->rowind[i] <= j) ||
(uplo == 'L' && X->rowind[i] >= j)) {
if (y->nz[X->rowind[i]]) {
- ((complex *)y->val)[X->rowind[i]] += a*((complex *)X->values)[i];
+ ((double complex *)y->val)[X->rowind[i]] += a*((double complex *)X->values)[i];
}
else {
- ((complex *)y->val)[X->rowind[i]] = a*((complex *)X->values)[i];
+ ((double complex *)y->val)[X->rowind[i]] = a*((double complex *)X->values)[i];
y->nz[X->rowind[i]] = 1;
y->idx[y->nnz++] = X->rowind[i];
}
@@ -682,13 +683,13 @@ static inline double spa_ddot (ccs *X, int col, spa *y) {
}
static inline
-complex spa_zdot (ccs *X, int col, spa *y, char conjx, char conjy) {
+double complex spa_zdot (ccs *X, int col, spa *y, char conjx, char conjy) {
int i;
- complex a = 0;
+ double complex a = 0;
for (i=X->colptr[col]; i<X->colptr[col+1]; i++)
if (y->nz[X->rowind[i]])
- a += CONJ(conjx, ((complex *)X->values)[i])*
- CONJ(conjy,((complex *)y->val)[X->rowind[i]]);
+ a += CONJ(conjx, ((double complex *)X->values)[i])*
+ CONJ(conjy,((double complex *)y->val)[X->rowind[i]]);
return a;
}
@@ -706,7 +707,7 @@ static void spa2compressed(spa *s, ccs *A, int col) {
case COMPLEX:
for (i=A->colptr[col]; i<A->colptr[col+1]; i++) {
A->rowind[i] = s->idx[k];
- ((complex *)A->values)[i] = ((complex *)s->val)[s->idx[k++]];
+ ((double complex *)A->values)[i] = ((double complex *)s->val)[s->idx[k++]];
}
break;
}
@@ -790,12 +791,14 @@ static int sp_daxpy(number a, void *x, void *y, int sp_x, int sp_y,
double *X = x;
ccs *Y = y;
- int mn = Y->nrows*Y->ncols;
+ int_t mn = Y->nrows*Y->ncols;
ccs *Z = alloc_ccs(Y->nrows, Y->ncols, mn, Y->id);
if (!Z) return -1;
memcpy(Z->values, X, sizeof(double)*mn);
- scal[Y->id](&mn, &a, Z->values, (int *)&One[INT]);
+
+ int mn_int = (int) mn;
+ scal[Y->id](&mn_int, &a, Z->values, &intOne);
int j, k;
for (j=0; j<Y->ncols; j++) {
@@ -821,11 +824,11 @@ static int sp_zaxpy(number a, void *x, void *y, int sp_x, int sp_y,
if (sp_x && !sp_y) {
ccs *X = x;
- complex *Y = y;
+ double complex *Y = y;
for (j=0; j<X->ncols; j++) {
for (k=X->colptr[j]; k<X->colptr[j+1]; k++)
- Y[X->rowind[k] + j*X->nrows] += a.z*(((complex *)X->values)[k]);
+ Y[X->rowind[k] + j*X->nrows] += a.z*(((double complex *)X->values)[k]);
}
}
else if (sp_x && sp_y && partial) {
@@ -864,7 +867,7 @@ static int sp_zaxpy(number a, void *x, void *y, int sp_x, int sp_y,
free_spa(s);
Z->rowind = realloc(Z->rowind, Z->colptr[n]*sizeof(int_t));
- Z->values = realloc(Z->values, Z->colptr[n]*sizeof(complex));
+ Z->values = realloc(Z->values, Z->colptr[n]*sizeof(double complex));
ccs *Zt = transpose(Z, 0);
free_ccs(Z);
@@ -877,26 +880,28 @@ static int sp_zaxpy(number a, void *x, void *y, int sp_x, int sp_y,
}
else if (!sp_x && sp_y && partial)
{
- complex *X = x;
+ double complex *X = x;
ccs *Y = y;
int kY, jY;
for (jY=0; jY<Y->ncols; jY++) {
for (kY=Y->colptr[jY]; kY<Y->colptr[jY+1]; kY++)
- ((complex *)Y->values)[kY] += a.z*X[jY*Y->nrows + Y->rowind[kY]];
+ ((double complex *)Y->values)[kY] += a.z*X[jY*Y->nrows + Y->rowind[kY]];
}
}
else { // if (!p_x && !sp_y) {
- complex *X = x;
+ double complex *X = x;
ccs *Y = y;
- int mn = Y->nrows*Y->ncols;
+ int_t mn = Y->nrows*Y->ncols;
ccs *Z = alloc_ccs(Y->nrows, Y->ncols, mn, Y->id);
if (!Z) return -1;
- memcpy(Z->values, X, sizeof(complex)*mn);
- scal[Y->id](&mn, &a, Z->values, (int *)&One[INT]);
+ memcpy(Z->values, X, sizeof(double complex)*mn);
+
+ int mn_int = (int) mn;
+ scal[Y->id](&mn_int, &a, Z->values, &intOne);
int j, k;
for (j=0; j<Y->ncols; j++) {
@@ -907,8 +912,8 @@ static int sp_zaxpy(number a, void *x, void *y, int sp_x, int sp_y,
Z->rowind[j*Y->nrows+k] = k;
for (k=Y->colptr[j]; k<Y->colptr[j+1]; k++)
- ((complex *)Z->values)[j*Y->nrows + Y->rowind[k]] +=
- ((complex *)Y->values)[k];
+ ((double complex *)Z->values)[j*Y->nrows + Y->rowind[k]] +=
+ ((double complex *)Y->values)[k];
}
*z = Z;
}
@@ -952,7 +957,7 @@ static int sp_zgemv(char tA, int m, int n, number alpha, void *a, int oA,
void *x, int ix, number beta, void *y, int iy)
{
ccs *A = a;
- complex *X = x, *Y = y;
+ double complex *X = x, *Y = y;
scal[A->id]((tA == 'N' ? &m : &n), &beta, Y, &iy);
@@ -964,7 +969,7 @@ static int sp_zgemv(char tA, int m, int n, number alpha, void *a, int oA,
for (k=A->colptr[j]; k<A->colptr[j+1]; k++)
if ((A->rowind[k] >= oi) && (A->rowind[k] < oi+m))
Y[iy*(A->rowind[k]-oi + (iy > 0 ? 0 : 1 - m))] +=
- alpha.z*((complex *)A->values)[k]*
+ alpha.z*((double complex *)A->values)[k]*
X[ix*(j-oj + (ix > 0 ? 0 : 1 - n))];
}
} else {
@@ -972,7 +977,7 @@ static int sp_zgemv(char tA, int m, int n, number alpha, void *a, int oA,
for (k=A->colptr[i]; k<A->colptr[i+1]; k++) {
if ((A->rowind[k] >= oi) && (A->rowind[k] < oi+m))
Y[iy*(i-oj + (iy > 0 ? 0 : 1 - n))] += alpha.z*
- CONJ(tA, ((complex *)A->values)[k])*
+ CONJ(tA, ((double complex *)A->values)[k])*
X[ix*(A->rowind[k]-oi + (ix > 0 ? 0 : 1 - m))];
}
}
@@ -1020,7 +1025,7 @@ int sp_dsymv(char uplo, int n, number alpha, ccs *A, int oA, void *x, int ix,
int sp_zsymv(char uplo, int n, number alpha, ccs *A, int oA, void *x, int ix,
number beta, void *y, int iy)
{
- complex *X = x, *Y = y;
+ double complex *X = x, *Y = y;
scal[A->id](&n, &beta, y, &iy);
if (!n) return 0;
@@ -1034,17 +1039,17 @@ int sp_zsymv(char uplo, int n, number alpha, ccs *A, int oA, void *x, int ix,
if ((uplo == 'U') && (i > j))
break;
if ((uplo == 'U') && (i <= j)) {
- Y[iy*(i + (iy > 0 ? 0 : 1-n))] += alpha.z*((complex *)A->values)[k]*
+ Y[iy*(i + (iy > 0 ? 0 : 1-n))] += alpha.z*((double complex *)A->values)[k]*
X[ix*(j + (ix > 0 ? 0 : 1-n))];
if (i != j)
- Y[iy*(j+(iy>0 ? 0 : 1-n))] += alpha.z*((complex *)A->values)[k]*
+ Y[iy*(j+(iy>0 ? 0 : 1-n))] += alpha.z*((double complex *)A->values)[k]*
X[ix*(i + (ix > 0 ? 0 : 1-n))];
}
else if ((uplo == 'L') && (i >= j)) {
- Y[iy*(i + (iy > 0 ? 0 : 1-n))] += alpha.z*((complex *)A->values)[k]*
+ Y[iy*(i + (iy > 0 ? 0 : 1-n))] += alpha.z*((double complex *)A->values)[k]*
X[ix*(j + (ix > 0 ? 0 : 1-n))];
if (i != j)
- Y[iy*(j+(iy > 0 ? 0 : 1-n))] += alpha.z*((complex *)A->values)[k]*
+ Y[iy*(j+(iy > 0 ? 0 : 1-n))] += alpha.z*((double complex *)A->values)[k]*
X[ix*(i + (ix > 0 ? 0 : 1-n))];
}
}
@@ -1110,7 +1115,7 @@ static int sp_dgemm(char tA, char tB, number alpha, void *a, void *b,
colptr_new[j+1] = colptr_new[j] + s->nnz;
}
- int nnz = colptr_new[n];
+ int_t nnz = colptr_new[n];
ccs *Z = alloc_ccs(m, n, MAX(nnz,CCS_NNZ(C)), C->id);
if (!Z) {
if (A != a) free_ccs(A);
@@ -1155,7 +1160,7 @@ static int sp_dgemm(char tA, char tB, number alpha, void *a, void *b,
}
int mn = m*n;
- scal[A->id](&mn, &beta, C, (int *)&One[INT]);
+ scal[A->id](&mn, &beta, C, &intOne);
int j, l;
for (j=0; j<n; j++) {
@@ -1179,13 +1184,13 @@ static int sp_dgemm(char tA, char tB, number alpha, void *a, void *b,
ccs *B = (tB == 'N' ? b : transpose(b, 0));
int j, l, mn_ = m*n;
- scal[DOUBLE](&mn_, &beta, C, (int *)&One[INT]);
+ scal[DOUBLE](&mn_, &beta, C, &intOne);
for (j=0; j<n; j++) {
for (l=B->colptr[j]; l<B->colptr[j+1]; l++) {
double a_ = alpha.d*((double *)B->values)[l];
axpy[DOUBLE](&m, &a_, A + (tA=='N' ? B->rowind[l]*m : B->rowind[l]),
- (tA=='N' ? (int *)&One[INT] : &k), C + j*m, (int *)&One[INT]);
+ (tA=='N' ? &intOne : &k), C + j*m, &intOne);
}
}
if (B != b) free_ccs(B);
@@ -1197,7 +1202,7 @@ static int sp_dgemm(char tA, char tB, number alpha, void *a, void *b,
double *B = b, *C = c;
int j, l, mn_ = m*n, ib = (tB == 'N' ? k : 1);
- scal[DOUBLE](&mn_, &beta, C, (int *)&One[INT]);
+ scal[DOUBLE](&mn_, &beta, C, &intOne);
for (j=0; j<A->ncols; j++) {
for (l=A->colptr[j]; l<A->colptr[j+1]; l++) {
@@ -1248,7 +1253,7 @@ static int sp_dgemm(char tA, char tB, number alpha, void *a, void *b,
colptr_new[j+1] = colptr_new[j] +
MAX(((B->colptr[j+1]-B->colptr[j])>0)*m, C->colptr[j+1]-C->colptr[j]);
- int nnz = colptr_new[n];
+ int_t nnz = colptr_new[n];
ccs *Z = alloc_ccs(m, n, nnz, C->id);
if (!Z) {
if (B != b) free_ccs(B);
@@ -1269,8 +1274,8 @@ static int sp_dgemm(char tA, char tB, number alpha, void *a, void *b,
double a_ = alpha.d*((double *)B->values)[k];
axpy[DOUBLE](&m, &a_, A +
(tA=='N' ? B->rowind[k]*m : B->rowind[k]),
- (tA=='N' ? (int *)&One[INT] : &k),
- (double *)Z->values + Z->colptr[j], (int *)&One[INT]);
+ (tA=='N' ? &intOne : &k),
+ (double *)Z->values + Z->colptr[j], &intOne);
}
if (beta.d != 0.0) {
@@ -1337,7 +1342,7 @@ static int sp_dgemm(char tA, char tB, number alpha, void *a, void *b,
colptr_new[j+1] = colptr_new[j] + s->nnz;
}
- int nnz = colptr_new[n];
+ int_t nnz = colptr_new[n];
ccs *Z = alloc_ccs(m, n, nnz, C->id);
if (!Z) {
if (A != a) free_ccs(A);
@@ -1440,8 +1445,8 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
for (j=0; j<n; j++) {
for (l=C->colptr[j]; l<C->colptr[j+1]; l++) {
init_spa(s, A, C->rowind[l]);
- ((complex *)C->values)[l] = alpha.z*spa_zdot(B, j, s, tB, tA) +
- beta.z*((complex *)C->values)[l];
+ ((double complex *)C->values)[l] = alpha.z*spa_zdot(B, j, s, tB, tA) +
+ beta.z*((double complex *)C->values)[l];
}
}
free_spa(s);
@@ -1476,7 +1481,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
colptr_new[j+1] = colptr_new[j] + s->nnz;
}
- int nnz = colptr_new[n];
+ int_t nnz = colptr_new[n];
ccs *Z = alloc_ccs(m, n, nnz, A->id);
if (!Z) {
if (A != a) free_ccs(A);
@@ -1492,7 +1497,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
spa_zaxpy (beta.z, C, 'N', j, s);
for (l=B->colptr[j]; l<B->colptr[j+1]; l++)
- spa_zaxpy(alpha.z*CONJ(tB, ((complex *)B->values)[l]), A, tA, B->rowind[l], s);
+ spa_zaxpy(alpha.z*CONJ(tB, ((double complex *)B->values)[l]), A, tA, B->rowind[l], s);
spa2compressed(s, Z, j);
}
@@ -1511,7 +1516,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
ccs *A = (tA == 'N' ? a : transpose(a, 0));
ccs *B = (tB == 'N' ? b : transpose(b, 0));
- complex *C = c;
+ double complex *C = c;
spa *s = alloc_spa(A->nrows, A->id);
if (!s) {
@@ -1521,17 +1526,17 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
}
int mn = m*n;
- scal[A->id](&mn, &beta, C, (int *)&One[COMPLEX]);
+ scal[A->id](&mn, &beta, C, &intOne);
int j, l;
for (j=0; j<n; j++) {
init_spa(s, NULL, 0);
for (l=B->colptr[j]; l<B->colptr[j+1]; l++)
- spa_zaxpy (CONJ(tB,((complex *)B->values)[l]), A, tA, B->rowind[l], s);
+ spa_zaxpy (CONJ(tB,((double complex *)B->values)[l]), A, tA, B->rowind[l], s);
for (l=0; l<s->nnz; l++)
- C[j*A->nrows + s->idx[l]] += alpha.z*((complex *)s->val)[s->idx[l]];
+ C[j*A->nrows + s->idx[l]] += alpha.z*((double complex *)s->val)[s->idx[l]];
}
free_spa(s);
@@ -1541,11 +1546,11 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
else if (!sp_a && sp_b && !sp_c) {
- complex *A = a, *C = c;
+ double complex *A = a, *C = c;
ccs *B = (tB == 'N' ? b : transpose(b, 0));
int i, j, l, mn_ = m*n;
- scal[COMPLEX](&mn_, &beta, C, (int *)&One[COMPLEX]);
+ scal[COMPLEX](&mn_, &beta, C, &intOne);
for (j=0; j<n; j++) {
for (l=B->colptr[j]; l<B->colptr[j+1]; l++) {
@@ -1553,7 +1558,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
for (i=0; i<m; i++)
C[i+j*m] += alpha.z*CONJ(tA,A[tA=='N' ? i+B->rowind[l]*m :
B->rowind[l]+i*k])*
- CONJ(tB,((complex *)B->values)[l]);
+ CONJ(tB,((double complex *)B->values)[l]);
}
}
if (B != b) free_ccs(B);
@@ -1562,16 +1567,16 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
else if (sp_a && !sp_b && !sp_c) {
ccs *A = (tA == 'N' ? a : transpose(a, 0));
- complex *B = b, *C = c;
+ double complex *B = b, *C = c;
int i, j, l, mn_ = m*n;
- scal[COMPLEX](&mn_, &beta, C, (int *)&One[INT]);
+ scal[COMPLEX](&mn_, &beta, C, &intOne);
for (j=0; j<A->ncols; j++) {
for (l=A->colptr[j]; l<A->colptr[j+1]; l++) {
for (i=0; i<n; i++)
- C[A->rowind[l]+i*m] += alpha.z*CONJ(tA,((complex *)A->values)[l])*
+ C[A->rowind[l]+i*m] += alpha.z*CONJ(tA,((double complex *)A->values)[l])*
CONJ(tB,B[tB=='N' ? j+i*k : i+j*n]);
}
}
@@ -1580,7 +1585,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
else if (!sp_a && sp_b && sp_c && partial) {
- complex *A = a, val;
+ double complex *A = a, val;
ccs *B = (tB == 'N' ? b : transpose(b, 0)), *C = c;
int j, l, o;
@@ -1591,17 +1596,17 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
for (l=B->colptr[j]; l < B->colptr[j+1]; l++)
val += CONJ(tA,A[tA == 'N' ? C->rowind[o] + B->rowind[l]*m :
B->rowind[l] + C->rowind[o]*B->nrows])*
- CONJ(tB,((complex *)B->values)[l]);
+ CONJ(tB,((double complex *)B->values)[l]);
- ((complex *)C->values)[o] = alpha.z*val +
- beta.z*((complex *)C->values)[o];
+ ((double complex *)C->values)[o] = alpha.z*val +
+ beta.z*((double complex *)C->values)[o];
}
}
if (B != b) free_ccs(B);
}
else if (!sp_a && sp_b && sp_c && !partial) {
- complex *A = a;
+ double complex *A = a;
ccs *B = (tB == 'N' ? b : transpose(b,0)), *C = c;
int_t *colptr_new = calloc(C->ncols+1,sizeof(int_t));
@@ -1616,7 +1621,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
colptr_new[j+1] = colptr_new[j] +
MAX(((B->colptr[j+1]-B->colptr[j])>0)*m, C->colptr[j+1]-C->colptr[j]);
- int nnz = colptr_new[n];
+ int_t nnz = colptr_new[n];
ccs *Z = alloc_ccs(m, n, nnz, C->id);
if (!Z) {
if (B != b) free_ccs(B);
@@ -1624,7 +1629,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
return -1;
}
free(Z->colptr); Z->colptr = colptr_new;
- for (l=0; l<nnz; l++) ((complex *)Z->values)[l] = 0;
+ for (l=0; l<nnz; l++) ((double complex *)Z->values)[l] = 0;
for (j=0; j<C->ncols; j++) {
@@ -1635,9 +1640,9 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
for (l=B->colptr[j]; l<B->colptr[j+1]; l++) {
for (i=0; i<m; i++) {
- ((complex*)Z->values)[Z->colptr[j]+i] += alpha.z*
+ ((double complex*)Z->values)[Z->colptr[j]+i] += alpha.z*
CONJ(tA,A[tA=='N' ? B->rowind[l]*m+i : B->rowind[l]+i*k])*
- CONJ(tB,((complex *)B->values)[l]);
+ CONJ(tB,((double complex *)B->values)[l]);
}
}
@@ -1645,14 +1650,14 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
if (beta.z != 0.0) {
if (Z->colptr[j+1]-Z->colptr[j] == m) {
for (l=C->colptr[j]; l<C->colptr[j+1]; l++) {
- ((complex *)Z->values)[Z->colptr[j]+C->rowind[l]] +=
- beta.z*((complex *)C->values)[l];
+ ((double complex *)Z->values)[Z->colptr[j]+C->rowind[l]] +=
+ beta.z*((double complex *)C->values)[l];
}
}
else {
for (l=C->colptr[j]; l<C->colptr[j+1]; l++) {
- ((complex *)Z->values)[Z->colptr[j]+l-C->colptr[j]] =
- beta.z*((complex *)C->values)[l];
+ ((double complex *)Z->values)[Z->colptr[j]+l-C->colptr[j]] =
+ beta.z*((double complex *)C->values)[l];
Z->rowind[Z->colptr[j]+l-C->colptr[j]] = C->rowind[l];
}
}
@@ -1664,7 +1669,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
else if (sp_a && !sp_b && sp_c && partial) {
ccs *A = (tA == 'N' ? transpose(a,0) : a), *C = c;
- complex *B = b, val;
+ double complex *B = b, val;
int j, l, o;
for (j=0; j<n; j++) {
@@ -1672,12 +1677,12 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
val = 0;
for (l=A->colptr[C->rowind[o]]; l < A->colptr[C->rowind[o]+1]; l++)
- val += CONJ(tA, ((complex *)A->values)[l])*
+ val += CONJ(tA, ((double complex *)A->values)[l])*
CONJ(tB, B[tB == 'N' ? j*A->nrows + A->rowind[l] :
A->rowind[l]*C->ncols + j]);
- ((complex *)C->values)[o] = alpha.z*val +
- beta.z*((complex *)C->values)[o];
+ ((double complex *)C->values)[o] = alpha.z*val +
+ beta.z*((double complex *)C->values)[o];
}
}
if (A != a) free_ccs(A);
@@ -1685,7 +1690,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
else if (sp_a && !sp_b && sp_c && !partial) {
ccs *A = (tA == 'N' ? a : transpose(a,0)), *C = c;
- complex *B = b;
+ double complex *B = b;
spa *s = alloc_spa(A->nrows, A->id);
int_t *colptr_new = calloc(n+1,sizeof(int_t));
@@ -1706,7 +1711,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
colptr_new[j+1] = colptr_new[j] + s->nnz;
}
- int nnz = colptr_new[n];
+ int_t nnz = colptr_new[n];
ccs *Z = alloc_ccs(m, n, nnz, C->id);
if (!Z) {
if (A != a) free_ccs(A);
@@ -1735,7 +1740,7 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
}
else if (!sp_a && !sp_b && sp_c && partial) {
ccs *C = c;
- complex *A = a, *B = b, val;
+ double complex *A = a, *B = b, val;
int j, l, o;
for (j=0; j<C->ncols; j++) {
@@ -1746,21 +1751,21 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
val += CONJ(tA, A[tA=='N' ? m*l+C->rowind[o] : l+C->rowind[o]*k])*
CONJ(tB, B[tB == 'N' ? j*k + l : l*n + j]);
- ((complex *)C->values)[o] = alpha.z*val +
- beta.z*((complex *)C->values)[o];
+ ((double complex *)C->values)[o] = alpha.z*val +
+ beta.z*((double complex *)C->values)[o];
}
}
}
else if (!sp_a && !sp_b && sp_c && !partial) {
- complex *A = a, *B = b;
+ double complex *A = a, *B = b;
ccs *C = c;
ccs *Z = alloc_ccs(m, n, m*n, C->id);
if (!Z) return -1;
int j, l;
- for (j=0; j<m*n; j++) ((complex *)Z->values)[j] = 0.0;
+ for (j=0; j<m*n; j++) ((double complex *)Z->values)[j] = 0.0;
int ldA = MAX(1, (tA == 'N' ? m : k));
int ldB = MAX(1, (tB == 'N' ? k : n));
@@ -1779,8 +1784,8 @@ static int sp_zgemm(char tA, char tB, number alpha, void *a, void *b,
if (beta.z != 0.0) {
for (j=0; j<n; j++) {
for (l=C->colptr[j]; l<C->colptr[j+1]; l++) {
- ((complex *)Z->values)[j*m + C->rowind[l]] +=
- beta.z*((complex *)C->values)[l];
+ ((double complex *)Z->values)[j*m + C->rowind[l]] +=
+ beta.z*((double complex *)C->values)[l];
}
}
}
@@ -1842,7 +1847,7 @@ static int sp_dsyrk(char uplo, char trans, number alpha, void *a,
colptr_new[j+1] = colptr_new[j] + s->nnz;
}
- int nnz = colptr_new[C->ncols];
+ int_t nnz = colptr_new[C->ncols];
ccs *Z = alloc_ccs(C->nrows, C->ncols, nnz, C->id);
if (!Z) {
if (A != a) free_ccs(A);
@@ -1899,7 +1904,7 @@ static int sp_dsyrk(char uplo, char trans, number alpha, void *a,
if (uplo == 'U') {
int m = j+1;
- scal[DOUBLE](&m, &beta, C + j*n, (int *)&One[INT]);
+ scal[DOUBLE](&m, &beta, C + j*n, &intOne);
for (k=0; k<s->nnz; k++) {
if (s->idx[k] <= j)
@@ -1907,7 +1912,7 @@ static int sp_dsyrk(char uplo, char trans, number alpha, void *a,
}
} else {
int m = n-j;
- scal[DOUBLE](&m, &beta, C + j*(n+1), (int *)&One[INT]);
+ scal[DOUBLE](&m, &beta, C + j*(n+1), &intOne);
for (k=0; k<s->nnz; k++) {
if (s->idx[k] >= j)
@@ -1953,7 +1958,7 @@ static int sp_dsyrk(char uplo, char trans, number alpha, void *a,
for (j=0; j<n; j++)
colptr_new[j+1] = colptr_new[j] + (uplo == 'U' ? j+1 : n-j);
- int nnz = colptr_new[n];
+ int_t nnz = colptr_new[n];
ccs *Z = alloc_ccs(n, n, nnz, C->id);
if (!Z) {
free(C_); free(colptr_new);
@@ -2257,14 +2262,15 @@ spmatrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyObject *size = NULL;
matrix *Il=NULL, *Jl=NULL, *V=NULL;
int_t nrows = -1, ncols = -1;
- char tc = 0;
static char *kwlist[] = { "V", "I", "J", "size","tc", NULL};
#if PY_MAJOR_VERSION >= 3
+ int tc = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOO|OC:spmatrix", kwlist,
&V, &Il, &Jl, &size, &tc))
#else
+ char tc = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOO|Oc:spmatrix", kwlist,
&V, &Il, &Jl, &size, &tc))
#endif
@@ -2283,18 +2289,18 @@ spmatrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (tc && !(VALID_TC_SP(tc))) PY_ERR_TYPE("tc must be 'd' or 'z'");
int id = (tc ? TC2ID(tc) : -1);
-#if PY_MAJOR_VERSION < 3
- int_t ndim = 0;
-#endif
+
+ int ndim = 0;
+
/* convert lists to matrices */
if (Matrix_Check(Il))
Py_INCREF(Il);
-#if PY_MAJOR_VERSION < 3
- else if (PyObject_HasAttrString((PyObject *)Il,"__array_struct__")) {
- if (!(Il = Matrix_NewFromArrayStruct((PyObject *)Il, INT, &ndim)))
+
+ else if (PyObject_CheckBuffer((PyObject *)Il)) {
+ if (!(Il = Matrix_NewFromPyBuffer((PyObject *)Il, INT, &ndim))) {
return NULL;
+ }
}
-#endif
else if (PySequence_Check((PyObject *)Il)) {
if (!(Il = Matrix_NewFromSequence((PyObject *)Il, INT)))
return NULL;
@@ -2303,14 +2309,14 @@ spmatrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (Matrix_Check(Jl))
Py_INCREF(Jl);
-#if PY_MAJOR_VERSION < 3
- else if (PyObject_HasAttrString((PyObject *)Jl,"__array_struct__")) {
- if (!(Jl = Matrix_NewFromArrayStruct((PyObject *)Jl, INT, &ndim))) {
+
+ else if (PyObject_CheckBuffer((PyObject *)Jl)) {
+ if (!(Jl = Matrix_NewFromPyBuffer((PyObject *)Jl, INT, &ndim))) {
Py_DECREF(Il);
return NULL;
}
}
-#endif
+
else if (PySequence_Check((PyObject *)Jl)) {
if (!(Jl = Matrix_NewFromSequence((PyObject *)Jl, INT))) {
Py_DECREF(Il);
@@ -2324,16 +2330,16 @@ spmatrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (Matrix_Check(V))
Py_INCREF(V);
-#if PY_MAJOR_VERSION < 3
- else if (PyObject_HasAttrString((PyObject *)V,"__array_struct__")) {
- int_t ndim = 0;
- if (!(V = Matrix_NewFromArrayStruct((PyObject *)V, id, &ndim))) {
+
+ else if (PyObject_CheckBuffer((PyObject *)V)) {
+ int ndim = 0;
+ if (!(V = Matrix_NewFromPyBuffer((PyObject *)V, id, &ndim))) {
Py_DECREF(Il);
Py_DECREF(Jl);
return NULL;
}
}
-#endif
+
else if (PySequence_Check((PyObject *)V))
{
if (!(V = Matrix_NewFromSequence((PyObject *)V, id))) {
@@ -2368,8 +2374,7 @@ spmatrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return (PyObject *)ret;
}
-static PyObject *
-spmatrix_str(matrix *self) {
+static PyObject *spmatrix_str(matrix *self) {
PyObject *cvxopt = PyImport_ImportModule("cvxopt");
PyObject *str, *ret;
@@ -2410,8 +2415,12 @@ spmatrix_repr(matrix *self) {
static PyObject *
spmatrix_richcompare(PyObject *self, PyObject *other, int op) {
+ Py_INCREF(Py_NotImplemented);
+ return Py_NotImplemented;
+}
- PY_ERR(PyExc_NotImplementedError, "matrix comparison not implemented");
+int * spmatrix_compare(PyObject *self, PyObject *other) {
+ PyErr_SetString(PyExc_NotImplementedError, "matrix comparison not implemented"); return 0;
}
static PyObject * spmatrix_get_size(spmatrix *self, void *closure)
@@ -2914,7 +2923,15 @@ spmatrix_subscr(spmatrix* self, PyObject* args)
if (rowstart == 0 && rowstop == SP_NROWS(self) && rowstep == 1) {
/* copy entire column */
colptr[colcnt+1] = colptr[colcnt] + SP_COL(self)[j+1] - SP_COL(self)[j];
- } else {
+ }
+ else if (rowstart >= 0 && rowstart < rowstop && rowstop <= SP_NROWS(self) && rowstep == 1) {
+ colptr[colcnt+1] = colptr[colcnt];
+ for (k = SP_COL(self)[j]; k < SP_COL(self)[j+1]; k++) {
+ if (SP_ROW(self)[k] >= rowstart && SP_ROW(self)[k] < rowstop)
+ colptr[colcnt+1]++;
+ }
+ }
+ else {
colptr[colcnt+1] += colptr[colcnt];
rowcnt = 0;
if (rowstep > 0) {
@@ -2930,7 +2947,8 @@ spmatrix_subscr(spmatrix* self, PyObject* args)
rowcnt++;
}
}
- } else {
+ }
+ else {
for (k=SP_COL(self)[j+1]-1; k>=SP_COL(self)[j]; k--) {
while (rowstart + rowcnt*rowstep > SP_ROW(self)[k] && rowcnt < rowlgt)
@@ -2968,12 +2986,26 @@ spmatrix_subscr(spmatrix* self, PyObject* args)
if (SP_ID(self) == DOUBLE)
((double *)A->values)[colptr[colcnt] + rowcnt] = SP_VALD(self)[k];
else
- ((complex *)A->values)[colptr[colcnt] + rowcnt] = SP_VALZ(self)[k];
+ ((double complex *)A->values)[colptr[colcnt] + rowcnt] = SP_VALZ(self)[k];
rowcnt++;
}
-
- } else {
+ }
+ else if (rowstart >= 0 && rowstart < rowstop && rowstop<=SP_NROWS(self) && rowstep == 1) {
+ rowcnt = 0;
+ for (k = SP_COL(self)[j]; k < SP_COL(self)[j+1]; k++) {
+ if (SP_ROW(self)[k] >= rowstart && SP_ROW(self)[k] < rowstop) {
+ A->rowind[A->colptr[colcnt] + rowcnt] = SP_ROW(self)[k] - rowstart;
+ if (SP_ID(self) == DOUBLE)
+ ((double *)A->values)[colptr[colcnt] + rowcnt] = SP_VALD(self)[k];
+ else
+ ((double complex *)A->values)[colptr[colcnt] + rowcnt] = SP_VALZ(self)[k];
+
+ rowcnt++;
+ }
+ }
+ }
+ else {
rowcnt = 0; i = 0;
if (rowstep > 0) {
@@ -2990,7 +3022,7 @@ spmatrix_subscr(spmatrix* self, PyObject* args)
if (SP_ID(self) == DOUBLE)
((double *)A->values)[colptr[colcnt] + i] = SP_VALD(self)[k];
else
- ((complex *)A->values)[colptr[colcnt] + i] = SP_VALZ(self)[k];
+ ((double complex *)A->values)[colptr[colcnt] + i] = SP_VALZ(self)[k];
rowcnt++;
i++;
@@ -3010,7 +3042,7 @@ spmatrix_subscr(spmatrix* self, PyObject* args)
if (SP_ID(self) == DOUBLE)
((double *)A->values)[colptr[colcnt] + i] = SP_VALD(self)[k];
else
- ((complex *)A->values)[colptr[colcnt] + i] = SP_VALZ(self)[k];
+ ((double complex *)A->values)[colptr[colcnt] + i] = SP_VALZ(self)[k];
rowcnt++;
i++;
@@ -3065,7 +3097,7 @@ spmatrix_subscr(spmatrix* self, PyObject* args)
SP_VALD(B)[nnz] = ((double *)s->val)
[CWRAP(MAT_BUFI(Il)[k],SP_NROWS(self))];
else
- SP_VALZ(B)[nnz] = ((complex *)s->val)
+ SP_VALZ(B)[nnz] = ((double complex *)s->val)
[CWRAP(MAT_BUFI(Il)[k],SP_NROWS(self))];
SP_ROW(B) [nnz++] = k;
SP_COL(B)[j+1]++;
@@ -3081,7 +3113,8 @@ spmatrix_subscr(spmatrix* self, PyObject* args)
static int
spmatrix_ass_subscr(spmatrix* self, PyObject* args, PyObject* value)
{
- int_t i = 0, j = 0, id = SP_ID(self), decref_val = 0, arraystruct_nd = 0;
+ int_t i = 0, j = 0, id = SP_ID(self), decref_val = 0;
+ int ndim = 0;
char itype;
number val, tempval;
matrix *Il = NULL, *Jl = NULL;
@@ -3090,12 +3123,10 @@ spmatrix_ass_subscr(spmatrix* self, PyObject* args, PyObject* value)
"cannot delete matrix entries");
if (!(PY_NUMBER(value) || Matrix_Check(value) || SpMatrix_Check(value))){
-#if PY_MAJOR_VERSION < 3
- if (PyObject_HasAttrString(value,"__array_struct__"))
- value = (PyObject *)Matrix_NewFromArrayStruct(value, -1,
- &arraystruct_nd);
+
+ if (PyObject_CheckBuffer(value))
+ value = (PyObject *)Matrix_NewFromPyBuffer(value, -1, &ndim);
else
-#endif
value = (PyObject *)Matrix_NewFromSequence(value, SP_ID(self));
if (!value)
@@ -3410,7 +3441,7 @@ spmatrix_ass_subscr(spmatrix* self, PyObject* args, PyObject* value)
free_lists_exit(argI,argJ,Il,Jl,-1);
}
- if (decref_val && arraystruct_nd < 2 &&
+ if (decref_val && ndim < 2 &&
MAT_LGT(value) == MAT_LGT(Il)*MAT_LGT(Jl)) {
MAT_NROWS(value) = MAT_LGT(Il); MAT_NCOLS(value) = MAT_LGT(Jl);
}
@@ -3669,7 +3700,7 @@ static PyObject * spmatrix_neg(spmatrix *self)
if (!x) return PyErr_NoMemory();
int n=SP_NNZ(x);
- scal[SP_ID(self)](&n, &MinusOne[SP_ID(self)], SP_VAL(x), (int *)&One[INT]);
+ scal[SP_ID(self)](&n, &MinusOne[SP_ID(self)], SP_VAL(x), &intOne);
return (PyObject *)x;
}
@@ -3835,7 +3866,7 @@ spmatrix_sub(PyObject *self, PyObject *other)
else if (SpMatrix_Check(self) && !SpMatrix_Check(other)) {
if ((ret = spmatrix_add_helper(self, other, 0))) {
int n = MAT_LGT(other), id = MAT_ID(ret);
- scal[id](&n, &MinusOne[id], MAT_BUF(ret), (int *)&One[INT]);
+ scal[id](&n, &MinusOne[id], MAT_BUF(ret), &intOne);
return ret;
}
else return NULL;
@@ -4209,7 +4240,11 @@ PyTypeObject spmatrix_tp = {
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
+#if PY_MAJOR_VERSION >= 3
0, /* tp_compare */
+#else
+ (cmpfunc)spmatrix_compare, /* tp_compare */
+#endif
(reprfunc)spmatrix_repr, /* tp_repr */
&spmatrix_as_number, /* tp_as_number */
0, /* tp_as_sequence */
diff --git a/src/C/umfpack.c b/src/C/umfpack.c
index 44f202c..d77e4be 100644
--- a/src/C/umfpack.c
+++ b/src/C/umfpack.c
@@ -1,8 +1,9 @@
/*
+ * Copyright 2012-2015 M. Andersen and L. Vandenberghe.
* Copyright 2010-2011 L. Vandenberghe.
* Copyright 2004-2009 J. Dahl and L. Vandenberghe.
*
- * This file is part of CVXOPT version 1.1.4.
+ * This file is part of CVXOPT version 1.1.8.
*
* CVXOPT is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,7 +31,7 @@
#define UMFZ(name) umfpack_zi_ ## name
#endif
-const int E_SIZE[] = {sizeof(int_t), sizeof(double), sizeof(complex)};
+const int E_SIZE[] = {sizeof(int_t), sizeof(double), sizeof(double complex)};
static char umfpack_error[20];
@@ -38,7 +39,7 @@ PyDoc_STRVAR(umfpack__doc__,"Interface to the UMFPACK library.\n\n"
"Routines for symbolic and numeric LU factorization of sparse\n"
"matrices and for solving sparse sets of linear equations.\n"
"The default control settings of UMPFACK are used.\n\n"
- "See also http://www.cise.ufl.edu/research/sparse/umfpack.");
+ "See also www.suitesparse.com.");
#if PY_MAJOR_VERSION >= 3
static void free_umfpack_d_symbolic(void *F)
diff --git a/src/python/__init__.py b/src/python/__init__.py
index df40b41..d5c56dd 100644
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -11,10 +11,11 @@ library and on the strengths of Python as a high-level programming
language.
"""
+# Copyright 2012-2015 M. Andersen and L. Vandenberghe.
# Copyright 2010-2011 L. Vandenberghe.
# Copyright 2004-2009 J. Dahl and L. Vandenberghe.
#
-# This file is part of CVXOPT version 1.1.4.
+# This file is part of CVXOPT version 1.1.8.
#
# CVXOPT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -47,6 +48,7 @@ def normal(nrows, ncols=1, mean=0.0, std=1.0):
ncols number of columns
mean approximate mean of the distribution
+
std standard deviation of the distribution
'''
@@ -126,7 +128,7 @@ def getseed():
import sys
-if sys.version_info.major < 3:
+if sys.version_info[0] < 3:
import __builtin__
omax = __builtin__.max
omin = __builtin__.min
@@ -248,7 +250,9 @@ spmatrix_str = printing.spmatrix_str_default
spmatrix_repr = printing.spmatrix_repr_default
from cvxopt.base import matrix, spmatrix, sparse, spdiag, sqrt, sin, cos, \
- exp, log
+ exp, log
+
+from cvxopt import solvers, blas, lapack
__all__ = [ 'blas', 'lapack', 'amd', 'umfpack', 'cholmod', 'solvers',
'modeling', 'printing', 'info', 'matrix', 'spmatrix', 'sparse',
diff --git a/src/python/coneprog.py b/src/python/coneprog.py
index 9e85282..00cb4aa 100644
--- a/src/python/coneprog.py
+++ b/src/python/coneprog.py
@@ -2,10 +2,11 @@
Solver for linear and quadratic cone programs.
"""
+# Copyright 2012-2015 M. Andersen and L. Vandenberghe.
# Copyright 2010-2011 L. Vandenberghe.
# Copyright 2004-2009 J. Dahl and L. Vandenberghe.
#
-# This file is part of CVXOPT version 1.1.4.
+# This file is part of CVXOPT version 1.1.8.
#
# CVXOPT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,6 +21,8 @@ Solver for linear and quadratic cone programs.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+import sys
+if sys.version > '3': long = int
__all__ = []
options = {}
@@ -28,7 +31,7 @@ options = {}
def conelp(c, G, h, dims = None, A = None, b = None, primalstart = None,
dualstart = None, kktsolver = None, xnewcopy = None, xdot = None,
xaxpy = None, xscal = None, ynewcopy = None, ydot = None, yaxpy = None,
- yscal = None):
+ yscal = None, **kwargs):
"""
Solves a pair of primal and dual cone programs
@@ -420,42 +423,37 @@ def conelp(c, G, h, dims = None, A = None, b = None, primalstart = None,
EXPON = 3
STEP = 0.99
- try: DEBUG = options['debug']
- except KeyError: DEBUG = False
+ options = kwargs.get('options',globals()['options'])
- try: MAXITERS = options['maxiters']
- except KeyError: MAXITERS = 100
- else:
- if type(MAXITERS) is not int or MAXITERS < 1:
- raise ValueError("options['maxiters'] must be a positive "\
- "integer")
+ DEBUG = options.get('debug', False)
- try: ABSTOL = options['abstol']
- except KeyError: ABSTOL = 1e-7
- else:
- if type(ABSTOL) is not float and type(ABSTOL) is not int:
- raise ValueError("options['abstol'] must be a scalar")
+ KKTREG = options.get('kktreg',None)
+ if KKTREG is None:
+ pass
+ elif not isinstance(KKTREG,(float,int,long)) or KKTREG < 0.0:
+ raise ValueError("options['kktreg'] must be a nonnegative scalar")
+
+ MAXITERS = options.get('maxiters',100)
+ if not isinstance(MAXITERS,(int,long)) or MAXITERS < 1:
+ raise ValueError("options['maxiters'] must be a positive integer")
- try: RELTOL = options['reltol']
- except KeyError: RELTOL = 1e-6
- else:
- if type(RELTOL) is not float and type(RELTOL) is not int:
- raise ValueError("options['reltol'] must be a scalar")
+ ABSTOL = options.get('abstol',1e-7)
+ if not isinstance(ABSTOL,(float,int,long)):
+ raise ValueError("options['abstol'] must be a scalar")
+
+ RELTOL = options.get('reltol',1e-6)
+ if not isinstance(RELTOL,(float,int,long)):
+ raise ValueError("options['reltol'] must be a scalar")
if RELTOL <= 0.0 and ABSTOL <= 0.0 :
raise ValueError("at least one of options['reltol'] and " \
"options['abstol'] must be positive")
- try: FEASTOL = options['feastol']
- except KeyError: FEASTOL = 1e-7
- else:
- if (type(FEASTOL) is not float and type(FEASTOL) is not int) or \
- FEASTOL <= 0.0:
- raise ValueError("options['feastol'] must be a positive "\
- "scalar")
+ FEASTOL = options.get('feastol',1e-7)
+ if not isinstance(FEASTOL,(float,int,long)) or FEASTOL <= 0.0:
+ raise ValueError("options['feastol'] must be a positive scalar")
- try: show_progress = options['show_progress']
- except KeyError: show_progress = True
+ show_progress = options.get('show_progress', True)
if kktsolver is None:
if dims and (dims['q'] or dims['s']):
@@ -463,14 +461,14 @@ def conelp(c, G, h, dims = None, A = None, b = None, primalstart = None,
else:
kktsolver = 'chol2'
defaultsolvers = ('ldl', 'ldl2', 'qr', 'chol', 'chol2')
- if type(kktsolver) is str and kktsolver not in defaultsolvers:
+ if isinstance(kktsolver,str) and kktsolver not in defaultsolvers:
raise ValueError("'%s' is not a valid value for kktsolver" \
%kktsolver)
# Argument error checking depends on level of customization.
- customkkt = type(kktsolver) is not str
- matrixG = type(G) in (matrix, spmatrix)
- matrixA = type(A) in (matrix, spmatrix)
+ customkkt = not isinstance(kktsolver,str)
+ matrixG = isinstance(G, (matrix, spmatrix))
+ matrixA = isinstance(A, (matrix, spmatrix))
if (not matrixG or (not matrixA and A is not None)) and not customkkt:
raise ValueError("use of function valued G, A requires a "\
"user-provided kktsolver")
@@ -486,31 +484,29 @@ def conelp(c, G, h, dims = None, A = None, b = None, primalstart = None,
"function valued A and user-provided kktsolver")
- if not customx and (type(c) is not matrix or c.typecode != 'd' or
- c.size[1] != 1):
+ if not customx and (not isinstance(c,matrix) or c.typecode != 'd' or c.size[1] != 1):
raise TypeError("'c' must be a 'd' matrix with one column")
- if type(h) is not matrix or h.typecode != 'd' or h.size[1] != 1:
+ if not isinstance(h,matrix) or h.typecode != 'd' or h.size[1] != 1:
raise TypeError("'h' must be a 'd' matrix with 1 column")
if not dims: dims = {'l': h.size[0], 'q': [], 's': []}
- if type(dims['l']) is not int or dims['l'] < 0:
+ if not isinstance(dims['l'],(int,long)) or dims['l'] < 0:
raise TypeError("'dims['l']' must be a nonnegative integer")
- if [ k for k in dims['q'] if type(k) is not int or k < 1 ]:
+ if [ k for k in dims['q'] if not isinstance(k,(int,long)) or k < 1 ]:
raise TypeError("'dims['q']' must be a list of positive integers")
- if [ k for k in dims['s'] if type(k) is not int or k < 0 ]:
+ if [ k for k in dims['s'] if not isinstance(k,(int,long)) or k < 0 ]:
raise TypeError("'dims['s']' must be a list of nonnegative " \
"integers")
- try: refinement = options['refinement']
- except KeyError:
- if dims['q'] or dims['s']: refinement = 1
- else: refinement = 0
- else:
- if type(refinement) is not int or refinement < 0:
- raise ValueError("options['refinement'] must be a "\
- "nonnegative integer")
-
+ refinement = options.get('refinement',None)
+ if refinement is None:
+ if dims['q'] or dims['s']:
+ refinement = 1
+ else:
+ refinement = 0
+ elif not isinstance(refinement,(int,long)) or refinement < 0:
+ raise ValueError("options['refinement'] must be a nonnegative integer")
cdim = dims['l'] + sum(dims['q']) + sum([k**2 for k in dims['s']])
cdim_pckd = dims['l'] + sum(dims['q']) + sum([k*(k+1)/2 for k in
@@ -557,7 +553,7 @@ def conelp(c, G, h, dims = None, A = None, b = None, primalstart = None,
if not customy:
if b is None: b = matrix(0.0, (0,1))
- if type(b) is not matrix or b.typecode != 'd' or b.size[1] != 1:
+ if not isinstance(b,matrix) or b.typecode != 'd' or b.size[1] != 1:
raise TypeError("'b' must be a 'd' matrix with one column")
if matrixA and b.size[0] != A.size[0]:
raise TypeError("'b' must have length %d" %A.size[0])
@@ -573,10 +569,10 @@ def conelp(c, G, h, dims = None, A = None, b = None, primalstart = None,
# [ G 0 -W' ] [ uz ] [ bz ]
if kktsolver in defaultsolvers:
- if b.size[0] > c.size[0] or b.size[0] + cdim_pckd < c.size[0]:
+ if KKTREG is None and (b.size[0] > c.size[0] or b.size[0] + cdim_pckd < c.size[0]):
raise ValueError("Rank(A) < p or Rank([G; A]) < n")
if kktsolver == 'ldl':
- factor = misc.kkt_ldl(G, dims, A)
+ factor = misc.kkt_ldl(G, dims, A, kktreg = KKTREG)
elif kktsolver == 'ldl2':
factor = misc.kkt_ldl2(G, dims, A)
elif kktsolver == 'qr':
@@ -745,7 +741,7 @@ def conelp(c, G, h, dims = None, A = None, b = None, primalstart = None,
nrms = misc.snrm2(s, dims)
nrmz = misc.snrm2(z, dims)
- if primalstart is None and dualstart is None:
+ if primalstart is None and dualstart is None:
gap = misc.sdot(s, z, dims)
pcost = xdot(c,x)
@@ -757,8 +753,8 @@ def conelp(c, G, h, dims = None, A = None, b = None, primalstart = None,
else:
relgap = None
- if ts <= 0 and tz <= 0 and (gap <= ABSTOL or ( relgap is not None
- and relgap <= RELTOL )):
+ if (ts <= 0 and tz <= 0 and (gap <= ABSTOL or ( relgap is not None
+ and relgap <= RELTOL ))) and KKTREG is None:
# The initial points we constructed happen to be feasible and
# optimal.
@@ -1444,7 +1440,7 @@ def conelp(c, G, h, dims = None, A = None, b = None, primalstart = None,
def coneqp(P, q, G = None, h = None, dims = None, A = None, b = None,
initvals = None, kktsolver = None, xnewcopy = None, xdot = None,
xaxpy = None, xscal = None, ynewcopy = None, ydot = None, yaxpy = None,
- yscal = None):
+ yscal = None, **kwargs):
"""
Solves a pair of primal and dual convex quadratic cone programs
@@ -1771,48 +1767,40 @@ def coneqp(P, q, G = None, h = None, dims = None, A = None, b = None,
STEP = 0.99
EXPON = 3
- try: DEBUG = options['debug']
- except KeyError: DEBUG = False
+ options = kwargs.get('options',globals()['options'])
+
+ DEBUG = options.get('debug',False)
- # Use Mehrotra correction or not.
- try: correction = options['use_correction']
- except KeyError: correction = True
+ KKTREG = options.get('kktreg',None)
+ if KKTREG is None:
+ pass
+ elif not isinstance(KKTREG,(float,int,long)) or KKTREG < 0.0:
+ raise ValueError("options['kktreg'] must be a nonnegative scalar")
+ # Use Mehrotra correction or not.
+ correction = options.get('use_correction', True)
- try: MAXITERS = options['maxiters']
- except KeyError: MAXITERS = 100
- else:
- if type(MAXITERS) is not int or MAXITERS < 1:
- raise ValueError("options['maxiters'] must be a positive "\
- "integer")
+ MAXITERS = options.get('maxiters',100)
+ if not isinstance(MAXITERS,(int,long)) or MAXITERS < 1:
+ raise ValueError("options['maxiters'] must be a positive integer")
- try: ABSTOL = options['abstol']
- except KeyError: ABSTOL = 1e-7
- else:
- if type(ABSTOL) is not float and type(ABSTOL) is not int:
- raise ValueError("options['abstol'] must be a scalar")
+ ABSTOL = options.get('abstol',1e-7)
+ if not isinstance(ABSTOL,(float,int,long)):
+ raise ValueError("options['abstol'] must be a scalar")
- try: RELTOL = options['reltol']
- except KeyError: RELTOL = 1e-6
- else:
- if type(RELTOL) is not float and type(RELTOL) is not int:
- raise ValueError("options['reltol'] must be a scalar")
+ RELTOL = options.get('reltol',1e-6)
+ if not isinstance(RELTOL,(float,int,long)):
+ raise ValueError("options['reltol'] must be a scalar")
if RELTOL <= 0.0 and ABSTOL <= 0.0 :
raise ValueError("at least one of options['reltol'] and " \
"options['abstol'] must be positive")
- try: FEASTOL = options['feastol']
- except KeyError: FEASTOL = 1e-7
- else:
- if (type(FEASTOL) is not float and type(FEASTOL) is not int) or \
- FEASTOL <= 0.0:
- raise ValueError("options['feastol'] must be a positive "\
- "scalar")
-
- try: show_progress = options['show_progress']
- except KeyError: show_progress = True
+ FEASTOL = options.get('feastol',1e-7)
+ if not isinstance(FEASTOL,(float,int,long)) or FEASTOL <= 0.0:
+ raise ValueError("options['feastol'] must be a positive scalar")
+ show_progress = options.get('show_progress',True)
if kktsolver is None:
if dims and (dims['q'] or dims['s']):
@@ -1820,16 +1808,15 @@ def coneqp(P, q, G = None, h = None, dims = None, A = None, b = None,
else:
kktsolver = 'chol2'
defaultsolvers = ('ldl', 'ldl2', 'chol', 'chol2')
- if type(kktsolver) is str and kktsolver not in defaultsolvers:
+ if isinstance(kktsolver,str) and kktsolver not in defaultsolvers:
raise ValueError("'%s' is not a valid value for kktsolver" \
%kktsolver)
-
# Argument error checking depends on level of customization.
- customkkt = type(kktsolver) is not str
- matrixP = type(P) in (matrix, spmatrix)
- matrixG = type(G) in (matrix, spmatrix)
- matrixA = type(A) in (matrix, spmatrix)
+ customkkt = not isinstance(kktsolver,str)
+ matrixP = isinstance(P, (matrix, spmatrix))
+ matrixG = isinstance(G, (matrix, spmatrix))
+ matrixA = isinstance(A, (matrix, spmatrix))
if (not matrixP or (not matrixG and G is not None) or
(not matrixA and A is not None)) and not customkkt:
raise ValueError("use of function valued P, G, A requires a "\
@@ -1846,8 +1833,7 @@ def coneqp(P, q, G = None, h = None, dims = None, A = None, b = None,
"function valued A and user-provided kktsolver")
- if not customx and (type(q) is not matrix or q.typecode != 'd' or
- q.size[1] != 1):
+ if not customx and (not isinstance(q,matrix) or q.typecode != 'd' or q.size[1] != 1):
raise TypeError("'q' must be a 'd' matrix with one column")
if matrixP:
@@ -1861,15 +1847,15 @@ def coneqp(P, q, G = None, h = None, dims = None, A = None, b = None,
if h is None: h = matrix(0.0, (0,1))
- if type(h) is not matrix or h.typecode != 'd' or h.size[1] != 1:
+ if not isinstance(h, matrix) or h.typecode != 'd' or h.size[1] != 1:
raise TypeError("'h' must be a 'd' matrix with one column")
if not dims: dims = {'l': h.size[0], 'q': [], 's': []}
- if type(dims['l']) is not int or dims['l'] < 0:
+ if not isinstance(dims['l'],(int,long)) or dims['l'] < 0:
raise TypeError("'dims['l']' must be a nonnegative integer")
- if [ k for k in dims['q'] if type(k) is not int or k < 1 ]:
+ if [ k for k in dims['q'] if not isinstance(k,(int,long)) or k < 1 ]:
raise TypeError("'dims['q']' must be a list of positive integers")
- if [ k for k in dims['s'] if type(k) is not int or k < 0 ]:
+ if [ k for k in dims['s'] if not isinstance(k,(int,long)) or k < 0 ]:
raise TypeError("'dims['s']' must be a list of nonnegative " \
"integers")
@@ -1878,7 +1864,7 @@ def coneqp(P, q, G = None, h = None, dims = None, A = None, b = None,
if dims['q'] or dims['s']: refinement = 1
else: refinement = 0
else:
- if type(refinement) is not int or refinement < 0:
+ if not isinstance(refinement,(int,long)) or refinement < 0:
raise ValueError("options['refinement'] must be a "\
"nonnegative integer")
@@ -1932,7 +1918,7 @@ def coneqp(P, q, G = None, h = None, dims = None, A = None, b = None,
fA = A
if not customy:
if b is None: b = matrix(0.0, (0,1))
- if type(b) is not matrix or b.typecode != 'd' or b.size[1] != 1:
+ if not isinstance(b, matrix) or b.typecode != 'd' or b.size[1] != 1:
raise TypeError("'b' must be a 'd' matrix with one column")
if matrixA and b.size[0] != A.size[0]:
raise TypeError("'b' must have length %d" %A.size[0])
@@ -1981,10 +1967,10 @@ def coneqp(P, q, G = None, h = None, dims = None, A = None, b = None,
# [ G 0 -W' ] [ uz ] [ bz ]
if kktsolver in defaultsolvers:
- if b.size[0] > q.size[0]:
+ if KKTREG is None and b.size[0] > q.size[0]:
raise ValueError("Rank(A) < p or Rank([P; G; A]) < n")
if kktsolver == 'ldl':
- factor = misc.kkt_ldl(G, dims, A)
+ factor = misc.kkt_ldl(G, dims, A, kktreg = KKTREG)
elif kktsolver == 'ldl2':
factor = misc.kkt_ldl2(G, dims, A)
elif kktsolver == 'chol':
@@ -2560,7 +2546,7 @@ def coneqp(P, q, G = None, h = None, dims = None, A = None, b = None,
def lp(c, G, h, A = None, b = None, solver = None, primalstart = None,
- dualstart = None):
+ dualstart = None, **kwargs):
"""
Solves a pair of primal and dual LPs
@@ -2577,10 +2563,10 @@ def lp(c, G, h, A = None, b = None, solver = None, primalstart = None,
Input arguments.
- G is m x n, h is m x 1, A is p x n, b is p x 1. G and A must be
- dense or sparse 'd' matrices. h and b are dense 'd' matrices
- with one column. The default values for A and b are empty
- matrices with zero rows.
+ c is n x 1, G is m x n, h is m x 1, A is p x n, b is p x 1. G and
+ A must be dense or sparse 'd' matrices. c, h and b are dense 'd'
+ matrices with one column. The default values for A and b are
+ empty matrices with zero rows.
solver is None, 'glpk' or 'mosek'. The default solver (None)
uses the cvxopt conelp() function. The 'glpk' solver is the
@@ -2789,39 +2775,38 @@ def lp(c, G, h, A = None, b = None, solver = None, primalstart = None,
Options that are not recognized are replaced by their default
values.
"""
-
+ options = kwargs.get('options',globals()['options'])
+
import math
from cvxopt import base, blas, misc
from cvxopt.base import matrix, spmatrix
- if type(c) is not matrix or c.typecode != 'd' or c.size[1] != 1:
+ if not isinstance(c, matrix) or c.typecode != 'd' or c.size[1] != 1:
raise TypeError("'c' must be a dense column matrix")
n = c.size[0]
if n < 1: raise ValueError("number of variables must be at least 1")
- if (type(G) is not matrix and type(G) is not spmatrix) or \
- G.typecode != 'd' or G.size[1] != n:
+ if not isinstance(G, (matrix,spmatrix)) or G.typecode != 'd' or G.size[1] != n:
raise TypeError("'G' must be a dense or sparse 'd' matrix "\
"with %d columns" %n)
m = G.size[0]
- if type(h) is not matrix or h.typecode != 'd' or h.size != (m,1):
+ if not isinstance(h, matrix) or h.typecode != 'd' or h.size != (m,1):
raise TypeError("'h' must be a 'd' matrix of size (%d,1)" %m)
if A is None: A = spmatrix([], [], [], (0,n), 'd')
- if (type(A) is not matrix and type(A) is not spmatrix) or \
- A.typecode != 'd' or A.size[1] != n:
+ if not isinstance(A,(matrix,spmatrix)) or A.typecode != 'd' or A.size[1] != n:
raise TypeError("'A' must be a dense or sparse 'd' matrix "\
"with %d columns" %n)
p = A.size[0]
if b is None: b = matrix(0.0, (0,1))
- if type(b) is not matrix or b.typecode != 'd' or b.size != (p,1):
+ if not isinstance(b,matrix) or b.typecode != 'd' or b.size != (p,1):
raise TypeError("'b' must be a dense matrix of size (%d,1)" %p)
if solver == 'glpk':
try: from cvxopt import glpk
except ImportError: raise ValueError("invalid option "\
"(solver = 'glpk'): cvxopt.glpk is not installed")
- glpk.options = options
+ glpk.options = options.get('glpk',{})
status, x, z, y = glpk.lp(c, G, h, A, b)
if status == 'optimal':
@@ -2892,20 +2877,17 @@ def lp(c, G, h, A = None, b = None, solver = None, primalstart = None,
raise ValueError("invalid option (solver = 'mosek'): "\
"cvxopt.mosek is not installed")
- if 'MOSEK' in options:
- msk.options = options['MOSEK']
- else:
- msk.options = {}
-
+ msk.options = options.get('mosek',{})
solsta, x, z, y = msk.lp(c, G, h, A, b)
resx0 = max(1.0, blas.nrm2(c))
resy0 = max(1.0, blas.nrm2(b))
resz0 = max(1.0, blas.nrm2(h))
- if solsta is mosek.solsta.optimal:
- status = 'optimal'
-
+ if solsta in (mosek.solsta.optimal, mosek.solsta.near_optimal):
+ if solsta is mosek.solsta.optimal: status = 'optimal'
+ else: status = 'near optimal'
+
pcost = blas.dot(c,x)
dcost = -blas.dot(h,z) - blas.dot(b,y)
@@ -3015,11 +2997,11 @@ def lp(c, G, h, A = None, b = None, solver = None, primalstart = None,
'primal slack': pslack, 'dual slack': dslack}
return conelp(c, G, h, {'l': m, 'q': [], 's': []}, A, b, primalstart,
- dualstart)
+ dualstart, options = options)
def socp(c, Gl = None, hl = None, Gq = None, hq = None, A = None, b = None,
- solver = None, primalstart = None, dualstart = None):
+ solver = None, primalstart = None, dualstart = None, **kwargs):
"""
Solves a pair of primal and dual SOCPs
@@ -3290,36 +3272,33 @@ def socp(c, Gl = None, hl = None, Gq = None, hq = None, A = None, b = None,
from cvxopt import base, blas
from cvxopt.base import matrix, spmatrix
- if type(c) is not matrix or c.typecode != 'd' or c.size[1] != 1:
+ if not isinstance(c,matrix) or c.typecode != 'd' or c.size[1] != 1:
raise TypeError("'c' must be a dense column matrix")
n = c.size[0]
if n < 1: raise ValueError("number of variables must be at least 1")
if Gl is None: Gl = spmatrix([], [], [], (0,n), tc='d')
- if (type(Gl) is not matrix and type(Gl) is not spmatrix) or \
- Gl.typecode != 'd' or Gl.size[1] != n:
+ if not isinstance(Gl,(matrix,spmatrix)) or Gl.typecode != 'd' or Gl.size[1] != n:
raise TypeError("'Gl' must be a dense or sparse 'd' matrix "\
"with %d columns" %n)
ml = Gl.size[0]
if hl is None: hl = matrix(0.0, (0,1))
- if type(hl) is not matrix or hl.typecode != 'd' or \
+ if not isinstance(hl, matrix) or hl.typecode != 'd' or \
hl.size != (ml,1):
raise TypeError("'hl' must be a dense 'd' matrix of " \
"size (%d,1)" %ml)
if Gq is None: Gq = []
- if type(Gq) is not list or [ G for G in Gq if (type(G) is not matrix
- and type(G) is not spmatrix) or G.typecode != 'd' or
- G.size[1] != n ]:
+ if not isinstance(Gq,list) or [ G for G in Gq if not isinstance(G,(matrix,spmatrix)) \
+ or G.typecode != 'd' or G.size[1] != n ]:
raise TypeError("'Gq' must be a list of sparse or dense 'd' "\
"matrices with %d columns" %n)
mq = [ G.size[0] for G in Gq ]
a = [ k for k in range(len(mq)) if mq[k] == 0 ]
if a: raise TypeError("the number of rows of Gq[%d] is zero" %a[0])
if hq is None: hq = []
- if type(hq) is not list or len(hq) != len(mq) or [ h for h in hq if
- (type(h) is not matrix and type(h) is not spmatrix) or
- h.typecode != 'd' ]:
+ if not isinstance(hq,list) or len(hq) != len(mq) or \
+ [ h for h in hq if not isinstance(h,(matrix,spmatrix)) or h.typecode != 'd' ]:
raise TypeError("'hq' must be a list of %d dense or sparse "\
"'d' matrices" %len(mq))
a = [ k for k in range(len(mq)) if hq[k].size != (mq[k], 1) ]
@@ -3329,13 +3308,12 @@ def socp(c, Gl = None, hl = None, Gq = None, hq = None, A = None, b = None,
"is (%d,1)." %(k, hq[k].size[0], hq[k].size[1], mq[k]))
if A is None: A = spmatrix([], [], [], (0,n), 'd')
- if (type(A) is not matrix and type(A) is not spmatrix) or \
- A.typecode != 'd' or A.size[1] != n:
+ if not isinstance(A,(matrix,spmatrix)) or A.typecode != 'd' or A.size[1] != n:
raise TypeError("'A' must be a dense or sparse 'd' matrix "\
"with %d columns" %n)
p = A.size[0]
if b is None: b = matrix(0.0, (0,1))
- if type(b) is not matrix or b.typecode != 'd' or b.size != (p,1):
+ if not isinstance(b,matrix) or b.typecode != 'd' or b.size != (p,1):
raise TypeError("'b' must be a dense matrix of size (%d,1)" %p)
dims = {'l': ml, 'q': mq, 's': []}
@@ -3349,11 +3327,8 @@ def socp(c, Gl = None, hl = None, Gq = None, hq = None, A = None, b = None,
except ImportError:
raise ValueError("invalid option (solver = 'mosek'): "\
"cvxopt.mosek is not installed")
- if 'MOSEK' in options:
- msk.options = options['MOSEK']
- else:
- msk.options = {}
- if p: raise ValueError("socp() with the solver = 'socp' option "\
+ msk.options = options.get('mosek',{})
+ if p: raise ValueError("socp() with the solver = 'mosek' option "\
"does not handle problems with equality constraints")
solsta, x, zl, zq = msk.socp(c, Gl, hl, Gq, hq)
@@ -3362,8 +3337,10 @@ def socp(c, Gl = None, hl = None, Gq = None, hq = None, A = None, b = None,
rh = matrix([ blas.nrm2(hl) ] + [ blas.nrm2(hqk) for hqk in hq ])
resz0 = max(1.0, blas.nrm2(rh))
- if solsta is mosek.solsta.optimal:
- status = 'optimal'
+ if solsta in (mosek.solsta.optimal, mosek.solsta.near_optimal):
+ if solsta is mosek.solsta.optimal: status = 'optimal'
+ else: status = 'near optimal'
+
y = matrix(0.0, (0,1))
pcost = blas.dot(c,x)
dcost = -blas.dot(hl,zl) - \
@@ -3509,7 +3486,7 @@ def socp(c, Gl = None, hl = None, Gq = None, hq = None, A = None, b = None,
'primal slack': pslack, 'dual slack': dslack}
h = matrix(0.0, (N,1))
- if type(Gl) is matrix or [ Gk for Gk in Gq if type(Gk) is matrix ]:
+ if isinstance(Gl,matrix) or [ Gk for Gk in Gq if isinstance(Gk,matrix) ]:
G = matrix(0.0, (N, n))
else:
G = spmatrix([], [], [], (N, n), 'd')
@@ -3547,8 +3524,7 @@ def socp(c, Gl = None, hl = None, Gq = None, hq = None, A = None, b = None,
else:
ds = None
- sol = conelp(c, G, h, dims, A = A, b = b, primalstart = ps, dualstart
- = ds)
+ sol = conelp(c, G, h, dims, A = A, b = b, primalstart = ps, dualstart = ds, options = options)
if sol['s'] is None:
sol['sl'] = None
sol['sq'] = None
@@ -3577,7 +3553,7 @@ def socp(c, Gl = None, hl = None, Gq = None, hq = None, A = None, b = None,
def sdp(c, Gl = None, hl = None, Gs = None, hs = None, A = None, b = None,
- solver = None, primalstart = None, dualstart = None):
+ solver = None, primalstart = None, dualstart = None, options = options, **kwargs):
"""
Solves a pair of primal and dual SDPs
@@ -3850,30 +3826,30 @@ def sdp(c, Gl = None, hl = None, Gs = None, hs = None, A = None, b = None,
options['DSDP_GapTolerance'] scalar (default: 1e-5).
"""
+ options = kwargs.get('options',globals()['options'])
+
import math
from cvxopt import base, blas, misc
from cvxopt.base import matrix, spmatrix
- if type(c) is not matrix or c.typecode != 'd' or c.size[1] != 1:
+ if not isinstance(c,matrix) or c.typecode != 'd' or c.size[1] != 1:
raise TypeError("'c' must be a dense column matrix")
n = c.size[0]
if n < 1: raise ValueError("number of variables must be at least 1")
if Gl is None: Gl = spmatrix([], [], [], (0,n), tc='d')
- if (type(Gl) is not matrix and type(Gl) is not spmatrix) or \
- Gl.typecode != 'd' or Gl.size[1] != n:
+ if not isinstance(Gl,(matrix,spmatrix)) or Gl.typecode != 'd' or Gl.size[1] != n:
raise TypeError("'Gl' must be a dense or sparse 'd' matrix "\
"with %d columns" %n)
ml = Gl.size[0]
if hl is None: hl = matrix(0.0, (0,1))
- if type(hl) is not matrix or hl.typecode != 'd' or \
+ if not isinstance(hl,matrix) or hl.typecode != 'd' or \
hl.size != (ml,1):
raise TypeError("'hl' must be a 'd' matrix of size (%d,1)" %ml)
if Gs is None: Gs = []
- if type(Gs) is not list or [ G for G in Gs if (type(G) is not matrix
- and type(G) is not spmatrix) or G.typecode != 'd' or
- G.size[1] != n ]:
+ if not isinstance(Gs,list) or [ G for G in Gs if not isinstance(G,(matrix,spmatrix)) \
+ or G.typecode != 'd' or G.size[1] != n ]:
raise TypeError("'Gs' must be a list of sparse or dense 'd' "\
"matrices with %d columns" %n)
ms = [ int(math.sqrt(G.size[0])) for G in Gs ]
@@ -3881,9 +3857,8 @@ def sdp(c, Gl = None, hl = None, Gs = None, hs = None, A = None, b = None,
if a: raise TypeError("the squareroot of the number of rows in "\
"'Gs[%d]' is not an integer" %k)
if hs is None: hs = []
- if type(hs) is not list or len(hs) != len(ms) or [ h for h in hs if
- (type(h) is not matrix and type(h) is not spmatrix) or
- h.typecode != 'd' ]:
+ if not isinstance(hs,list) or len(hs) != len(ms) \
+ or [ h for h in hs if not isinstance(h,(matrix,spmatrix)) or h.typecode != 'd' ]:
raise TypeError("'hs' must be a list of %d dense or sparse "\
"'d' matrices" %len(ms))
a = [ k for k in range(len(ms)) if hs[k].size != (ms[k],ms[k]) ]
@@ -3893,13 +3868,12 @@ def sdp(c, Gl = None, hl = None, Gs = None, hs = None, A = None, b = None,
"(%d,%d)." %(k,hs[k].size[0], hs[k].size[1], ms[k], ms[k]))
if A is None: A = spmatrix([], [], [], (0,n), 'd')
- if (type(A) is not matrix and type(A) is not spmatrix) or \
- A.typecode != 'd' or A.size[1] != n:
+ if not isinstance(A,(matrix,spmatrix)) or A.typecode != 'd' or A.size[1] != n:
raise TypeError("'A' must be a dense or sparse 'd' matrix "\
"with %d columns" %n)
p = A.size[0]
if b is None: b = matrix(0.0, (0,1))
- if type(b) is not matrix or b.typecode != 'd' or b.size != (p,1):
+ if not isinstance(b,matrix) or b.typecode != 'd' or b.size != (p,1):
raise TypeError("'b' must be a dense matrix of size (%d,1)" %p)
dims = {'l': ml, 'q': [], 's': ms}
@@ -3909,7 +3883,7 @@ def sdp(c, Gl = None, hl = None, Gs = None, hs = None, A = None, b = None,
try: from cvxopt import dsdp
except ImportError: raise ValueError("invalid option "\
"(solver = 'dsdp'): cvxopt.dsdp is not installed")
- dsdp.options = options
+ dsdp.options = options.get('dsdp',{})
if p: raise ValueError("sdp() with the solver = 'dsdp' option "\
"does not handle problems with equality constraints")
dsdpstatus, x, r, zl, zs = dsdp.sdp(c, Gl, hl, Gs, hs)
@@ -4094,7 +4068,7 @@ def sdp(c, Gl = None, hl = None, Gs = None, hs = None, A = None, b = None,
'primal slack': pslack, 'dual slack': dslack}
h = matrix(0.0, (N,1))
- if type(Gl) is matrix or [ Gk for Gk in Gs if type(Gk) is matrix ]:
+ if isinstance(Gl,matrix) or [ Gk for Gk in Gs if isinstance(Gk,matrix) ]:
G = matrix(0.0, (N, n))
else:
G = spmatrix([], [], [], (N, n), 'd')
@@ -4135,8 +4109,7 @@ def sdp(c, Gl = None, hl = None, Gs = None, hs = None, A = None, b = None,
else:
ds = None
- sol = conelp(c, G, h, dims, A = A, b = b, primalstart = ps, dualstart
- = ds)
+ sol = conelp(c, G, h, dims, A = A, b = b, primalstart = ps, dualstart = ds, options = options)
if sol['s'] is None:
sol['sl'] = None
sol['ss'] = None
@@ -4167,7 +4140,7 @@ def sdp(c, Gl = None, hl = None, Gs = None, hs = None, A = None, b = None,
def qp(P, q, G = None, h = None, A = None, b = None, solver = None,
- initvals = None):
+ initvals = None, **kwargs):
"""
Solves a quadratic program
@@ -4348,6 +4321,8 @@ def qp(P, q, G = None, h = None, A = None, b = None, solver = None,
values.
"""
+ options = kwargs.get('options',globals()['options'])
+
from cvxopt import base, blas
from cvxopt.base import matrix, spmatrix
@@ -4359,10 +4334,7 @@ def qp(P, q, G = None, h = None, A = None, b = None, solver = None,
except ImportError: raise ValueError("invalid option "\
"(solver='mosek'): cvxopt.msk is not installed")
- if 'MOSEK' in options:
- msk.options = options['MOSEK']
- else:
- msk.options = {}
+ msk.options = options.get('mosek',{})
solsta, x, z, y = msk.qp(P, q, G, h, A, b)
n = q.size[0]
@@ -4376,8 +4348,9 @@ def qp(P, q, G = None, h = None, A = None, b = None, solver = None,
resy0 = max(1.0, blas.nrm2(b))
resz0 = max(1.0, blas.nrm2(h))
- if solsta == mosek.solsta.optimal:
- status = 'optimal'
+ if solsta in (mosek.solsta.optimal, mosek.solsta.near_optimal):
+ if solsta is mosek.solsta.optimal: status = 'optimal'
+ else: status = 'near optimal'
s = matrix(h)
base.gemv(G, x, s, alpha = -1.0, beta = 1.0)
@@ -4492,4 +4465,4 @@ def qp(P, q, G = None, h = None, A = None, b = None, solver = None,
'residual as primal infeasibility certificate': pinfres,
'residual as dual infeasibility certificate': dinfres}
- return coneqp(P, q, G, h, None, A, b, initvals)
+ return coneqp(P, q, G, h, None, A, b, initvals, options = options)
diff --git a/src/python/cvxprog.py b/src/python/cvxprog.py
index 6b98299..0aa78f1 100644
--- a/src/python/cvxprog.py
+++ b/src/python/cvxprog.py
@@ -6,10 +6,11 @@ for quadratic and geometric programming. Also includes an interface
to the quadratic programming solver from MOSEK.
"""
+# Copyright 2012-2015 M. Andersen and L. Vandenberghe.
# Copyright 2010-2011 L. Vandenberghe.
# Copyright 2004-2009 J. Dahl and L. Vandenberghe.
#
-# This file is part of CVXOPT version 1.1.4.
+# This file is part of CVXOPT version 1.1.8.
#
# CVXOPT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -24,6 +25,8 @@ to the quadratic programming solver from MOSEK.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+import sys
+if sys.version > '3': long = int
__all__ = []
options = {}
@@ -32,7 +35,7 @@ options = {}
def cpl(c, F, G = None, h = None, dims = None, A = None, b = None,
kktsolver = None, xnewcopy = None, xdot = None, xaxpy = None,
xscal = None, ynewcopy = None, ydot = None, yaxpy = None,
- yscal = None):
+ yscal = None, **kwargs):
"""
Solves a convex optimization problem with a linear objective
@@ -384,49 +387,41 @@ def cpl(c, F, G = None, h = None, dims = None, A = None, b = None,
EXPON = 3
MAX_RELAXED_ITERS = 8
- try: DEBUG = options['debug']
- except KeyError: DEBUG = False
-
- try: MAXITERS = options['maxiters']
- except KeyError: MAXITERS = 100
- else:
- if type(MAXITERS) is not int or MAXITERS < 1:
- raise ValueError("options['maxiters'] must be a positive "\
- "integer")
-
- try: ABSTOL = options['abstol']
- except KeyError: ABSTOL = 1e-7
- else:
- if type(ABSTOL) is not float and type(ABSTOL) is not int:
- raise ValueError("options['abstol'] must be a scalar")
-
- try: RELTOL = options['reltol']
- except KeyError: RELTOL = 1e-6
- else:
- if type(RELTOL) is not float and type(RELTOL) is not int:
- raise ValueError("options['reltol'] must be a scalar")
-
- try: FEASTOL = options['feastol']
- except KeyError: FEASTOL = 1e-7
- else:
- if (type(FEASTOL) is not float and type(FEASTOL) is not int) or \
- FEASTOL <= 0.0:
- raise ValueError("options['feastol'] must be a positive "\
- "scalar")
-
- if RELTOL <= 0.0 and ABSTOL <= 0.0:
+ options = kwargs.get('options',globals()['options'])
+
+ DEBUG = options.get('debug',False)
+
+ KKTREG = options.get('kktreg',None)
+ if KKTREG is None:
+ pass
+ elif not isinstance(KKTREG,(float,int,long)) or KKTREG < 0.0:
+ raise ValueError("options['kktreg'] must be a nonnegative scalar")
+
+ MAXITERS = options.get('maxiters',100)
+ if not isinstance(MAXITERS,(int,long)) or MAXITERS < 1:
+ raise ValueError("options['maxiters'] must be a positive integer")
+
+ ABSTOL = options.get('abstol',1e-7)
+ if not isinstance(ABSTOL,(float,int,long)):
+ raise ValueError("options['abstol'] must be a scalar")
+
+ RELTOL = options.get('reltol',1e-6)
+ if not isinstance(RELTOL,(float,int,long)):
+ raise ValueError("options['reltol'] must be a scalar")
+
+ if RELTOL <= 0.0 and ABSTOL <= 0.0 :
raise ValueError("at least one of options['reltol'] and " \
"options['abstol'] must be positive")
- try: show_progress = options['show_progress']
- except KeyError: show_progress = True
+ FEASTOL = options.get('feastol',1e-7)
+ if not isinstance(FEASTOL,(float,int,long)) or FEASTOL <= 0.0:
+ raise ValueError("options['feastol'] must be a positive scalar")
- try: refinement = options['refinement']
- except KeyError: refinement = 1
- else:
- if type(refinement) is not int or refinement < 0:
- raise ValueError("options['refinement'] must be a "\
- "nonnegative integer")
+ show_progress = options.get('show_progress', True)
+
+ refinement = options.get('refinement',1)
+ if not isinstance(refinement,(int,long)) or refinement < 0:
+ raise ValueError("options['refinement'] must be a nonnegative integer")
if kktsolver is None:
if dims and (dims['q'] or dims['s']):
@@ -530,7 +525,7 @@ def cpl(c, F, G = None, h = None, dims = None, A = None, b = None,
if kktsolver in defaultsolvers:
if kktsolver == 'ldl':
- factor = misc.kkt_ldl(G, dims, A, mnl)
+ factor = misc.kkt_ldl(G, dims, A, mnl, kktreg = KKTREG)
elif kktsolver == 'ldl2':
factor = misc.kkt_ldl2(G, dims, A, mnl)
elif kktsolver == 'chol':
@@ -1370,7 +1365,7 @@ def cpl(c, F, G = None, h = None, dims = None, A = None, b = None,
def cp(F, G = None, h = None, dims = None, A = None, b = None,
kktsolver = None, xnewcopy = None, xdot = None, xaxpy = None,
xscal = None, ynewcopy = None, ydot = None, yaxpy = None,
- yscal = None):
+ yscal = None, **kwargs):
"""
Solves a convex optimization problem
@@ -1654,6 +1649,9 @@ def cp(F, G = None, h = None, dims = None, A = None, b = None,
"""
+ options = kwargs.get('options',globals()['options'])
+ KKTREG = options.get('kktreg',None)
+
import math
from cvxopt import base, blas, misc
from cvxopt.base import matrix, spmatrix
@@ -1883,7 +1881,7 @@ def cp(F, G = None, h = None, dims = None, A = None, b = None,
kktsolver = 'chol2'
if kktsolver in ('ldl', 'chol', 'chol2', 'qr'):
if kktsolver == 'ldl':
- factor = misc.kkt_ldl(G, dims, A, mnl)
+ factor = misc.kkt_ldl(G, dims, A, mnl, kktreg = KKTREG)
elif kktsolver == 'qr':
factor = misc.kkt_qr(G, dims, A, mnl)
elif kktsolver == 'chol':
@@ -1903,8 +1901,10 @@ def cp(F, G = None, h = None, dims = None, A = None, b = None,
g = kktsolver(x[0], znl, We)
f, Df = F(x[0])
- if type(Df) is matrix or type(Df) is spmatrix:
+ if type(Df) is matrix:
gradf0 = Df[0,:].T
+ elif type(Df) is spmatrix:
+ gradf0 = matrix(Df[0,:].T)
else:
gradf0 = xnewcopy(x[0])
e0 = matrix(0.0, (mnl + 1, 1))
@@ -1963,14 +1963,14 @@ def cp(F, G = None, h = None, dims = None, A = None, b = None,
x[1] *= alpha
sol = cpl(c, F_e, G_e, h, dims, A_e, b, kktsolver_e, xnewcopy_e,
- xdot_e, xaxpy_e, xscal_e)
+ xdot_e, xaxpy_e, xscal_e, options = options)
sol['x'] = sol['x'][0]
sol['znl'], sol['snl'] = sol['znl'][1:], sol['snl'][1:]
return sol
-def gp(K, F, g, G=None, h=None, A=None, b=None):
+def gp(K, F, g, G=None, h=None, A=None, b=None, kktsolver=None, **kwargs):
"""
Solves a geometric program
@@ -2053,6 +2053,8 @@ def gp(K, F, g, G=None, h=None, A=None, b=None):
options['feastol'] scalar (default: 1e-7).
"""
+ options = kwargs.get('options',globals()['options'])
+
import math
from cvxopt import base, blas, misc
from cvxopt.base import matrix, spmatrix
@@ -2156,4 +2158,4 @@ def gp(K, F, g, G=None, h=None, A=None, b=None):
if z is None: return f, Df
else: return f, Df, H
- return cp(Fgp, G, h, dims, A, b)
+ return cp(Fgp, G, h, dims, A, b, kktsolver = kktsolver, options = options)
diff --git a/src/python/info.py b/src/python/info.py
index c20846d..3887f13 100644
--- a/src/python/info.py
+++ b/src/python/info.py
@@ -1,8 +1,9 @@
-version = '1.1.4'
+version = '1.1.8'
def license(): print(
"""
-CVXOPT version 1.1.4.
+CVXOPT version 1.1.8.
+Copyright (c) 2012-2015 M. Andersen and L. Vandenberghe.
Copyright (c) 2010-2011 L. Vandenberghe.
Copyright (c) 2004-2009 J. Dahl and L. Vandenberghe.
@@ -20,22 +21,23 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
----
-The CVXOPT distribution includes source code for part of the SuiteSparse
-suite of sparse matrix algorithms, including:
+The CVXOPT distribution includes source code for a subset of the
+SuiteSparse suite of sparse matrix algorithms (version 4.1.0).
+This includes:
-- AMD Version 2.2. Copyright (c) 2007 by Timothy A. Davis, Patrick R.
- Amestoy, and Iain S. Duff.
-- CHOLMOD Version 1.7.1. Copyright (c) 2005-2009 by University of Florida,
- Timothy A. Davis and W. Hager.
-- COLAMD version 2.7. Copyright (c) 1998-2007 by Timothy A. Davis.
-- UMFPACK Version 5.4.0. Copyright (c) 1994-2009 by Timothy A. Davis.
+- AMD Version 2.3.1. Copyright (c) 2009-2012 by Timothy A. Davis,
+ Patrick R. Amestoy, and Iain S. Duff.
+- CHOLMOD Version 2.1.0 Copyright (c) 2005-2013 by University of Florida,
+ Timothy A. Davis, and W. Hager.
+- COLAMD version 2.8.0. Copyright (c) 1998-2012 by Timothy A. Davis.
+- UMFPACK Version 5.6.1. Copyright (c) 1995-2012 by Timothy A. Davis.
These packages are licensed under the terms of the GNU General Public
-License, version 2 or higher (UMFPACK, the Supernodal module of CHOLMOD),
-and the GNU Lesser General Public License, version 2.1 or higher
-(the other CHOLMOD modules, AMD, COLAMD). For copyright and license
-details, consult the README files in the source directories or the website
-listed below.
+License, version 2 or higher (UMFPACK, the Supernodal and MatrixOPs
+modules of CHOLMOD) and the GNU Lesser General Public License,
+version 2.1 or higher (the other CHOLMOD modules, AMD, COLAMD).
+For copyright and license details, consult the README files in the source
+directories or the website listed below.
Availability: www.cise.ufl.edu/research/sparse.
"""
diff --git a/src/python/misc.py b/src/python/misc.py
index 911f21e..4e96758 100644
--- a/src/python/misc.py
+++ b/src/python/misc.py
@@ -1,7 +1,8 @@
+# Copyright 2012-2015 M. Andersen and L. Vandenberghe.
# Copyright 2010-2011 L. Vandenberghe.
# Copyright 2004-2009 J. Dahl and L. Vandenberghe.
#
-# This file is part of CVXOPT version 1.1.4.
+# This file is part of CVXOPT version 1.1.8.
#
# CVXOPT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -222,11 +223,11 @@ else:
# For the 's' blocks, if inverse is 'N',
#
- # xk := vec( diag(l)^{-1/2} * mat(xk) * diag(k)^{-1/2}).
+ # xk := vec( diag(l)^{-1/2} * mat(xk) * diag(l)^{-1/2}).
#
# If inverse is 'I',
#
- # xk := vec( diag(l)^{1/2} * mat(xk) * diag(k)^{1/2}).
+ # xk := vec( diag(l)^{1/2} * mat(xk) * diag(l)^{1/2}).
#
# where l is kth block of lambda.
#
@@ -1051,7 +1052,7 @@ else:
else: return 0.0
-def kkt_ldl(G, dims, A, mnl = 0):
+def kkt_ldl(G, dims, A, mnl = 0, kktreg = None):
"""
Solution of KKT equations by a dense LDL factorization of the
3 x 3 system.
@@ -1092,6 +1093,9 @@ def kkt_ldl(G, dims, A, mnl = 0):
scale(g, W, trans = 'T', inverse = 'I')
pack(g, K, dims, mnl, offsety = k*ldK + n + p)
K[(ldK+1)*(p+n) :: ldK+1] = -1.0
+ if kktreg:
+ K[0 : (ldK+1)*n : ldK+1] += kktreg # Reg. term, 1x1 block (positive)
+ K[(ldK+1)*n :: ldK+1] -= kktreg # Reg. term, 2x2 block (negative)
lapack.sytrf(K, ipiv)
def solve(x, y, z):
diff --git a/src/python/modeling.py b/src/python/modeling.py
index 3d80997..559893f 100644
--- a/src/python/modeling.py
+++ b/src/python/modeling.py
@@ -5,10 +5,11 @@ Routines for specifying and solving convex optimization problems with
piecewise-linear objective and constraint functions.
"""
+# Copyright 2012-2015 M. Andersen and L. Vandenberghe.
# Copyright 2010-2011 L. Vandenberghe.
# Copyright 2004-2009 J. Dahl and L. Vandenberghe.
#
-# This file is part of CVXOPT version 1.1.4.
+# This file is part of CVXOPT version 1.1.8.
#
# CVXOPT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/python/msk.py b/src/python/msk.py
index 6773ccc..b1a18e9 100644
--- a/src/python/msk.py
+++ b/src/python/msk.py
@@ -1,11 +1,12 @@
"""
-CVXOPT interface for MOSEK 6.0
+CVXOPT interface for MOSEK 7.0
"""
+# Copyright 2012-2015 M. Andersen and L. Vandenberghe.
# Copyright 2010-2011 L. Vandenberghe.
# Copyright 2004-2009 J. Dahl and L. Vandenberghe.
#
-# This file is part of CVXOPT version 1.1.4.
+# This file is part of CVXOPT version 1.1.8.
#
# CVXOPT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,7 +26,7 @@ import mosek
from cvxopt import matrix, spmatrix, sparse
from mosek.array import array, zeros
env = mosek.Env()
-env.init()
+
def streamprinter(text): print(text)
env.set_Stream (mosek.streamtype.log, streamprinter)
@@ -42,16 +43,16 @@ def lp(c, G, h, A=None, b=None):
A*x = b z >= 0.
s >= 0
- using MOSEK 6.0.
+ using MOSEK 7.0.
(solsta, x, z, y) = lp(c, G, h, A=None, b=None).
Input arguments
- G is m x n, h is m x 1, A is p x n, b is p x 1. G and A must be
- dense or sparse 'd' matrices. h and b are dense 'd' matrices
- with one column. The default values for A and b are empty
- matrices with zero rows.
+ c is n x 1, G is m x n, h is m x 1, A is p x n, b is p x 1. G and
+ A must be dense or sparse 'd' matrices. c, h and b are dense 'd'
+ matrices with one column. The default values for A and b are
+ empty matrices with zero rows.
Return values
@@ -158,7 +159,7 @@ def lp(c, G, h, A=None, b=None):
task.solutionsummary (mosek.streamtype.msg);
- prosta, solsta = task.getsolutionstatus(mosek.soltype.bas)
+ solsta = task.getsolsta(mosek.soltype.bas)
x, z = zeros(n, float), zeros(m, float)
task.getsolutionslice(mosek.soltype.bas, mosek.solitem.xx, 0, n, x)
@@ -193,7 +194,7 @@ def conelp(c, G, h, dims = None):
subject to G'*z + c = 0
z >= 0
- using MOSEK 6.0.
+ using MOSEK 7.0.
The inequalities are with respect to a cone C defined as the Cartesian
product of N + 1 cones:
@@ -355,7 +356,7 @@ def conelp(c, G, h, dims = None):
task.solutionsummary (mosek.streamtype.msg);
- prosta, solsta = task.getsolutionstatus(mosek.soltype.itr)
+ solsta = task.getsolsta(mosek.soltype.itr)
xu, xl, zq = zeros(n, float), zeros(n, float), zeros(sum(mq), float)
task.getsolutionslice(mosek.soltype.itr, mosek.solitem.slc, 0, n, xl)
@@ -393,7 +394,7 @@ def socp(c, Gl = None, hl = None, Gq = None, hq = None):
subject to Gl'*zl + sum_k Gq[k]'*zq[k] + c = 0
zl >= 0, zq[k] >= 0, k = 0, ..., N-1.
- using MOSEK 6.0.
+ using MOSEK 7.0.
solsta, x, zl, zq = socp(c, Gl = None, hl = None, Gq = None, hq = None)
@@ -534,13 +535,13 @@ def socp(c, Gl = None, hl = None, Gq = None, hq = None):
task.solutionsummary (mosek.streamtype.msg);
- prosta, solsta = task.getsolutionstatus(mosek.soltype.itr)
+ solsta = task.getsolsta(mosek.soltype.itr)
xu, xl, zq = zeros(n, float), zeros(n, float), zeros(sum(mq), float)
task.getsolutionslice(mosek.soltype.itr, mosek.solitem.slc, 0, n, xl)
task.getsolutionslice(mosek.soltype.itr, mosek.solitem.suc, 0, n, xu)
task.getsolutionslice(mosek.soltype.itr, mosek.solitem.xx, ml, N, zq)
- x = matrix(xu-xl)
+ x = matrix(xu) - matrix(xl)
zq = [ matrix(zq[sum(mq[:k]):sum(mq[:k+1])]) for k in range(len(mq)) ]
@@ -566,7 +567,7 @@ def qp(P, q, G=None, h=None, A=None, b=None):
subject to G*x <= h
A*x = b.
- using MOSEK 6.0.
+ using MOSEK 7.0.
solsta, x, z, y = qp(P, q, G=None, h=None, A=None, b=None)
@@ -689,7 +690,7 @@ def qp(P, q, G=None, h=None, A=None, b=None):
task.solutionsummary (mosek.streamtype.msg);
- prosta, solsta = task.getsolutionstatus(mosek.soltype.itr)
+ solsta = task.getsolsta(mosek.soltype.itr)
x = zeros(n, float)
task.getsolutionslice(mosek.soltype.itr, mosek.solitem.xx, 0, n, x)
@@ -729,7 +730,7 @@ def ilp(c, G, h, A=None, b=None, I=None):
s >= 0
xi integer, forall i in I
- using MOSEK 6.0.
+ using MOSEK 7.0.
solsta, x = ilp(c, G, h, A=None, b=None, I=None).
@@ -864,9 +865,9 @@ def ilp(c, G, h, A=None, b=None, I=None):
task.solutionsummary (mosek.streamtype.msg);
if len(I) > 0:
- prosta, solsta = task.getsolutionstatus(mosek.soltype.itg)
+ solsta = task.getsolsta(mosek.soltype.itg)
else:
- prosta, solsta = task.getsolutionstatus(mosek.soltype.bas)
+ solsta = task.getsolsta(mosek.soltype.bas)
x = zeros(n, float)
if len(I) > 0:
diff --git a/src/python/printing.py b/src/python/printing.py
index 78d3e6c..4bac631 100644
--- a/src/python/printing.py
+++ b/src/python/printing.py
@@ -1,7 +1,8 @@
+# Copyright 2012-2015 M. Andersen and L. Vandenberghe.
# Copyright 2010-2011 L. Vandenberghe.
# Copyright 2004-2009 J. Dahl and L. Vandenberghe.
#
-# This file is part of CVXOPT version 1.1.4.
+# This file is part of CVXOPT version 1.1.8.
#
# CVXOPT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -69,9 +70,9 @@ def matrix_str_default(X):
else: s = s[:-1] + ']\n'
if height < m:
- s += "[" + min(n,width)*(center(':',twidth)+' ')
+ s += "[" + min(n,width)*(':'.center(twidth)+' ')
- if width < n: s += ' ]\n'
+ if width < n: s += ' ]\n'
else: s = s[:-1] + ']\n'
return s
diff --git a/src/python/solvers.py b/src/python/solvers.py
index 38b8326..8c15095 100644
--- a/src/python/solvers.py
+++ b/src/python/solvers.py
@@ -13,10 +13,11 @@ socp: solves second-order cone programs.
options: dictionary with customizable algorithm parameters.
"""
+# Copyright 2012-2015 M. Andersen and L. Vandenberghe.
# Copyright 2010-2011 L. Vandenberghe.
# Copyright 2004-2009 J. Dahl and L. Vandenberghe.
#
-# This file is part of CVXOPT version 1.1.4.
+# This file is part of CVXOPT version 1.1.8.
#
# CVXOPT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/setup.py b/src/setup.py
deleted file mode 100644
index d231863..0000000
--- a/src/setup.py
+++ /dev/null
@@ -1,168 +0,0 @@
-from distutils.core import setup, Extension
-from glob import glob
-
-# directory containing libblas and liblapack
-ATLAS_LIB_DIR = '/usr/lib'
-
-# Set to 1 if you are using the random number generators in the GNU
-# Scientific Library.
-BUILD_GSL = 0
-
-# Directory containing libgsl (used only when BUILD_GSL = 1).
-GSL_LIB_DIR = '/usr/lib'
-
-# Directory containing the GSL header files (used only when BUILD_GSL = 1).
-GSL_INC_DIR = '/usr/include/gsl'
-
-# Set to 1 if you are installing the fftw module.
-BUILD_FFTW = 0
-
-# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
-FFTW_LIB_DIR = '/usr/lib'
-
-# Directory containing fftw.h (used only when BUILD_FFTW = 1).
-FFTW_INC_DIR = '/usr/include'
-
-# Set to 1 if you are installing the glpk module.
-BUILD_GLPK = 0
-
-# Directory containing libglpk (used only when BUILD_GLPK = 1).
-GLPK_LIB_DIR = '/usr/lib'
-
-# Directory containing glpk.h (used only when BUILD_GLPK = 1).
-GLPK_INC_DIR = '/usr/include'
-
-# Set to 1 if you are installing the DSDP module.
-BUILD_DSDP = 0
-
-# Directory containing libdsdp (used only when BUILD_DSDP = 1).
-DSDP_LIB_DIR = '/usr/lib'
-
-# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
-DSDP_INC_DIR = '/usr/include'
-
-extmods = []
-
-# optional modules
-
-if BUILD_GSL:
- gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
- include_dirs = [ GSL_INC_DIR ],
- library_dirs = [ GSL_LIB_DIR ],
- sources = ['C/gsl.c'] )
- extmods += [gsl];
-
-if BUILD_FFTW:
- fftw = Extension('fftw', libraries = ['fftw3', 'blas'],
- include_dirs = [ FFTW_INC_DIR ],
- library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
- sources = ['C/fftw.c'] )
- extmods += [fftw];
-
-if BUILD_GLPK:
- glpk = Extension('glpk', libraries = ['glpk'],
- include_dirs = [ GLPK_INC_DIR ],
- library_dirs = [ GLPK_LIB_DIR ],
- sources = ['C/glpk.c'] )
- extmods += [glpk];
-
-if BUILD_DSDP:
- dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
- include_dirs = [ DSDP_INC_DIR ],
- library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
- sources = ['C/dsdp.c'] )
- extmods += [dsdp];
-
-
-# required modules
-
-# Modify this for compilation on Windows.
-# Set to True if your BLAS/LAPACK do not use trailing underscores
-# (eg, on Windows).
-BLAS_NOUNDERSCORES = False
-if BLAS_NOUNDERSCORES:
- MACROS = [('BLAS_NO_UNDERSCORE','')]
-else:
- MACROS = []
-
-base = Extension('base', libraries = ['m','lapack','blas'],
- library_dirs = [ ATLAS_LIB_DIR ],
- define_macros = MACROS,
- sources = ['C/base.c','C/dense.c','C/sparse.c'])
-
-blas = Extension('blas', libraries = ['blas'],
- library_dirs = [ ATLAS_LIB_DIR ],
- define_macros = MACROS,
- sources = ['C/blas.c'] )
-
-lapack = Extension('lapack', libraries = ['lapack','blas'],
- library_dirs = [ ATLAS_LIB_DIR ],
- define_macros = MACROS,
- sources = ['C/lapack.c'] )
-
-umfpack = Extension('umfpack',
- include_dirs = [ 'C/SuiteSparse/UMFPACK/Include',
- 'C/SuiteSparse/AMD/Include', 'C/SuiteSparse/AMD/Source',
- 'C/SuiteSparse/UFconfig' ],
- library_dirs = [ ATLAS_LIB_DIR ],
- define_macros = MACROS,
- libraries = [ 'blas', 'lapack'],
- sources = [ 'C/umfpack.c',
- 'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
- 'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
- glob('C/SuiteSparse_cvxopt_extra/umfpack/*'))
-
-# Build for int or long?
-import sys
-if sys.maxsize > 2**31: MACROS += [('DLONG','')]
-
-cholmod = Extension('cholmod',
- library_dirs = [ ATLAS_LIB_DIR ],
- libraries = ['lapack', 'blas'],
- include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include',
- 'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include',
- 'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
- define_macros = MACROS + [('NPARTITION', '1')],
- sources = [ 'C/cholmod.c' ] +
- ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
- 'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
- ['C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
- 'colamd_global.c']] +
- glob('C/SuiteSparse/CHOLMOD/Core/c*.c') +
- glob('C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
- ['C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
- glob('C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
-
-amd = Extension('amd',
- include_dirs = [ 'C/SuiteSparse/AMD/Include',
- 'C/SuiteSparse/UFconfig' ],
- define_macros = MACROS,
- sources = [ 'C/amd.c' ] + glob('C/SuiteSparse/AMD/Source/*.c') )
-
-misc_solvers = Extension('misc_solvers', libraries = ['lapack', 'blas'],
- library_dirs = [ ATLAS_LIB_DIR ],
- define_macros = MACROS,
- sources = ['C/misc_solvers.c'] )
-
-extmods += [base, blas, lapack, umfpack, cholmod, amd, misc_solvers]
-
-setup (name = 'cvxopt',
- description = 'Convex optimization package',
- version = '1.1.4',
- long_description = '''
-CVXOPT is a free software package for convex optimization based on the
-Python programming language. It can be used with the interactive Python
-interpreter, on the command line by executing Python scripts, or
-integrated in other software via Python extension modules. Its main
-purpose is to make the development of software for convex optimization
-applications straightforward by building on Python's extensive standard
-library and on the strengths of Python as a high-level programming
-language.''',
- author = 'J. Dahl and L. Vandenberghe',
- author_email = 'dahl.joachim at gmail.com, vandenbe at ee.ucla.edu',
- url = 'http://abel.ee.ucla.edu/cvxopt',
- license = 'GNU GPL version 3',
- ext_package = "cvxopt",
- ext_modules = extmods,
- package_dir = {"cvxopt": "python"},
- packages = ["cvxopt"])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cvxopt.git
More information about the debian-science-commits
mailing list