Merge pull request #303 from SebastianRuffert/VectorConstructor

Add convenient constructor for vector

src/ConstructiveSolidGeometry/PointsAndVectors/Vectors.jl

@@ -21,6 +21,29 @@ struct CartesianVector{T} <: AbstractCoordinateVector{T, Cartesian}
     z::T
 end
 
+#Type promotion happens here
+function CartesianVector(x::TX, y::TY, z::TZ) where {TX<:Real,TY<:Real,TZ<:Real}
+    eltypes = _csg_get_promoted_eltype.((TX,TY,TZ))
+    T = float(promote_type(eltypes...))
+    CartesianVector{T}(T(x),T(y),T(z))
+end
+
+function CartesianVector(;
+    x = 0,
+    y = 0,
+    z = 0
+)
+    CartesianVector(x,y,z)
+end
+
+function CartesianVector{T}(;
+    x = 0,
+    y = 0,
+    z = 0
+) where {T}
+    CartesianVector{T}(T(x),T(y),T(z))
+end
+
 zero(VT::Type{<:AbstractCoordinateVector{T}}) where {T} = VT(zero(T),zero(T),zero(T))
 
 # @inline rotate(pt::CartesianPoint{T}, r::RotMatrix{3,T,TT}) where {T, TT} = r.mat * pt
@@ -60,4 +83,25 @@ struct CylindricalVector{T} <: AbstractCoordinateVector{T, Cylindrical}
     z::T
 end
 
+#Type promotion happens here
+function CylindricalVector(r::TR, φ::TP, z::TZ) where {TR<:Real,TP<:Real,TZ<:Real}
+    eltypes = _csg_get_promoted_eltype.((TR,TP,TZ))
+    T = float(promote_type(eltypes...))
+    CylindricalVector{T}(T(r),T(φ),T(z))
+end
 
+function CylindricalVector(;
+    r = 0,
+    φ = 0,
+    z = 0
+)
+    CylindricalVector(r,φ,z)
+end
+
+function CylindricalVector{T}(;
+    r = 0,
+    φ = 0,
+    z = 0
+) where {T}
+    CylindricalVector{T}(T(r),T(φ),T(z))
+end

test/ConstructiveSolidGeometry/CSG_primitives.jl

@@ -273,6 +273,14 @@ no_translations = (rotation = one(SMatrix{3, 3, T, 9}), translation = zero(Carte
         ell2 = @inferred CSG.Ellipse(r = 1f0, φ=10f0) 
         @test ell1 == ell2
     end
+    @testset "Vector" begin
+        cart = @inferred CSG.CartesianVector(x=2f0,z=1f0)
+        @inferred CSG.CartesianVector{Float32}(x=2)
+        cyl = @inferred CSG.CylindricalVector{Float32}(r=2.,z=1.)
+        cyl2 = @inferred CSG.CylindricalVector(φ=3π)
+        @test CartesianVector(cyl) == cart
+        @test cart.x == Float32(2)
+    end
     @testset "Point" begin
         cart = @inferred CSG.CartesianPoint(x=2f0,z=1f0)
         @inferred CSG.CartesianPoint{Float32}(x=2)