diff --git a/Cargo.lock b/Cargo.lock
index 5de9a36cd5e7711f67cd0912231455a3072ea26a..80b2f4f1efda3043794e30aa810b145858f0dd97 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -174,9 +174,9 @@ dependencies = [
[[package]]
name = "actix-service"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e4fc95dfa7e24171b2d0bb46b85f8ab0e8499e4e3caec691fc4ea65c287564"
+checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb"
dependencies = [
"futures-util",
"pin-project",
@@ -322,7 +322,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -331,7 +331,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
dependencies = [
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
]
[[package]]
@@ -348,9 +348,9 @@ checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
[[package]]
name = "async-trait"
-version = "0.1.36"
+version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92"
+checksum = "687c230d85c0a52504709705fc8a53e4a692b83a2184f03dae73e38e1e93a783"
dependencies = [
"proc-macro2",
"quote",
@@ -365,14 +365,14 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "awc"
@@ -472,9 +472,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.58"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
+checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
[[package]]
name = "cfg-if"
@@ -484,12 +484,12 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "chrono"
-version = "0.4.11"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
+checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
dependencies = [
"num-integer",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
"time",
]
@@ -575,6 +575,16 @@ dependencies = [
"cfg-if",
]
+[[package]]
+name = "crossbeam-channel"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
[[package]]
name = "crossbeam-deque"
version = "0.7.3"
@@ -601,16 +611,6 @@ dependencies = [
"scopeguard",
]
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-utils"
version = "0.7.2"
@@ -667,24 +667,24 @@ checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
[[package]]
name = "either"
-version = "1.5.3"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"
[[package]]
name = "encoding_rs"
-version = "0.8.23"
+version = "0.8.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171"
+checksum = "a51b8cf747471cb9499b6d59e59b0444f4c90eba8968c4e44874e92b5b64ace2"
dependencies = [
"cfg-if",
]
[[package]]
name = "enum-as-inner"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc4bfcfacb61d231109d1d55202c1f33263319668b168843e02ad4652725ec9c"
+checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
dependencies = [
"heck",
"proc-macro2",
@@ -735,9 +735,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
[[package]]
name = "flate2"
-version = "1.0.16"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
+checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94"
dependencies = [
"cfg-if",
"crc32fast",
@@ -888,7 +888,7 @@ checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
dependencies = [
"cfg-if",
"libc",
- "wasi",
+ "wasi 0.9.0+wasi-snapshot-preview1",
]
[[package]]
@@ -918,9 +918,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
+checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
dependencies = [
"autocfg",
]
@@ -936,9 +936,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.1.12"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4"
+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
dependencies = [
"libc",
]
@@ -951,7 +951,7 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
dependencies = [
"libc",
"match_cfg",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -993,9 +993,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.5.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
+checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9"
dependencies = [
"autocfg",
"hashbrown",
@@ -1024,7 +1024,7 @@ checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
dependencies = [
"socket2",
"widestring",
- "winapi 0.3.8",
+ "winapi 0.3.9",
"winreg",
]
@@ -1094,9 +1094,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.73"
+version = "0.2.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
+checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
[[package]]
name = "libm"
@@ -1142,7 +1142,7 @@ checksum = "492158e732f2e2de81c592f0a2427e57e12cd3d59877378fe7af624b6bbe0ca1"
dependencies = [
"libc",
"uuid 0.6.5",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -1207,9 +1207,9 @@ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
[[package]]
name = "memoffset"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
dependencies = [
"autocfg",
]
@@ -1238,9 +1238,9 @@ dependencies = [
[[package]]
name = "miniz_oxide"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
+checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722"
dependencies = [
"adler",
]
@@ -1298,7 +1298,7 @@ dependencies = [
"matrixmultiply",
"num-complex",
"num-rational",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
"rand",
"rand_distr",
"simba",
@@ -1316,7 +1316,7 @@ dependencies = [
"downcast-rs",
"either",
"nalgebra",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
"petgraph",
"simba",
"slab",
@@ -1332,7 +1332,7 @@ checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
dependencies = [
"cfg-if",
"libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -1367,7 +1367,7 @@ dependencies = [
"num-integer",
"num-iter",
"num-rational",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
]
[[package]]
@@ -1378,7 +1378,7 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
dependencies = [
"autocfg",
"num-integer",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
]
[[package]]
@@ -1388,28 +1388,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
dependencies = [
"autocfg",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
]
[[package]]
name = "num-integer"
-version = "0.1.42"
+version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
dependencies = [
"autocfg",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
]
[[package]]
name = "num-iter"
-version = "0.1.40"
+version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
+checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
dependencies = [
"autocfg",
"num-integer",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
]
[[package]]
@@ -1421,7 +1421,7 @@ dependencies = [
"autocfg",
"num-bigint",
"num-integer",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
]
[[package]]
@@ -1430,14 +1430,14 @@ version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
dependencies = [
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
]
[[package]]
name = "num-traits"
-version = "0.2.11"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
dependencies = [
"autocfg",
"libm",
@@ -1461,9 +1461,9 @@ checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
[[package]]
name = "once_cell"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
+checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
[[package]]
name = "parking_lot"
@@ -1488,7 +1488,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -1528,18 +1528,18 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
dependencies = [
"proc-macro2",
"quote",
@@ -1560,15 +1560,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "ppv-lite86"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
+checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
[[package]]
name = "proc-macro-hack"
-version = "0.5.16"
+version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
+checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
[[package]]
name = "proc-macro-nested"
@@ -1658,10 +1658,11 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
+checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270"
dependencies = [
+ "autocfg",
"crossbeam-deque",
"either",
"rayon-core",
@@ -1669,12 +1670,12 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
+checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0"
dependencies = [
+ "crossbeam-channel",
"crossbeam-deque",
- "crossbeam-queue",
"crossbeam-utils",
"lazy_static",
"num_cpus",
@@ -1734,7 +1735,7 @@ checksum = "77008ed59a8923c8b4ac2e5eaa6d28fbe893d3b9515098a4a5fc7767d6430fe5"
dependencies = [
"num-complex",
"num-integer",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
"strength_reduce",
"transpose",
]
@@ -1798,9 +1799,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.56"
+version = "1.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
dependencies = [
"itoa",
"ryu",
@@ -1854,9 +1855,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "signal-hook-registry"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
+checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035"
dependencies = [
"arc-swap",
"libc",
@@ -1870,7 +1871,7 @@ checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2"
dependencies = [
"approx",
"num-complex",
- "num-traits 0.2.11",
+ "num-traits 0.2.12",
"paste",
]
@@ -1888,9 +1889,9 @@ checksum = "c46a3482db8f247956e464d783693ece164ca056e6e67563ee5505bdb86452cd"
[[package]]
name = "smallvec"
-version = "1.4.1"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f"
+checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
[[package]]
name = "socket2"
@@ -1901,7 +1902,7 @@ dependencies = [
"cfg-if",
"libc",
"redox_syscall",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -1933,9 +1934,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "syn"
-version = "1.0.35"
+version = "1.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
+checksum = "891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f11f9"
dependencies = [
"proc-macro2",
"quote",
@@ -1992,19 +1993,20 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.43"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
- "winapi 0.3.8",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi 0.3.9",
]
[[package]]
name = "tinyvec"
-version = "0.3.3"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
+checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
[[package]]
name = "tokio"
@@ -2023,7 +2025,7 @@ dependencies = [
"pin-project-lite",
"signal-hook-registry",
"slab",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -2065,9 +2067,9 @@ dependencies = [
[[package]]
name = "tracing"
-version = "0.1.17"
+version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
+checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c"
dependencies = [
"cfg-if",
"log",
@@ -2076,9 +2078,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.11"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f"
+checksum = "4f0e00789804e99b20f12bc7003ca416309d28a6f495d6af58d1e2c2842461b5"
dependencies = [
"lazy_static",
]
@@ -2169,9 +2171,9 @@ checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
[[package]]
name = "unicode-width"
-version = "0.1.7"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
[[package]]
name = "unicode-xid"
@@ -2274,6 +2276,12 @@ version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
[[package]]
name = "wasm-bindgen"
version = "0.2.67"
@@ -2383,7 +2391,7 @@ dependencies = [
"cfg-if",
"libc",
"memory_units",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -2400,9 +2408,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
[[package]]
name = "winapi"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
@@ -2426,7 +2434,7 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -2441,7 +2449,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
diff --git a/README.md b/README.md
index 7ca91a8315fb66e00fd4e7938b2660e109872247..3b31d63882a1fe19607932714fd14601f0d6978c 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1,23 @@
-# Surfaces from lidars point cloud data
+# Meshtool
-## Dependencies
-
-To run this program, you need the rust compiler. The actual version used in this project is 1.42.0
-
-Install rustup from [www.rust-lang.org](https://www.rust-lang.org/tools/install)
+This project is a continuation of a semester project. The project
+consist of a bunch of tools to manipulate and display stl meshes and
+lidar files.
-## Install and execute the program
-To install the program using cargo, execute :
+## Dependencies
-```console
-cargo install --git https://gitedu.hesge.ch/jerome.chetelat/las-geometry-rs.git
-```
+To run the utilities, you need the rust compiler. The actual version used in this project is 1.46.0
-then use the following command as :
+Install rustup from [www.rust-lang.org](https://www.rust-lang.org/tools/install)
-```console
-las-geometry --input <the lidar file> --output <the stl output file>
-```
+For the web client, `NodeJS` 12.18.3 is necessary.
-## Executing this program from source code
+## Installation
-Simply run the following command:
+To install the different utilities, run the following command :
```console
-cargo run --release -- --input <the lidar file> --output <the stl output file>
+cargo install --git https://gitedu.hesge.ch/jerome.chetelat/meshtools.git
```
-## Generating documentation from source code
-
-Simply run the following command:
-
-```console
-cargo doc --open
-```
diff --git a/client/README.md b/client/README.md
index 680f386ce27d2292bc9a9edfeee4d7ee25bb004d..21465e6e50efd7decfa4886f97eb5ffa91fa35cf 100644
--- a/client/README.md
+++ b/client/README.md
@@ -35,14 +35,14 @@ npm test -- --safari
* `Cargo.toml` contains the standard Rust metadata. You put your Rust dependencies in here. You must change this file with your details (name, description, version, authors, categories)
+* The `src` folder contains your Rust code.
+
* `package.json` contains the standard npm metadata. You put your JavaScript dependencies in here. You must change this file with your details (author, name, version)
* `webpack.config.js` contains the Webpack configuration. You shouldn't need to change this, unless you have very special needs.
* The `js` folder contains your JavaScript code (`index.js` is used to hook everything into Webpack, you don't need to change it).
-* The `src` folder contains your Rust code.
-
* The `static` folder contains any files that you want copied as-is into the final build. It contains an `index.html` file which loads the `index.js` file.
* The `tests` folder contains your Rust unit tests.
diff --git a/library/README.md b/library/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..f5cea361b8c78fb7360c567c92d337b41cef86ce
--- /dev/null
+++ b/library/README.md
@@ -0,0 +1,12 @@
+# Meshtools library
+
+This folder contains the different structures and functions to run the
+meshtool utilities app.
+
+## Documentation
+
+To get documentation on this crate, run :
+
+```sh
+cargo doc --open
+```
diff --git a/library/test b/library/test
deleted file mode 100644
index adacfcf63df6c30d10359a102c77b48bf77e4623..0000000000000000000000000000000000000000
--- a/library/test
+++ /dev/null
@@ -1 +0,0 @@
-https://prod.liveshare.vsengsaas.visualstudio.com/auth/identity/github/?redirect=vscode://ms-vsliveshare.vsliveshare/signin%3FwindowId=1&state=4HGVULXJoMUkGj57bMgmw&extensionId=4HGVULXJoMUkGj57bMgmw&nonce=4HGVULXJoMUkGj57bMgmw
\ No newline at end of file
diff --git a/server/README.md b/server/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..1f62403efd4abc5367a242fbae6eec376262e65b
--- /dev/null
+++ b/server/README.md
@@ -0,0 +1,14 @@
+# Meshtool server crate
+
+This folder contains a basic server in rust
+
+## Compiling and executing the rust server
+
+before running the server make a directory called `regions` at the root
+of the folder and put inside it all the different mesh or las files.
+
+To execute the rust server, run the command :
+
+```
+cargo run
+```
diff --git a/utility/README.md b/utility/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..76996d52bb798f497593d4813a4cc77c5a472c09
--- /dev/null
+++ b/utility/README.md
@@ -0,0 +1,56 @@
+# Meshtools Utilities
+
+This folder contains all the utilities to process stl mesh files and
+lidar files.
+
+## Dependencies
+
+To run the utilities, you need the rust compiler. The actual version used in this project is 1.46.0
+
+Install rustup from [www.rust-lang.org](https://www.rust-lang.org/tools/install)
+
+## Install and execute the utilities
+
+To install the different utilities using cargo, execute :
+
+```console
+cargo install --git https://gitedu.hesge.ch/jerome.chetelat/meshtools.git
+```
+
+here are the commands available after installation:
+
+- las-geometry : Delaunay triangulation on lidar point cloud data
+- las-filtering : Lidar point cloud data filters
+- las-sample : Taking a sample of point cloud data
+- mesh-subsample : Mesh filters
+- mesh-merge : Mesh merging tool
+- mesh-smoothing : Smoothing tool for meshes
+- to-txt : LAS File into txt file
+
+## Executing a utility from source code
+
+Simply run the following command:
+
+```console
+cargo run --release --bin <name of the command> -- [args of the command]
+```
+## Executing tests
+
+```console
+cargo tests
+```
+
+## Generating documentation from source code
+
+Simply run the following command:
+
+```console
+cargo doc --open
+```
+## What does each file means
+
+* `Cargo.toml` contains the standard Rust metadata. You put your Rust dependencies in here. You must change this file with your details (name, description, version, authors, categories)
+
+* The `src` folder contains your Rust code.
+
+
diff --git a/utility/src/subsample.rs b/utility/src/subsample.rs
index cb22ff12e50f1b0bdf755a16caf79fddba84b1d5..cbac84f803a223091c1951f325e5949351bb460a 100644
--- a/utility/src/subsample.rs
+++ b/utility/src/subsample.rs
@@ -14,7 +14,7 @@ fn main() {
(about: "Take only part of the lidar file")
(@arg input: +required -i --input +takes_value "The mesh files to smooth")
(@arg output: +required -o --output +takes_value "The filename of the smoothed mesh output")
- (@arg filter_type: -f --filter +takes_value "The filter to apply on the file")
+ (@arg filter_type: -f --filter +takes_value "The filter to apply on the file 1. MeshSubsamplingFilter 2. RandomMeshSubsampling")
(@arg epsilon: -e --epsilon +takes_value "The delta epsilon to allow move of the point")
)
.get_matches();
@@ -34,13 +34,11 @@ fn main() {
let mut read = BufReader::new(File::open(filename).unwrap());
let mesh: IndexedMesh = stl_io::read_stl(&mut read).unwrap();
- // let points: Vec<Point> = reader.points().map(|w| w.expect(&format!("Cannot read lidar file : {}", filename))).collect();
let filter: Box<dyn MeshFilter> = match filter_type {
1 => Box::new(MeshSubsamplingFilter::new()),
2 => Box::new(RandomMeshSubsamplingFilter::new(rand::thread_rng())),
_ => Box::new(MeshSubsamplingFilter::new()),
};
- // let points = filter.apply(points);
let mesh: IndexedMesh = filter.apply(mesh, epsilon);
// Creating the new file if it doesn't exists