diff --git a/Cargo.lock.MSRV b/Cargo.lock.MSRV index f3b4b30e..76ef48d8 100644 --- a/Cargo.lock.MSRV +++ b/Cargo.lock.MSRV @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -19,15 +19,15 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" [[package]] name = "approx" @@ -40,27 +40,27 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] -name = "bumpalo" -version = "3.16.0" +name = "bitflags" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29" [[package]] -name = "bytemuck" -version = "1.20.0" +name = "bumpalo" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] -name = "byteorder" -version = "1.5.0" +name = "bytemuck" +version = "1.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" [[package]] name = "cast" @@ -70,9 +70,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "ciborium" @@ -103,18 +103,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.21" +version = "4.5.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "1fc0e74a703892159f5ae7d3aac52c8e6c392f5ae5f359c70b5881d60aaac318" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8" dependencies = [ "anstyle", "clap_lex", @@ -122,9 +122,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "criterion" @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -183,38 +183,135 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "getrandom" -version = "0.2.15" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "libc", + "r-efi", "wasi", ] +[[package]] +name = "glam" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "333928d5eb103c5d4050533cec0384302db6be8ef7d3cebd30ec6a35350353da" + +[[package]] +name = "glam" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3abb554f8ee44336b72d522e0a7fe86a29e09f839a36022fa869a7dfe941a54b" + +[[package]] +name = "glam" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4126c0479ccf7e8664c36a2d719f5f2c140fbb4f9090008098d2c291fa5b3f16" + +[[package]] +name = "glam" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01732b97afd8508eee3333a541b9f7610f454bb818669e66e90f5f57c93a776" + +[[package]] +name = "glam" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525a3e490ba77b8e326fb67d4b44b4bd2f920f44d4cc73ccec50adc68e3bee34" + +[[package]] +name = "glam" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b8509e6791516e81c1a630d0bd7fbac36d2fa8712a9da8662e716b52d5051ca" + +[[package]] +name = "glam" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f" + +[[package]] +name = "glam" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815" + +[[package]] +name = "glam" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774" + +[[package]] +name = "glam" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c" + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glam" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" + +[[package]] +name = "glam" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9" + +[[package]] +name = "glam" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" + +[[package]] +name = "glam" +version = "0.29.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8babf46d4c1c9d92deac9f7be466f76dfc4482b6452fc5024b5e8daf6ffeb3ee" + +[[package]] +name = "glam" +version = "0.30.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2d1aab06663bdce00d6ca5e5ed586ec8d18033a771906c993a1e3755b368d85" + [[package]] name = "half" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" dependencies = [ "cfg-if", "crunchy", @@ -222,19 +319,19 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "is-terminal" -version = "0.4.13" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] @@ -248,15 +345,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" -version = "0.3.74" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -264,27 +361,27 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.167" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "libm" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matrixmultiply" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" +checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08" dependencies = [ "autocfg", "rawpointer", @@ -292,17 +389,33 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "nalgebra" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26aecdf64b707efd1310e3544d709c5c0ac61c13756046aaaba41be5c4f66a3b" +checksum = "9cd59afb6639828b33677758314a4a1a745c15c02bc597095b851c8fd915cf49" dependencies = [ "approx", + "glam 0.14.0", + "glam 0.15.2", + "glam 0.16.0", + "glam 0.17.3", + "glam 0.18.0", + "glam 0.19.0", + "glam 0.20.5", + "glam 0.21.3", + "glam 0.22.0", + "glam 0.23.0", + "glam 0.24.2", + "glam 0.25.0", + "glam 0.27.0", + "glam 0.28.0", + "glam 0.29.3", + "glam 0.30.5", "matrixmultiply", "nalgebra-macros", "num-complex", @@ -316,9 +429,9 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" +checksum = "973e7178a678cfd059ccec50887658d482ce16b0aa9da3888ddeab5cd5eb4889" dependencies = [ "proc-macro2", "quote", @@ -376,15 +489,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "oorandom" -version = "11.1.4" +version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" [[package]] name = "paste" @@ -422,47 +535,52 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ "zerocopy", ] [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" -version = "0.8.5" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "libc", "rand_chacha", "rand_core", ] [[package]] name = "rand_chacha" -version = "0.3.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", "rand_core", @@ -470,18 +588,18 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ "getrandom", ] [[package]] name = "rand_distr" -version = "0.4.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463" dependencies = [ "num-traits", "rand", @@ -495,9 +613,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -505,9 +623,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -542,17 +660,23 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "safe_arch" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" +checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323" dependencies = [ "bytemuck", ] @@ -568,18 +692,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.215" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -588,9 +712,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" dependencies = [ "itoa", "memchr", @@ -625,9 +749,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.90" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -646,15 +770,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "walkdir" @@ -668,30 +792,33 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] [[package]] name = "wasm-bindgen" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -700,9 +827,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -710,9 +837,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -723,15 +850,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.97" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.74" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -739,9 +869,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.30" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e6db2670d2be78525979e9a5f9c69d296fd7d670549fe9ebf70f8708cb5019" +checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03" dependencies = [ "bytemuck", "safe_arch", @@ -753,16 +883,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", + "windows-sys", ] [[package]] @@ -838,21 +959,29 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index c0c30eef..5626ab84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" include = ["CHANGELOG.md", "LICENSE.md", "src/", "tests/"] # When changing MSRV: Also update the README -rust-version = "1.65.0" +rust-version = "1.87.0" [lib] name = "statrs" @@ -36,12 +36,12 @@ approx = "0.5.0" num-traits = "0.2.14" [dependencies.rand] -version = "0.8" +version = "0.9.0" optional = true default-features = false [dependencies.nalgebra] -version = "0.33" +version = "0.34" optional = true default-features = false @@ -50,7 +50,7 @@ criterion = "0.5" anyhow = "1.0" [dev-dependencies.nalgebra] -version = "0.33" +version = "0.34" default-features = false features = ["macros"] diff --git a/README.md b/README.md index 4c3f2398..88b53de1 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ If you'd like to modify where the data is downloaded, you can use the environmen ## Minimum supported Rust version (MSRV) -This crate requires a Rust version of 1.65.0 or higher. Increases in MSRV will be considered a semver non-breaking API change and require a version increase (PATCH until 1.0.0, MINOR after 1.0.0). +This crate requires a Rust version of 1.87.0 or higher. Increases in MSRV will be considered a semver non-breaking API change and require a version increase (PATCH until 1.0.0, MINOR after 1.0.0). ## Precision Floating-point numbers cannot always represent decimal values exactly, which can introduce small (and in some cases catastrophically large) errors in computations. diff --git a/benches/order_statistics.rs b/benches/order_statistics.rs index d94902c9..eb7d6582 100644 --- a/benches/order_statistics.rs +++ b/benches/order_statistics.rs @@ -4,15 +4,15 @@ use rand::prelude::*; use statrs::statistics::*; fn bench_order_statistic(c: &mut Criterion) { - let mut rng = thread_rng(); + let mut rng = rand::rng(); let to_random_owned = |data: &[f64]| -> Data> { - let mut rng = thread_rng(); + let mut rng = rand::rng(); let mut owned = data.to_vec(); owned.shuffle(&mut rng); Data::new(owned) }; - let k = black_box(rng.gen()); - let tau = black_box(rng.gen_range(0.0..1.0)); + let k = black_box(rng.random_range(..=usize::MAX)); + let tau = black_box(rng.random_range(0.0..1.0)); let mut group = c.benchmark_group("order statistic"); let data: Vec<_> = (0..100).map(|x| x as f64).collect(); group.bench_function("order_statistic", |b| { diff --git a/src/distribution/bernoulli.rs b/src/distribution/bernoulli.rs index fa1f100f..e9928209 100644 --- a/src/distribution/bernoulli.rs +++ b/src/distribution/bernoulli.rs @@ -86,15 +86,15 @@ impl core::fmt::Display for Bernoulli { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Bernoulli { +impl ::rand::distr::Distribution for Bernoulli { fn sample(&self, rng: &mut R) -> bool { - rng.gen_bool(self.p()) + rng.random_bool(self.p()) } } #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Bernoulli { +impl ::rand::distr::Distribution for Bernoulli { fn sample(&self, rng: &mut R) -> f64 { rng.sample::(self) as u8 as f64 } diff --git a/src/distribution/beta.rs b/src/distribution/beta.rs index 4bb33025..1fc94e7e 100644 --- a/src/distribution/beta.rs +++ b/src/distribution/beta.rs @@ -116,7 +116,7 @@ impl core::fmt::Display for Beta { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Beta { +impl ::rand::distr::Distribution for Beta { fn sample(&self, rng: &mut R) -> f64 { // Generated by sampling two gamma distributions and normalizing. let x = super::gamma::sample_unchecked(rng, self.shape_a, 1.0); diff --git a/src/distribution/binomial.rs b/src/distribution/binomial.rs index bf1afd28..6fd7e014 100644 --- a/src/distribution/binomial.rs +++ b/src/distribution/binomial.rs @@ -113,10 +113,10 @@ impl core::fmt::Display for Binomial { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Binomial { +impl ::rand::distr::Distribution for Binomial { fn sample(&self, rng: &mut R) -> u64 { (0..self.n).fold(0, |acc, _| { - let n: f64 = rng.gen(); + let n: f64 = rng.random(); if n < self.p { acc + 1 } else { @@ -128,7 +128,7 @@ impl ::rand::distributions::Distribution for Binomial { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Binomial { +impl ::rand::distr::Distribution for Binomial { fn sample(&self, rng: &mut R) -> f64 { rng.sample::(self) as f64 } diff --git a/src/distribution/categorical.rs b/src/distribution/categorical.rs index 10e1fdc5..bb06aa1e 100644 --- a/src/distribution/categorical.rs +++ b/src/distribution/categorical.rs @@ -127,7 +127,7 @@ impl core::fmt::Display for Categorical { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Categorical { +impl ::rand::distr::Distribution for Categorical { fn sample(&self, rng: &mut R) -> usize { sample_unchecked(rng, &self.cdf) } @@ -135,7 +135,7 @@ impl ::rand::distributions::Distribution for Categorical { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Categorical { +impl ::rand::distr::Distribution for Categorical { fn sample(&self, rng: &mut R) -> u64 { sample_unchecked(rng, &self.cdf) as u64 } @@ -143,7 +143,7 @@ impl ::rand::distributions::Distribution for Categorical { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Categorical { +impl ::rand::distr::Distribution for Categorical { fn sample(&self, rng: &mut R) -> f64 { sample_unchecked(rng, &self.cdf) as f64 } @@ -344,7 +344,7 @@ impl Discrete for Categorical { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] pub fn sample_unchecked(rng: &mut R, cdf: &[f64]) -> usize { - let draw = rng.gen::() * cdf.last().unwrap(); + let draw = rng.random::() * cdf.last().unwrap(); cdf.iter().position(|val| *val >= draw).unwrap() } diff --git a/src/distribution/cauchy.rs b/src/distribution/cauchy.rs index d2d8a090..e6d00eb8 100644 --- a/src/distribution/cauchy.rs +++ b/src/distribution/cauchy.rs @@ -113,9 +113,9 @@ impl core::fmt::Display for Cauchy { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Cauchy { +impl ::rand::distr::Distribution for Cauchy { fn sample(&self, r: &mut R) -> f64 { - self.location + self.scale * (f64::consts::PI * (r.gen::() - 0.5)).tan() + self.location + self.scale * (f64::consts::PI * (r.random::() - 0.5)).tan() } } diff --git a/src/distribution/chi.rs b/src/distribution/chi.rs index 4ff0f8ec..b0864792 100644 --- a/src/distribution/chi.rs +++ b/src/distribution/chi.rs @@ -95,7 +95,7 @@ impl core::fmt::Display for Chi { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Chi { +impl ::rand::distr::Distribution for Chi { fn sample(&self, rng: &mut R) -> f64 { (0..self.freedom()) .fold(0.0, |acc, _| { diff --git a/src/distribution/chi_squared.rs b/src/distribution/chi_squared.rs index 859d969a..8fd52b4c 100644 --- a/src/distribution/chi_squared.rs +++ b/src/distribution/chi_squared.rs @@ -102,9 +102,9 @@ impl core::fmt::Display for ChiSquared { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for ChiSquared { +impl ::rand::distr::Distribution for ChiSquared { fn sample(&self, r: &mut R) -> f64 { - ::rand::distributions::Distribution::sample(&self.g, r) + ::rand::distr::Distribution::sample(&self.g, r) } } diff --git a/src/distribution/dirac.rs b/src/distribution/dirac.rs index c2650acd..5d42238b 100644 --- a/src/distribution/dirac.rs +++ b/src/distribution/dirac.rs @@ -85,7 +85,7 @@ impl core::fmt::Display for Dirac { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Dirac { +impl ::rand::distr::Distribution for Dirac { fn sample(&self, _: &mut R) -> f64 { self.0 } diff --git a/src/distribution/dirichlet.rs b/src/distribution/dirichlet.rs index 600a37ce..8191035b 100644 --- a/src/distribution/dirichlet.rs +++ b/src/distribution/dirichlet.rs @@ -194,7 +194,7 @@ where #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution> for Dirichlet +impl ::rand::distr::Distribution> for Dirichlet where D: Dim, nalgebra::DefaultAllocator: nalgebra::allocator::Allocator, diff --git a/src/distribution/discrete_uniform.rs b/src/distribution/discrete_uniform.rs index 5ce1a0b1..099b15fe 100644 --- a/src/distribution/discrete_uniform.rs +++ b/src/distribution/discrete_uniform.rs @@ -115,15 +115,15 @@ impl core::fmt::Display for DiscreteUniform { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for DiscreteUniform { +impl ::rand::distr::Distribution for DiscreteUniform { fn sample(&self, rng: &mut R) -> i64 { - rng.gen_range(self.min..=self.max) + rng.random_range(self.min..=self.max) } } #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for DiscreteUniform { +impl ::rand::distr::Distribution for DiscreteUniform { fn sample(&self, rng: &mut R) -> f64 { rng.sample::(self) as f64 } diff --git a/src/distribution/empirical.rs b/src/distribution/empirical.rs index 841d8de1..74a2503f 100644 --- a/src/distribution/empirical.rs +++ b/src/distribution/empirical.rs @@ -214,7 +214,7 @@ impl FromIterator for Empirical { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Empirical { +impl ::rand::distr::Distribution for Empirical { fn sample(&self, rng: &mut R) -> f64 { use crate::distribution::Uniform; diff --git a/src/distribution/erlang.rs b/src/distribution/erlang.rs index 3a792521..8fd5440f 100644 --- a/src/distribution/erlang.rs +++ b/src/distribution/erlang.rs @@ -84,9 +84,9 @@ impl core::fmt::Display for Erlang { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Erlang { +impl ::rand::distr::Distribution for Erlang { fn sample(&self, rng: &mut R) -> f64 { - ::rand::distributions::Distribution::sample(&self.g, rng) + ::rand::distr::Distribution::sample(&self.g, rng) } } diff --git a/src/distribution/exponential.rs b/src/distribution/exponential.rs index 646b08bc..54d3e263 100644 --- a/src/distribution/exponential.rs +++ b/src/distribution/exponential.rs @@ -93,7 +93,7 @@ impl core::fmt::Display for Exp { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Exp { +impl ::rand::distr::Distribution for Exp { fn sample(&self, r: &mut R) -> f64 { use crate::distribution::ziggurat; diff --git a/src/distribution/fisher_snedecor.rs b/src/distribution/fisher_snedecor.rs index 13bae9bf..44781e44 100644 --- a/src/distribution/fisher_snedecor.rs +++ b/src/distribution/fisher_snedecor.rs @@ -126,7 +126,7 @@ impl core::fmt::Display for FisherSnedecor { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for FisherSnedecor { +impl ::rand::distr::Distribution for FisherSnedecor { fn sample(&self, rng: &mut R) -> f64 { (super::gamma::sample_unchecked(rng, self.freedom_1 / 2.0, 0.5) * self.freedom_2) / (super::gamma::sample_unchecked(rng, self.freedom_2 / 2.0, 0.5) * self.freedom_1) diff --git a/src/distribution/gamma.rs b/src/distribution/gamma.rs index 94c35623..341e3122 100644 --- a/src/distribution/gamma.rs +++ b/src/distribution/gamma.rs @@ -125,7 +125,7 @@ impl core::fmt::Display for Gamma { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Gamma { +impl ::rand::distr::Distribution for Gamma { fn sample(&self, rng: &mut R) -> f64 { sample_unchecked(rng, self.shape, self.rate) } @@ -410,7 +410,7 @@ pub fn sample_unchecked(rng: &mut R, shape: f64, rate: let mut afix = 1.0; if shape < 1.0 { a = shape + 1.0; - afix = rng.gen::().powf(1.0 / shape); + afix = rng.random::().powf(1.0 / shape); } let d = a - 1.0 / 3.0; @@ -428,7 +428,7 @@ pub fn sample_unchecked(rng: &mut R, shape: f64, rate: v = v * v * v; x = x * x; - let u: f64 = rng.gen(); + let u: f64 = rng.random(); if u < 1.0 - 0.0331 * x * x || u.ln() < 0.5 * x + d * (1.0 - v + v.ln()) { return afix * d * v / rate; } diff --git a/src/distribution/geometric.rs b/src/distribution/geometric.rs index dbeb5767..e794fdf9 100644 --- a/src/distribution/geometric.rs +++ b/src/distribution/geometric.rs @@ -94,12 +94,12 @@ impl core::fmt::Display for Geometric { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Geometric { +impl ::rand::distr::Distribution for Geometric { fn sample(&self, r: &mut R) -> u64 { if prec::ulps_eq!(self.p, 1.0) { 1 } else { - let x: f64 = r.sample(::rand::distributions::OpenClosed01); + let x: f64 = r.sample(::rand::distr::OpenClosed01); // This cast is safe, because the largest finite value this expression can take is when // `x = 1.4e-45` and `1.0 - self.p = 0.9999999999999999`, in which case we get // `930262250532780300`, which when casted to a `u64` is `930262250532780288`. @@ -110,7 +110,7 @@ impl ::rand::distributions::Distribution for Geometric { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Geometric { +impl ::rand::distr::Distribution for Geometric { fn sample(&self, r: &mut R) -> f64 { r.sample::(self) as f64 } diff --git a/src/distribution/gumbel.rs b/src/distribution/gumbel.rs index 753cf5ac..7a3dc43b 100644 --- a/src/distribution/gumbel.rs +++ b/src/distribution/gumbel.rs @@ -115,9 +115,9 @@ impl core::fmt::Display for Gumbel { } #[cfg(feature = "rand")] -impl ::rand::distributions::Distribution for Gumbel { +impl ::rand::distr::Distribution for Gumbel { fn sample(&self, r: &mut R) -> f64 { - self.location - self.scale * ((-(r.gen::())).ln()).ln() + self.location - self.scale * ((-(r.random::())).ln()).ln() } } @@ -385,7 +385,7 @@ mod tests { test_exact(0.0, 2.0, 2.270362845461478, entropy); test_exact(0.1, 4.0, 2.9635100260214235, entropy); test_exact(1.0, 10.0, 3.8798007578955787, entropy); - test_exact(10.0, 11.0, 3.9751109376999034, entropy); + test_exact(10.0, 11.0, 3.9751109376999034, entropy); } #[test] diff --git a/src/distribution/hypergeometric.rs b/src/distribution/hypergeometric.rs index cf68b425..c09677fe 100644 --- a/src/distribution/hypergeometric.rs +++ b/src/distribution/hypergeometric.rs @@ -160,7 +160,7 @@ impl core::fmt::Display for Hypergeometric { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Hypergeometric { +impl ::rand::distr::Distribution for Hypergeometric { fn sample(&self, rng: &mut R) -> u64 { let mut population = self.population as f64; let mut successes = self.successes as f64; @@ -168,7 +168,7 @@ impl ::rand::distributions::Distribution for Hypergeometric { let mut x = 0; loop { let p = successes / population; - let next: f64 = rng.gen(); + let next: f64 = rng.random(); if next < p { x += 1; successes -= 1.0; @@ -185,7 +185,7 @@ impl ::rand::distributions::Distribution for Hypergeometric { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Hypergeometric { +impl ::rand::distr::Distribution for Hypergeometric { fn sample(&self, rng: &mut R) -> f64 { rng.sample::(self) as f64 } diff --git a/src/distribution/inverse_gamma.rs b/src/distribution/inverse_gamma.rs index 773e1200..9b029e43 100644 --- a/src/distribution/inverse_gamma.rs +++ b/src/distribution/inverse_gamma.rs @@ -122,7 +122,7 @@ impl core::fmt::Display for InverseGamma { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for InverseGamma { +impl ::rand::distr::Distribution for InverseGamma { fn sample(&self, r: &mut R) -> f64 { 1.0 / super::gamma::sample_unchecked(r, self.shape, self.rate) } diff --git a/src/distribution/laplace.rs b/src/distribution/laplace.rs index d29c1f97..fd65f262 100644 --- a/src/distribution/laplace.rs +++ b/src/distribution/laplace.rs @@ -113,9 +113,9 @@ impl core::fmt::Display for Laplace { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Laplace { +impl ::rand::distr::Distribution for Laplace { fn sample(&self, rng: &mut R) -> f64 { - let x: f64 = rng.gen_range(-0.5..0.5); + let x: f64 = rng.random_range(-0.5..0.5); self.location - self.scale * x.signum() * (1. - 2. * x.abs()).ln() } } @@ -557,17 +557,16 @@ mod tests { #[cfg(feature = "rand")] #[test] fn test_sample() { - use ::rand::distributions::Distribution; - use ::rand::thread_rng; + use ::rand::distr::Distribution; let l = create_ok(0.1, 0.5); - l.sample(&mut thread_rng()); + l.sample(&mut ::rand::rng()); } #[cfg(feature = "rand")] #[test] fn test_sample_distribution() { - use ::rand::distributions::Distribution; + use ::rand::distr::Distribution; use ::rand::rngs::StdRng; use ::rand::SeedableRng; diff --git a/src/distribution/levy.rs b/src/distribution/levy.rs index f5940cfc..967c861f 100644 --- a/src/distribution/levy.rs +++ b/src/distribution/levy.rs @@ -109,9 +109,9 @@ impl core::fmt::Display for Levy { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Levy { +impl ::rand::distr::Distribution for Levy { fn sample(&self, rng: &mut R) -> f64 { - use rand::distributions::OpenClosed01; + use rand::distr::OpenClosed01; // Inverse transform sampling let u: f64 = rng.sample(OpenClosed01); diff --git a/src/distribution/log_normal.rs b/src/distribution/log_normal.rs index 67442c88..4e937124 100644 --- a/src/distribution/log_normal.rs +++ b/src/distribution/log_normal.rs @@ -118,7 +118,7 @@ impl core::fmt::Display for LogNormal { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for LogNormal { +impl ::rand::distr::Distribution for LogNormal { fn sample(&self, rng: &mut R) -> f64 { super::normal::sample_unchecked(rng, self.location, self.scale).exp() } diff --git a/src/distribution/multinomial.rs b/src/distribution/multinomial.rs index 5da253cc..052476a2 100644 --- a/src/distribution/multinomial.rs +++ b/src/distribution/multinomial.rs @@ -162,7 +162,7 @@ where #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution> for Multinomial +impl ::rand::distr::Distribution> for Multinomial where D: Dim, nalgebra::DefaultAllocator: nalgebra::allocator::Allocator, @@ -175,7 +175,7 @@ where #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution> for Multinomial +impl ::rand::distr::Distribution> for Multinomial where D: Dim, nalgebra::DefaultAllocator: nalgebra::allocator::Allocator, @@ -463,7 +463,7 @@ mod tests { test_almost( dvector![0.3, 0.7], 5, - dmatrix![1.05, -1.05; + dmatrix![1.05, -1.05; -1.05, 1.05], 1e-15, variance, diff --git a/src/distribution/multivariate_normal.rs b/src/distribution/multivariate_normal.rs index a7f0278f..bf99ab4a 100644 --- a/src/distribution/multivariate_normal.rs +++ b/src/distribution/multivariate_normal.rs @@ -300,7 +300,7 @@ where #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution> for MultivariateNormal +impl ::rand::distr::Distribution> for MultivariateNormal where D: Dim, nalgebra::DefaultAllocator: diff --git a/src/distribution/multivariate_students_t.rs b/src/distribution/multivariate_students_t.rs index 21be80cd..6b952f40 100644 --- a/src/distribution/multivariate_students_t.rs +++ b/src/distribution/multivariate_students_t.rs @@ -199,7 +199,7 @@ where #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution> for MultivariateStudent +impl ::rand::distr::Distribution> for MultivariateStudent where D: Dim, nalgebra::DefaultAllocator: @@ -608,7 +608,7 @@ mod tests { prec::assert_relative_eq!(mvs.ln_pdf_const(), std::f64::consts::TAU.recip().ln(), epsilon = prec::DEFAULT_EPS, max_relative = MODULE_RELATIVE_EQ); // compare to static - assert_eq!(mvs.dim(), 2); + assert_eq!(mvs.dim(), 2); assert!(mvs.location().eq(&OVector::::new(1., 1.))); assert!(mvs.scale().eq(&OMatrix::::identity())); assert!(mvs.precision().eq(&OMatrix::::identity())); @@ -620,7 +620,7 @@ mod tests { assert_eq!(mvs.precision(), &OMatrix::::identity(2, 2)); assert_eq!(mvs.scale_chol_decomp(), &OMatrix::::identity(2, 2)); } - + #[test] fn test_error_is_sync_send() { fn assert_sync_send() {} diff --git a/src/distribution/negative_binomial.rs b/src/distribution/negative_binomial.rs index b217cd8e..3e15ff48 100644 --- a/src/distribution/negative_binomial.rs +++ b/src/distribution/negative_binomial.rs @@ -138,7 +138,7 @@ impl core::fmt::Display for NegativeBinomial { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for NegativeBinomial { +impl ::rand::distr::Distribution for NegativeBinomial { fn sample(&self, r: &mut R) -> u64 { use crate::distribution::{gamma, poisson}; @@ -482,7 +482,7 @@ mod tests { density_util::check_discrete_distribution(&create_ok(5.0, 0.3), 35); density_util::check_discrete_distribution(&create_ok(10.0, 0.7), 21); } - + #[test] fn test_sf_upper_bound() { let sf = |arg: u64| move |x: NegativeBinomial| x.sf(arg); @@ -493,7 +493,7 @@ mod tests { #[cfg(all(feature = "rand", feature = "std"))] fn test_sample() { use crate::prec; - use rand::{distributions::Distribution, SeedableRng, rngs::StdRng}; + use rand::{distr::Distribution, SeedableRng, rngs::StdRng}; let dist = NegativeBinomial::new(4.0, 0.5).unwrap(); let mut rng = StdRng::seed_from_u64(1600); diff --git a/src/distribution/normal.rs b/src/distribution/normal.rs index d9dd8235..0f0542b3 100644 --- a/src/distribution/normal.rs +++ b/src/distribution/normal.rs @@ -108,7 +108,7 @@ impl core::fmt::Display for Normal { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Normal { +impl ::rand::distr::Distribution for Normal { fn sample(&self, rng: &mut R) -> f64 { sample_unchecked(rng, self.mean, self.std_dev) } diff --git a/src/distribution/pareto.rs b/src/distribution/pareto.rs index 42a4dd24..f426bb73 100644 --- a/src/distribution/pareto.rs +++ b/src/distribution/pareto.rs @@ -115,9 +115,9 @@ impl core::fmt::Display for Pareto { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Pareto { +impl ::rand::distr::Distribution for Pareto { fn sample(&self, rng: &mut R) -> f64 { - use rand::distributions::OpenClosed01; + use rand::distr::OpenClosed01; // Inverse transform sampling let u: f64 = rng.sample(OpenClosed01); diff --git a/src/distribution/poisson.rs b/src/distribution/poisson.rs index 6d7eab4e..78e06da2 100644 --- a/src/distribution/poisson.rs +++ b/src/distribution/poisson.rs @@ -92,7 +92,7 @@ impl core::fmt::Display for Poisson { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Poisson { +impl ::rand::distr::Distribution for Poisson { /// Generates one sample from the Poisson distribution either by /// Knuth's method if lambda < 30.0 or Rejection method PA by /// A. C. Atkinson from the Journal of the Royal Statistical Society @@ -105,7 +105,7 @@ impl ::rand::distributions::Distribution for Poisson { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Poisson { +impl ::rand::distr::Distribution for Poisson { /// Generates one sample from the Poisson distribution either by /// Knuth's method if lambda < 30.0 or Rejection method PA by /// A. C. Atkinson from the Journal of the Royal Statistical Society @@ -305,10 +305,10 @@ pub fn sample_unchecked(rng: &mut R, lambda: f64) -> f6 if lambda < 30.0 { let limit = (-lambda).exp(); let mut count = 0.0; - let mut product: f64 = rng.gen(); + let mut product: f64 = rng.random(); while product >= limit { count += 1.0; - product *= rng.gen::(); + product *= rng.random::(); } count } else { @@ -318,14 +318,14 @@ pub fn sample_unchecked(rng: &mut R, lambda: f64) -> f6 let k = c.ln() - lambda - beta.ln(); loop { - let u: f64 = rng.gen(); + let u: f64 = rng.random(); let x = (alpha - ((1.0 - u) / u).ln()) / beta; let n = (x + 0.5).floor(); if n < 0.0 { continue; } - let v: f64 = rng.gen(); + let v: f64 = rng.random(); let y = alpha - beta * x; let temp = 1.0 + y.exp(); let lhs = y + (v / (temp * temp)).ln(); diff --git a/src/distribution/students_t.rs b/src/distribution/students_t.rs index 1fd31663..530ea4f5 100644 --- a/src/distribution/students_t.rs +++ b/src/distribution/students_t.rs @@ -145,7 +145,7 @@ impl core::fmt::Display for StudentsT { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for StudentsT { +impl ::rand::distr::Distribution for StudentsT { fn sample(&self, r: &mut R) -> f64 { // based on method 2, section 5 in chapter 9 of L. Devroye's // "Non-Uniform Random Variate Generation" diff --git a/src/distribution/triangular.rs b/src/distribution/triangular.rs index 672c7ad0..c8954901 100644 --- a/src/distribution/triangular.rs +++ b/src/distribution/triangular.rs @@ -152,7 +152,7 @@ impl core::fmt::Display for Triangular { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Triangular { +impl ::rand::distr::Distribution for Triangular { fn sample(&self, rng: &mut R) -> f64 { sample_unchecked(rng, self.min, self.max, self.mode) } @@ -425,7 +425,7 @@ impl Continuous for Triangular { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] fn sample_unchecked(rng: &mut R, min: f64, max: f64, mode: f64) -> f64 { - let f: f64 = rng.gen(); + let f: f64 = rng.random(); if f < (mode - min) / (max - min) { min + (f * (max - min) * (mode - min)).sqrt() } else { diff --git a/src/distribution/uniform.rs b/src/distribution/uniform.rs index 2a8328cc..91218882 100644 --- a/src/distribution/uniform.rs +++ b/src/distribution/uniform.rs @@ -151,9 +151,9 @@ impl core::fmt::Display for Uniform { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Uniform { +impl ::rand::distr::Distribution for Uniform { fn sample(&self, rng: &mut R) -> f64 { - let d = rand::distributions::Uniform::new_inclusive(self.min, self.max); + let d = rand::distr::Uniform::new_inclusive(self.min, self.max).unwrap(); rng.sample(d) } } @@ -370,7 +370,7 @@ mod tests { (0.0, f64::INFINITY, UniformError::MaxInvalid), (1.0, 0.0, UniformError::MaxNotGreaterThanMin), ]; - + for (min, max, err) in invalid { test_create_err(min, max, err); } @@ -532,7 +532,7 @@ mod tests { fn test_samples_in_range() { use rand::rngs::StdRng; use rand::SeedableRng; - use rand::distributions::Distribution; + use rand::distr::Distribution; let seed = [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, diff --git a/src/distribution/weibull.rs b/src/distribution/weibull.rs index 173b02f5..aef0b271 100644 --- a/src/distribution/weibull.rs +++ b/src/distribution/weibull.rs @@ -124,9 +124,9 @@ impl core::fmt::Display for Weibull { #[cfg(feature = "rand")] #[cfg_attr(docsrs, doc(cfg(feature = "rand")))] -impl ::rand::distributions::Distribution for Weibull { +impl ::rand::distr::Distribution for Weibull { fn sample(&self, rng: &mut R) -> f64 { - let x: f64 = rng.gen(); + let x: f64 = rng.random(); self.scale * (-x.ln()).powf(1.0 / self.shape) } } diff --git a/src/distribution/ziggurat.rs b/src/distribution/ziggurat.rs index e9b4eb91..0524aa35 100644 --- a/src/distribution/ziggurat.rs +++ b/src/distribution/ziggurat.rs @@ -1,5 +1,5 @@ use super::ziggurat_tables; -use rand::distributions::Open01; +use rand::distr::Open01; use rand::Rng; pub fn sample_std_normal(rng: &mut R) -> f64 { @@ -44,7 +44,7 @@ pub fn sample_exp_1(rng: &mut R) -> f64 { #[inline] fn zero_case(rng: &mut R, _u: f64) -> f64 { - ziggurat_tables::ZIG_EXP_R - rng.gen::().ln() + ziggurat_tables::ZIG_EXP_R - rng.random::().ln() } ziggurat( @@ -76,7 +76,7 @@ where { const SCALE: f64 = (1u64 << 53) as f64; loop { - let bits: u64 = rng.gen(); + let bits: u64 = rng.random(); let i = (bits & 0xff) as usize; let f = (bits >> 11) as f64 / SCALE; @@ -96,7 +96,7 @@ where return zero_case(rng, u); } // algebraically equivalent to f1 + DRanU()*(f0 - f1) < 1 - if f_tab[i + 1] + (f_tab[i] - f_tab[i + 1]) * rng.gen::() < pdf(x) { + if f_tab[i + 1] + (f_tab[i] - f_tab[i + 1]) * rng.random::() < pdf(x) { return x; } } diff --git a/src/lib.rs b/src/lib.rs index 196e3e7c..e72d0536 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,8 +10,8 @@ #![cfg_attr(feature = "rand", doc = "```")] #![cfg_attr(not(feature = "rand"), doc = "```ignore")] //! use statrs::distribution::Exp; -//! use rand::distributions::Distribution; -//! let mut r = rand::rngs::OsRng; +//! use rand::distr::Distribution; +//! let mut r = rand::rng(); //! let n = Exp::new(0.5).unwrap(); //! print!("{}", n.sample(&mut r)); //! ``` diff --git a/src/statistics/slice_statistics.rs b/src/statistics/slice_statistics.rs index 6455fa3e..158064de 100644 --- a/src/statistics/slice_statistics.rs +++ b/src/statistics/slice_statistics.rs @@ -133,9 +133,9 @@ impl + AsRef<[f64]>> Data { } #[cfg(feature = "rand")] -impl> ::rand::distributions::Distribution for Data { +impl> ::rand::distr::Distribution for Data { fn sample(&self, rng: &mut R) -> f64 { - use rand::prelude::SliceRandom; + use rand::prelude::IndexedRandom; *self.0.as_ref().choose(rng).unwrap() }