diff --git a/Cargo.lock b/Cargo.lock old mode 100755 new mode 100644 index ab7fc047..c4b27cda --- a/Cargo.lock +++ b/Cargo.lock @@ -14,17 +14,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" -[[package]] -name = "alga" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" -dependencies = [ - "approx", - "num-complex 0.2.4", - "num-traits", -] - [[package]] name = "alloc-no-stdlib" version = "2.0.1" @@ -42,9 +31,9 @@ dependencies = [ [[package]] name = "approx" -version = "0.3.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ "num-traits", ] @@ -240,15 +229,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -[[package]] -name = "generic-array" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", -] - [[package]] name = "getrandom" version = "0.1.16" @@ -334,12 +314,6 @@ version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" -[[package]] -name = "libm" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - [[package]] name = "log" version = "0.4.14" @@ -357,9 +331,9 @@ checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" [[package]] name = "matrixmultiply" -version = "0.2.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" +checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" dependencies = [ "rawpointer", ] @@ -404,21 +378,31 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.18.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2" +checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120" dependencies = [ - "alga", "approx", - "generic-array", "matrixmultiply", - "num-complex 0.2.4", - "num-rational 0.2.4", + "nalgebra-macros", + "num-complex 0.4.2", + "num-rational 0.4.1", "num-traits", - "rand 0.6.5", + "simba", "typenum", ] +[[package]] +name = "nalgebra-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "num" version = "0.3.1" @@ -446,19 +430,18 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" dependencies = [ - "autocfg 1.0.1", "num-traits", ] [[package]] name = "num-complex" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" dependencies = [ "num-traits", ] @@ -486,23 +469,23 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.2.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg 1.0.1", + "num-bigint", "num-integer", "num-traits", ] [[package]] name = "num-rational" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg 1.0.1", - "num-bigint", "num-integer", "num-traits", ] @@ -514,7 +497,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg 1.0.1", - "libm", ] [[package]] @@ -902,6 +884,18 @@ dependencies = [ "serde", ] +[[package]] +name = "simba" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c" +dependencies = [ + "approx", + "num-complex 0.4.2", + "num-traits", + "paste", +] + [[package]] name = "statrs" version = "0.9.0" diff --git a/whitebox-common/Cargo.toml b/whitebox-common/Cargo.toml old mode 100755 new mode 100644 index ae8cf69f..1deee463 --- a/whitebox-common/Cargo.toml +++ b/whitebox-common/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] byteorder = "^1.3.1" -nalgebra = "0.18.0" +nalgebra = "0.27.1" num-traits = "0.2.14" rand = { version = "0.7", features = ["small_rng"] } rstar = "0.7.1" diff --git a/whitebox-plugins/Cargo.toml b/whitebox-plugins/Cargo.toml old mode 100755 new mode 100644 index 4e6f87ee..7441a881 --- a/whitebox-plugins/Cargo.toml +++ b/whitebox-plugins/Cargo.toml @@ -63,7 +63,7 @@ path = "src/travelling_salesman_problem/main.rs" [dependencies] fasteval = "0.2.4" kd-tree = "0.4.1" -nalgebra = "0.18.0" +nalgebra = "0.27.1" num_cpus = "1.13.0" rand = { version = "0.7", features = ["small_rng"] } tsp-rs = "0.1.0" diff --git a/whitebox-tools-app/Cargo.toml b/whitebox-tools-app/Cargo.toml old mode 100755 new mode 100644 index be2bf882..fbcdd201 --- a/whitebox-tools-app/Cargo.toml +++ b/whitebox-tools-app/Cargo.toml @@ -10,7 +10,7 @@ chrono = "0.4.15" kdtree = "0.6.0" kd-tree = "0.4.1" miniz_oxide = "0.3.6" -nalgebra = "0.18.0" +nalgebra = "0.27.1" num_cpus = "1.6.2" rand = { version = "0.7", features = ["small_rng"] } rand_distr = "0.2.1"