Glassvision/JuliaFEM.jl
1
0
Fork 0
mirror of https://github.com/JuliaFEM/JuliaFEM.jl.git synced 2026-09-20 18:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed DCTV initialization

Browse Source
This commit is contained in:
Jukka Aho
2017-01-09 12:43:22 +02:00
parent 5cf93b0d51
commit 0c4a85d1a5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fields.jl
+7 -7
View File
@@ -24,17 +24,17 @@ type Increment{T}
data :: T
end
function Base.convert{T}(::Type{Increment{T}}, data::Pair{Float64,T})
function convert{T}(::Type{Increment{T}}, data::Pair{Float64,T})
return Increment{T}(data[1], data[2])
end
function Base.convert{T}(::Type{Increment{Vector{Vector{T}}}}, data::Pair{Float64, Matrix{T}})
function convert{T}(::Type{Increment{Vector{Vector{T}}}}, data::Pair{Float64, Matrix{T}})
time = data[1]
content = data[2]
return Increment(time, Vector{T}[content[:,i] for i=1:size(content,2)])
end
function Base.getindex{T}(increment::Increment{Vector{T}}, i::Int64)
function getindex{T}(increment::Increment{Vector{T}}, i::Int64)
return increment.data[i]
end
@@ -127,12 +127,12 @@ julia> t0 = 0.0; t1=1.0; y0 = 0.0; y1 = 1.0
julia> f = DCTV(t0 => y0, t1 => y1)
"""
function convert{T,v<:Real}(::Type{DCTV}, data::Pair{v, T}...)
#function convert{T,v<:Real}(::Type{DCTV}, data::Pair{v, T}...)
# return DCTV([Increment(d[1],d[2]) for d in data])
#end
function DCTV(data::Pair...)
return DCTV([Increment(d[1],d[2]) for d in data])
end
#function Base.convert(::Type{DCTV}, data::Pair{Real, Any}...)
# return DCTV([Increment{Vector}(d[1], d[2]) for d in data])
#end
function Field(func::Function)
if method_exists(func, Tuple{})