diff --git a/Manifest.toml b/Manifest.toml index b703e1c..aa8603a 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -34,7 +34,7 @@ version = "0.2.0" [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.5.2+0" +version = "0.5.0+0" [[deps.ConstructionBase]] deps = ["LinearAlgebra"] @@ -173,7 +173,7 @@ version = "1.2.0" [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.20+0" +version = "0.3.17+2" [[deps.OrderedCollections]] git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" @@ -187,9 +187,9 @@ version = "1.8.0" [[deps.Preferences]] deps = ["TOML"] -git-tree-sha1 = "d3538e7f8a790dc8903519090857ef8e1283eecd" +git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.5" +version = "1.3.0" [[deps.Printf]] deps = ["Unicode"] @@ -292,7 +292,7 @@ version = "1.2.12+1" [[deps.libblastrampoline_jll]] deps = ["Artifacts", "Libdl", "OpenBLAS_jll"] uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" -version = "5.1.0+0" +version = "5.0.1+0" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] diff --git a/Project.toml b/Project.toml index b675e89..ab8307c 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "stlProcess" uuid = "68914fc9-42cf-4b37-b06f-0b65edf9b8fa" authors = ["Anson "] -version = "0.2.2" +version = "0.2.3" [deps] FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" diff --git a/src/stlProcess.jl b/src/stlProcess.jl index e1f7137..39c204c 100644 --- a/src/stlProcess.jl +++ b/src/stlProcess.jl @@ -150,10 +150,9 @@ function calc_characteristic_length(points, inertia, center_of_gravity) catch e if isa(e, Roots.ConvergenceFailed) - println("Characteristic Length Algorithm failed to converge, this usually means stl is flat.") - println("Setting length in dir to 0.") + @warn "Characteristic Length Algorithm failed to converge, this usually means stl is flat. Setting length in dir to 0." else - println("Unknown error when calculating Characteristic Length.") + @warn "Unknown error when calculating Characteristic Length." end min_point = 0 max_point = 0 diff --git a/test/runtests.jl b/test/runtests.jl index f2aade8..307b07d 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -64,7 +64,7 @@ end [2, 4, 8], ), # h, d, w = 2, 4, 8 "slender_y.stl" => Properties( - 10 * π * 0.1^2, + 10 * π * 0.05^2, center, diagm([1, 0, 1]) .* (10^2 / 12), 2π * 0.05 * (0.1 + 10), @@ -87,10 +87,10 @@ end @testset "get_mass_properties for $model" begin props = get_mass_properties(stl) - @test props.volume ≈ control.volume atol = 0.5 + @test props.volume ≈ control.volume rtol = 0.1 @test props.center_of_gravity ≈ control.center_of_gravity atol = 0.01 - @test eigvals(props.inertia) ≈ eigvals(control.inertia) atol = 0.1 - @test props.surface_area ≈ control.surface_area atol = 0.5 + @test eigvals(props.inertia) ≈ eigvals(control.inertia) atol = 0.01 + @test props.surface_area ≈ control.surface_area atol = 0.2 @test props.characteristic_length ≈ control.characteristic_length atol = 0.5 @test props.sb_values ≈ control.sb_values atol = 0.01 end