Skip to content

Commit 3ea9287

Browse files
committed
change sign_eps and normalizeVector
1 parent 2ab70ed commit 3ea9287

File tree

2 files changed

+33
-28
lines changed

2 files changed

+33
-28
lines changed

src/Basics/_module.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Andrea Neumayr and Martin Otter, [DLR - Institute of System Dynamics and Control
1313
"""
1414
module Basics
1515

16+
import Modia3D
17+
1618
export trailingPartOfName
1719

1820
export neps, sign_eps, radToDeg

src/Basics/constantsAndFunctions.jl

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,37 @@
77

88

99
# Epsilon and sign
10-
const neps = sqrt( eps() )
11-
sign_eps(value::Float64; seps::Float64 = 100*neps)::Float64 = value > seps ? 1.0 : (value < -seps ? -1.0 : 0.0)
12-
13-
function normalizeVector(n::SVector{3,Float64})::SVector{3,Float64}
14-
nabs = norm(n)
15-
if nabs <= neps
16-
println("neps ", neps)
17-
println("nabs ", nabs)
18-
@assert(nabs > neps) # && norm(vec) > eps()
19-
# return nothing
20-
else
10+
const neps = sqrt( eps(Modia3D.MPRFloatType) )
11+
12+
function sign_eps(value::T; ) where {T}
13+
seps::T = 100.0*neps
14+
return value > seps ? T(1.0) : (value < -seps ? T(-1.0) : T(0.0))
15+
end
16+
17+
function normalizeVector(n::SVector{3,T}) where {T}
18+
nabs = norm(n)
19+
if nabs <= neps
20+
println("neps ", neps)
21+
println("nabs ", nabs)
22+
@assert(nabs > neps) # && norm(vec) > eps()
23+
# return nothing
24+
end
2125
return n/nabs
22-
end
2326
end
2427

2528
# Standard constants
26-
const radToDeg = 180.0/pi
29+
const radToDeg = 180.0/pi
2730

2831
""" mutable struct BoundingBox - Smallest box that contains a visual element"""
2932
mutable struct BoundingBox
30-
x_min::Float64
31-
x_max::Float64
32-
y_min::Float64
33-
y_max::Float64
34-
z_min::Float64
35-
z_max::Float64
36-
BoundingBox() = new(0.0,0.0,0.0,0.0,0.0,0.0)
37-
BoundingBox(x_min,x_max,y_min,y_max,z_min,z_max) = new(x_min,x_max,y_min,y_max,z_min,z_max)
33+
x_min::Float64
34+
x_max::Float64
35+
y_min::Float64
36+
y_max::Float64
37+
z_min::Float64
38+
z_max::Float64
39+
BoundingBox() = new(0.0,0.0,0.0,0.0,0.0,0.0)
40+
BoundingBox(x_min,x_max,y_min,y_max,z_min,z_max) = new(x_min,x_max,y_min,y_max,z_min,z_max)
3841
end
3942

4043

@@ -44,17 +47,17 @@ linearMovement(delta_x, tStart, tEnd, time) = delta_x*(time-tStart)/(tEnd-tStart
4447

4548
# Trailing part of type name
4649
function trailingPartOfTypeAsString(obj)::String
47-
name = string( typeof(obj) )
50+
name = string( typeof(obj) )
4851

49-
# Determine trailing solid (after last ".")
50-
i = first(something(findlast(".", name), 0:-1))
51-
return i > 0 && i < length(name) ? name[i+1:end] : name
52+
# Determine trailing solid (after last ".")
53+
i = first(something(findlast(".", name), 0:-1))
54+
return i > 0 && i < length(name) ? name[i+1:end] : name
5255
end
5356

5457
function trailingPartOfName(name::AbstractString)::String
55-
# Determine trailing part of name (after last ".")
56-
i = first(something(findlast(".", name), 0:-1))
57-
return i > 0 && i < length(name) ? name[i+1:end] : name
58+
# Determine trailing part of name (after last ".")
59+
i = first(something(findlast(".", name), 0:-1))
60+
return i > 0 && i < length(name) ? name[i+1:end] : name
5861
end
5962

6063

0 commit comments

Comments
 (0)