PyPI - engeom - Versions diffs - 0.1.1__tar.gz → 0.2.1__tar.gz - Mend

engeom 0.1.1tar.gz → 0.2.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (127) hide show

{engeom-0.1.1 → engeom-0.2.1}/Cargo.lock RENAMED Viewed

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 [[package]]
 name = "ahash"
@@ -11,7 +11,16 @@ dependencies = [
  "cfg-if",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
+]
+[[package]]
+name = "aligned-vec"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e0966165eaf052580bd70eb1b32cb3d6245774c0104d1b2793e9650bf83b52a"
+dependencies = [
+ "equator",
 ]
 [[package]]
@@ -29,6 +38,12 @@ dependencies = [
  "num-traits",
 ]
+[[package]]
+name = "array-init"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -77,6 +92,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "cmov"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1dc960ba75d543267db9254da8ec1cb318a037beb3f8d2497520e410096fab"
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.6"
@@ -149,7 +170,7 @@ dependencies = [
 [[package]]
 name = "engeom"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "itertools 0.14.0",
  "kiddo",
@@ -164,6 +185,26 @@ dependencies = [
  "stl_io",
 ]
+[[package]]
+name = "equator"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c35da53b5a021d2484a7cc49b2ac7f2d840f8236a286f84202369bd338d761ea"
+dependencies = [
+ "equator-macro",
+]
+[[package]]
+name = "equator-macro"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 [[package]]
 name = "fixed"
 version = "1.28.0"
@@ -201,13 +242,14 @@ dependencies = [
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
  "cfg-if",
  "libc",
  "wasi",
+ "windows-targets",
 ]
 [[package]]
@@ -293,11 +335,14 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 [[package]]
 name = "kiddo"
-version = "4.2.1"
+version = "5.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60c5fcd3044b774e2c80a502b2387b75d1baa95e99b2bceeb5db00f2e2d27fe9"
+checksum = "c6e580022eee0bcd05b8c1c43d3512e79bfa001ccf88ef3dcfd1a3ac74b4e390"
 dependencies = [
+ "aligned-vec",
+ "array-init",
  "az",
+ "cmov",
  "divrem",
  "doc-comment",
  "elapsed",
@@ -599,7 +644,7 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 [[package]]
@@ -613,13 +658,14 @@ dependencies = [
 [[package]]
 name = "py-engeom"
-version = "0.1.1"
+version = "0.2.1"
 dependencies = [
  "engeom",
  "numpy",
  "parry2d-f64",
  "parry3d-f64",
  "pyo3",
+ "rand",
 ]
 [[package]]
@@ -696,20 +742,20 @@ dependencies = [
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
 dependencies = [
- "libc",
  "rand_chacha",
  "rand_core",
+ "zerocopy 0.8.14",
 ]
 [[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",
@@ -717,11 +763,12 @@ dependencies = [
 [[package]]
 name = "rand_core"
-version = "0.6.4"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff"
 dependencies = [
  "getrandom",
+ "zerocopy 0.8.14",
 ]
 [[package]]
@@ -1054,9 +1101,12 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.13.3+wasi-0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
 [[package]]
 name = "wide"
@@ -1218,6 +1268,15 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags",
+]
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -1225,7 +1284,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+[[package]]
+name = "zerocopy"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468"
+dependencies = [
+ "zerocopy-derive 0.8.14",
 ]
 [[package]]
@@ -1238,3 +1306,14 @@ dependencies = [
  "quote",
  "syn",
 ]
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

{engeom-0.1.1 → engeom-0.2.1}/Cargo.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "py-engeom"
-version = "0.1.1"
+version = "0.2.1"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -14,4 +14,5 @@ engeom = { path = "./engeom", features = ["stl"]}
 parry3d-f64 = {version= "0.18.0", features=["serde-serialize"]}
 parry2d-f64 = {version= "0.18.0", features=["serde-serialize"]}
 numpy = "0.23.0"
+rand = "0.9.0"

{engeom-0.1.1 → engeom-0.2.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: engeom
-Version: 0.1.1
+Version: 0.2.1
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{engeom-0.1.1 → engeom-0.2.1}/engeom/Cargo.lock RENAMED Viewed

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 [[package]]
 name = "ahash"
@@ -11,7 +11,7 @@ dependencies = [
  "cfg-if",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.32",
 ]
 [[package]]
@@ -23,6 +23,15 @@ dependencies = [
  "memchr",
 ]
+[[package]]
+name = "aligned-vec"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e0966165eaf052580bd70eb1b32cb3d6245774c0104d1b2793e9650bf83b52a"
+dependencies = [
+ "equator",
+]
 [[package]]
 name = "allocator-api2"
 version = "0.2.16"
@@ -50,6 +59,12 @@ dependencies = [
  "num-traits",
 ]
+[[package]]
+name = "array-init"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -162,6 +177,12 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+[[package]]
+name = "cmov"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1dc960ba75d543267db9254da8ec1cb318a037beb3f8d2497520e410096fab"
 [[package]]
 name = "criterion"
 version = "0.5.1"
@@ -276,7 +297,7 @@ dependencies = [
 [[package]]
 name = "engeom"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "approx",
  "criterion",
@@ -294,6 +315,26 @@ dependencies = [
  "test-case",
 ]
+[[package]]
+name = "equator"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c35da53b5a021d2484a7cc49b2ac7f2d840f8236a286f84202369bd338d761ea"
+dependencies = [
+ "equator-macro",
+]
+[[package]]
+name = "equator-macro"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 [[package]]
 name = "errno"
 version = "0.3.8"
@@ -328,9 +369,9 @@ dependencies = [
 [[package]]
 name = "generator"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb949699c3e4df3a183b1d2142cb24277057055ed23c68ed58894f76c517223"
+checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
 dependencies = [
  "cfg-if",
  "libc",
@@ -341,13 +382,14 @@ dependencies = [
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
  "cfg-if",
  "libc",
  "wasi",
+ "windows-targets",
 ]
 [[package]]
@@ -462,11 +504,14 @@ dependencies = [
 [[package]]
 name = "kiddo"
-version = "4.2.1"
+version = "5.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60c5fcd3044b774e2c80a502b2387b75d1baa95e99b2bceeb5db00f2e2d27fe9"
+checksum = "c6e580022eee0bcd05b8c1c43d3512e79bfa001ccf88ef3dcfd1a3ac74b4e390"
 dependencies = [
+ "aligned-vec",
+ "array-init",
  "az",
+ "cmov",
  "divrem",
  "doc-comment",
  "elapsed",
@@ -503,9 +548,9 @@ dependencies = [
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 [[package]]
 name = "libm"
@@ -611,9 +656,9 @@ dependencies = [
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
@@ -765,20 +810,20 @@ dependencies = [
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
 dependencies = [
- "libc",
  "rand_chacha",
  "rand_core",
+ "zerocopy 0.8.14",
 ]
 [[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",
@@ -786,11 +831,12 @@ dependencies = [
 [[package]]
 name = "rand_core"
-version = "0.6.4"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff"
 dependencies = [
  "getrandom",
+ "zerocopy 0.8.14",
 ]
 [[package]]
@@ -801,9 +847,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -811,9 +857,9 @@ dependencies = [
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -1023,9 +1069,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 [[package]]
 name = "stl_io"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e9d886254ce41380acd1bd72a7e2c22862607a99af4bb2380b05deb6d89c83"
+checksum = "f985fe7ba9bd93bb8f0158689a0601d4bc5480a7df11c6f22c220fa1bedaefe7"
 dependencies = [
  "byteorder",
  "float-cmp",
@@ -1214,9 +1260,12 @@ dependencies = [
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.13.3+wasi-0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
 [[package]]
 name = "wasm-bindgen"
@@ -1460,13 +1509,31 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags",
+]
 [[package]]
 name = "zerocopy"
 version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
- "zerocopy-derive",
+ "zerocopy-derive 0.7.32",
+]
+[[package]]
+name = "zerocopy"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468"
+dependencies = [
+ "zerocopy-derive 0.8.14",
 ]
 [[package]]
@@ -1479,3 +1546,14 @@ dependencies = [
  "quote",
  "syn",
 ]
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

{engeom-0.1.1 → engeom-0.2.1}/engeom/Cargo.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "engeom"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 readme = "README.md"
@@ -13,15 +13,15 @@ parry2d-f64 = {version= "0.18.0", features=["serde-serialize"]}
 serde = {version ="1.0", features=["derive"]}
 serde_json = "1.0"
 itertools = "0.14.0"
-rayon = "1.7.0"
+rayon = "1.10.0"
 levenberg-marquardt = "0.14.0"
-rand = "0.8.5"
-kiddo = "4.2.1"
-stl_io = {version= "0.8.2", optional=true}
-num-traits = "0.2"
+rand = "0.9.0"
+kiddo = "5.0.3"
+stl_io = {version= "0.8.3", optional=true}
+num-traits = "0.2.19"
 [dev-dependencies]
-test-case = "3.0"
+test-case = "3.3.1"
 approx = "0.5.1"
 criterion = "0.5.1"
-rand = "0.8.5"
+rand = "0.9.0"

{engeom-0.1.1 → engeom-0.2.1}/engeom/src/airfoil/camber.rs RENAMED Viewed

@@ -5,15 +5,41 @@ use super::helpers::{
 };
 use crate::airfoil::inscribed_circle::InscribedCircle;
 use crate::common::points::{dist, mid_point};
+use crate::common::BestFit;
+use crate::common::Resample::ByCount;
 use crate::geom2::hull::farthest_pair_indices;
 use crate::geom2::polyline2::SpanningRay;
 use crate::geom2::{rot90, Line2};
 use crate::AngleDir::{Ccw, Cw};
-use crate::Curve2;
 use crate::Result;
+use crate::{Circle2, Curve2, UnitVec2};
 use parry2d_f64::query::Ray;
 use parry2d_f64::shape::ConvexPolygon;
+/// Given a curve representing a camber line, attempt to detect the direction of the upper
+/// (suction, convex) side of the airfoil section. To do so, we will resample the curve to a
+/// finite number of points and then best-fit a circle to the points. The circle center should be
+/// on the concave (lower, pressure) side of the camber curve, so the direction from the circle
+/// center to the center of the camber curve will be the direction of the upper airfoil side.
+///
+/// # Arguments
+///
+/// * `camber_line`: the curve representing the camber line of the airfoil section
+///
+/// returns: Result<Unit<Matrix<f64, Const<2>, Const<1>, ArrayStorage<f64, 2, 1>>>, Box<dyn Error, Global>>
+pub fn camber_detect_upper_dir(camber_line: &Curve2) -> Result<UnitVec2> {
+    let mid_point = camber_line.at_fraction(0.5).unwrap().point();
+    let resampled = camber_line.resample(ByCount(50))?;
+    let guess = Circle2::from_3_points(
+        camber_line.at_front().point(),
+        mid_point,
+        camber_line.at_back().point(),
+    )?;
+    let circle = Circle2::fitting_circle(resampled.points(), &guess, BestFit::All)?;
+    Ok(UnitVec2::new_normalize(mid_point - circle.center))
+}
 /// Attempts to calculate and extract the mean camber line from an airfoil section curve and its
 /// convex hull using the inscribed circle method.
 ///
@@ -36,7 +62,7 @@ use parry2d_f64::shape::ConvexPolygon;
 /// * `section`: the airfoil section curve
 /// * `hull`: the convex hull of the airfoil section
 /// * `tol`: an optional tolerance value which will determine when to add new circles between the
-/// existing circles. This value will default to 1e-3 if not specified.
+///   existing circles. This value will default to 1e-3 if not specified.
 ///
 /// returns: Result<Vec<InscribedCircle, Global>, Box<dyn Error, Global>>
 pub fn extract_camber_line(
@@ -117,7 +143,7 @@ fn advance_search_along_ray(section: &Curve2, last_station: &InscribedCircle) ->
             // First, we want to test if the new ray spans at least 50% of the last station's
             // distance between the upper and lower contact points.  This is a heuristic to ensure
             // we haven't taken a step where the section thickness is dropping off too quickly.
-            let last_dist = dist(&last_station.upper, &last_station.lower);
+            let last_dist = dist(&last_station.contact_pos, &last_station.contact_neg);
             let new_dist = ray.dir().norm();
             if new_dist < 0.5 * last_dist {
@@ -155,9 +181,9 @@ enum RayAdvance {
 ///
 /// * `curve`: the airfoil section curve
 /// * `starting_ray`: the starting spanning ray for the camber line, determines the direction the
-/// algorithm will advance.
+///   algorithm will advance.
 /// * `tol`: an optional tolerance value which will determine when to add new circles between the
-/// existing circles. This value will default to 1e-3 if not specified.
+///   existing circles. This value will default to 1e-3 if not specified.
 ///
 /// returns: Result<Vec<InscribedCircle, Global>, Box<dyn Error, Global>>
 fn extract_half_camber_line(

engeom 0.1.1__tar.gz → 0.2.1__tar.gz

engeom 0.1.1tar.gz → 0.2.1tar.gz