Dev

Project.toml

@@ -1,7 +1,8 @@
 name = "MetidaNCA"
 uuid = "097c2839-c7bc-4c4b-a5f2-b4167c1b4e7c"
 authors = ["PharmCat <[email protected]>"]
-version = "0.5.13"
+version = "0.5.14"
+
 
 
 [deps]

change.log

@@ -1,3 +1,6 @@
+0.5.14
+- pd tau
+
 0.5.13
 - breaking changes in plotting output
 

docs/src/examples.md

@@ -175,6 +175,22 @@ MetidaNCA.nca!(pd[1])
 p = MetidaNCA.pkplot(pd[1], drawth = true, drawbl = true)
 
 png(p, "plot6.png")
+
+# Plot DoseTime (can be used for PK plots)
+
+dt = DoseTime(dose = 200, time = 1.5)
+setdosetime!(pd, dt)
+
+p = MetidaNCA.pkplot(pd[1], drawdt = true)
+
+
+png(p, "plot7.png")
 ```
 
+##### Plot 6
+
 ![](plot6.png)
+
+##### Plot 7
+
+![](plot7.png)

src/MetidaNCA.jl

@@ -5,6 +5,8 @@ module MetidaNCA
 
 using RecipesBase
 
+import RecipesBase: plot!, plot
+
 import Base: length, length, push!, resize!
 import MetidaBase
 import MetidaBase: Tables, StatsBase, PrecompileTools,
@@ -35,6 +37,7 @@ PKSubject, UPKSubject, PDSubject, NCAResult
 function __init__()
     @require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" begin
         savefig = Plots.savefig
+        current = Plots.current
     end
 end
 

src/import.jl

@@ -327,12 +327,14 @@ Keywords:
 * `warn` - warning supress if `false`.
 
 """
-function pdimport(data, time, obs, sort; bl = 0, th = 0, limitrule::Union{Nothing, LimitRule} = nothing, warn = true)
+function pdimport(data, time, obs, sort; bl = 0, th = 0, dosetime::Union{Nothing, DoseTime} = nothing, limitrule::Union{Nothing, LimitRule} = nothing, warn = true)
     if isa(sort, String) sort = [Symbol(sort)] end
     if isa(sort, Symbol) sort = [sort] end
 
     Tables.istable(data) || error("Data not a table!")
 
+
+
     cols   = Tables.columns(data)
     cdata  = Tuple(Tables.getcolumn(cols, y) for y in sort)
     d      = Dict{Tuple{eltype.(cdata)...}, Vector{Int}}()
@@ -341,6 +343,8 @@ function pdimport(data, time, obs, sort; bl = 0, th = 0, limitrule::Union{Nothin
     timec = Tables.getcolumn(data, time)
     obsc  = Tables.getcolumn(data, obs)
 
+    if isnothing(dosetime) dosetime = DoseTime(NaN, zero(eltype(timec)), NaN) end
+
     any(isnanormissing, timec) && error("Some time values is NaN or Missing!")
 
     sdata = Vector{PDSubject}(undef, length(d))
@@ -372,7 +376,7 @@ function pdimport(data, time, obs, sort; bl = 0, th = 0, limitrule::Union{Nothin
         timevals_spv = view(timevals, sp)
         obsvals_spv = view(obsvals, sp)
         timevals_sp, obsvals_sp = checkvalues(timevals_spv, obsvals_spv, warn = warn)
-        sdata[i] = PDSubject(timevals_sp, obsvals_sp, bl, th, Dict(sort .=> k))
+        sdata[i] = PDSubject(timevals_sp, obsvals_sp, bl, th, dosetime, Dict(sort .=> k))
         i += one(Int)
     end
     ds = DataSet(identity.(sdata))

src/nca.jl

@@ -833,10 +833,10 @@
     return ncares
 end
 
-function maxconc(subj::T) where T <: PKSubject
+function maxconc(subj::T) where T <: AbstractSubject
     maximum(subj.obs)
 end
-function minconc(subj::T, pos = false) where T <: PKSubject
+function minconc(subj::T, pos = false) where T <: AbstractSubject
     if pos
         return minimum(Iterators.filter(x-> x > zero(x), subj.obs))
     else
@@ -1100,7 +1100,14 @@
 ################################################################################
     result[:Obsnum] = obsnum = length(obs_cp)
 
+    result[:BL] = data.bl
+
+    result[:TH] = data.th
+
+
     result[:Rmax], result[:Tmax], tmaxn = ctmax(time_cp, obs_cp, length(obs_cp))
+
+
 
     # ALL NAN AND MISSING VALUES LINEAR INTERPOLATED
     step_2_interpolate!(time_cp, obs_cp, einds, 1, :lint)
@@ -1138,6 +1145,78 @@
         result[:TIMEBTW] = result[:TBBL] - result[:TBTH]
     end
 
+
+    # Tau parameters
+    if data.dosetime.tau > zero(data.dosetime.tau)
+        taufirstp = findfirst(x -> x >= data.dosetime.time, time_cp)
+        taulastp  = findlast(x -> x <= data.dosetime.time + data.dosetime.tau, time_cp)
+        taupn = taulastp - taufirstp
+
+        aucpartabl_tau  = Array{ptype, 1}(undef, taupn)
+        aucpartbbl_tau  = Array{ptype, 1}(undef, taupn)
+        aucpartath_tau  = Array{ptype, 1}(undef, taupn)
+        aucpartbth_tau  = Array{ptype, 1}(undef, taupn)
+        tpartabl_tau    = Array{ptype, 1}(undef, taupn)
+        tpartbbl_tau    = Array{ptype, 1}(undef, taupn)
+        tpartath_tau    = Array{ptype, 1}(undef, taupn)
+        tpartbth_tau    = Array{ptype, 1}(undef, taupn)
+        aucpartbtw_tau  = Array{ptype, 1}(undef, taupn)
+
+        for i = taufirstp:taulastp-1
+            j = i - taufirstp + 1
+            aucpartabl_tau[j], aucpartbbl_tau[j], tpartabl_tau[j], tpartbbl_tau[j], aucpartath_tau[j], aucpartbth_tau[j], tpartath_tau[j], tpartbth_tau[j], aucpartbtw_tau[j] = auctblth(obs_cp[i], obs_cp[i + 1], time_cp[i], time_cp[i + 1], data.bl, data.th, calcm)
+        end
+        # before first responce point
+        if data.dosetime.time < time_cp[taufirstp]
+            if taufirstp > 1
+                # Interpolate responce between observations
+                intpmr  = interpolate(time_cp[taufirstp-1], time_cp[taufirstp], data.dosetime.time, obs_cp[taufirstp-1], obs_cp[taufirstp], calcm, true)
+                aucpartabl_, aucpartbbl_, tpartabl_, tpartbbl_, aucpartath_, aucpartbth_, tpartath_, tpartbth_, aucpartbtw_ = auctblth(intpmr, obs_cp[taufirstp], data.dosetime.time, time_cp[taufirstp], data.bl, data.th, calcm)
+            else # else set first point to zero
+                aucpartabl_, aucpartbbl_, tpartabl_, tpartbbl_, aucpartath_, aucpartbth_, tpartath_, tpartbth_, aucpartbtw_ = auctblth(0, obs_cp[taufirstp], data.dosetime.time, time_cp[taufirstp], data.bl, data.th, calcm)
+            end
+            pushfirst!(aucpartabl_tau, aucpartabl_)
+            pushfirst!(aucpartbbl_tau, aucpartbbl_)
+            pushfirst!(aucpartath_tau, aucpartath_)
+            pushfirst!(aucpartbth_tau, aucpartbth_)
+            pushfirst!(tpartabl_tau, tpartabl_)
+            pushfirst!(tpartbbl_tau, tpartbbl_)
+            pushfirst!(tpartath_tau, tpartath_)
+            pushfirst!(tpartbth_tau, tpartbth_)
+            pushfirst!(aucpartbtw_tau, aucpartbtw_)
+        end
+        # after last responce point
+        if data.dosetime.time + data.dosetime.tau > time_cp[taulastp]
+            if  taulastp < length(time_cp)
+                # Interpolate responce between observations
+                intpmr  = interpolate(time_cp[taulastp], time_cp[taulastp+1], data.dosetime.time + data.dosetime.tau, obs_cp[taulastp], obs_cp[taulastp+1], calcm, true)
+
+                aucpartabl_, aucpartbbl_, tpartabl_, tpartbbl_, aucpartath_, aucpartbth_, tpartath_, tpartbth_, aucpartbtw_ = auctblth(obs_cp[taulastp], intpmr, time_cp[taulastp], data.dosetime.time + data.dosetime.tau, data.bl, data.th, calcm)
+            else # else set first point to zero
+                aucpartabl_, aucpartbbl_, tpartabl_, tpartbbl_, aucpartath_, aucpartbth_, tpartath_, tpartbth_, aucpartbtw_ =  auctblth(obs_cp[taulastp], 0, time_cp[taulastp], data.dosetime.time + data.dosetime.tau, data.bl, data.th, calcm)
+            end
+            push!(aucpartabl_tau, aucpartabl_)
+            push!(aucpartbbl_tau, aucpartbbl_)
+            push!(aucpartath_tau, aucpartath_)
+            push!(aucpartbth_tau, aucpartbth_)
+            push!(tpartabl_tau, tpartabl_)
+            push!(tpartbbl_tau, tpartbbl_)
+            push!(tpartath_tau, tpartath_)
+            push!(tpartbth_tau, tpartbth_)
+            push!(aucpartbtw_tau, aucpartbtw_)
+        end
+
+        result[:AUCABLtau] = sum(aucpartabl_tau)
+        result[:AUCBBLtau] = sum(aucpartbbl_tau)
+        result[:AUCATHtau] = sum(aucpartath_tau)
+        result[:AUCBTHtau] = sum(aucpartbth_tau)
+        result[:TABLtau]   = sum(tpartabl_tau)
+        result[:TBBLtau]   = sum(tpartbbl_tau)
+        result[:TATHtau]   = sum(tpartath_tau)
+        result[:TBTHtau]   = sum(tpartbth_tau)
+        result[:AUCBTWtau] = sum(aucpartbtw_tau)
+    end
+
     # Verbose output
     if verbose > 0
         hnames = [:Time, :Observation, :AUCABL, :AUCBBL, :AUCATH, :AUCBTH]

src/plots.jl

@@ -45,7 +45,7 @@
 @userplot PKPlot
 @userplot PKElimpPlot
 @userplot PKElimpDrop
-@userplot PdHLine
+#@userplot PdHLine
 
 function luceil(x)
     fl = Int(floor(log10(x)))
@@ -119,12 +119,13 @@
     (x, y)
 end
 
+#=
 @recipe function f(subj::PdHLine)
     x, y = subj.args
     seriestype        --> :straightline
     (x, [y, y])
 end
-
+=#
 # Text label from ID
 function plotlabel(d, ld = nothing)
     title = ""
@@ -157,6 +158,7 @@
 * `plotstyle` - predefined plot style from PKPLOTSTYLE;
 * `drawbl` (`false`) - draw baseline, only for PDSubject;
 * `drawth` (`false`) - draw threshold, only for PDSubject;
+* `drawdt` (`false`) - draw drawdose time;
 
 """
 function pkplot(subj::AbstractSubject; ls = false, elim = false, xticksn = :auto, yticksn = :auto, kwargs...)
@@ -170,6 +172,9 @@
     else
         kwargs[:linestyle], kwargs[:linecolor], kwargs[:markershape],  kwargs[:markercolor]  = kwargs[:plotstyle]
     end
+    if !(:drawdt in k)
+        kwargs[:drawdt] = false
+    end
     if !(:drawbl in k)
         kwargs[:drawbl] = false
     end
@@ -256,12 +261,15 @@
     end
     if isa(subj, PDSubject)
         if kwargs[:drawth] == true
-            pdhline!(p, [minimum(subj.time), maximum(subj.time)], getth(subj), lc = :blue, label = "TH")
+            plot!(p, [minimum(subj.time), maximum(subj.time)], [getth(subj), getth(subj)], lc = kwargs[:linecolor], ls = :dashdot, label = "TH")
         end
         if kwargs[:drawbl] == true
-            pdhline!(p, [minimum(subj.time), maximum(subj.time)], getbl(subj), lc = :red, label = "BL")
+            plot!(p, [minimum(subj.time), maximum(subj.time)], [getbl(subj), getbl(subj)], lc = kwargs[:linecolor], ls = :dash, label = "BL")
         end
     end
+    if kwargs[:drawdt] == true && !isnan(subj.dosetime.time) 
+        plot!(p, [subj.dosetime.time, subj.dosetime.time], [minimum(subj.obs),  maximum(subj.obs)], label = "DoseTime", ls = :dot, lc = kwargs[:linecolor])
+    end
     return p
 end
 
@@ -276,6 +284,9 @@
         kwargs[:linestyle], kwargs[:linecolor], kwargs[:markershape],  kwargs[:markercolor]  = kwargs[:plotstyle]
     end
 
+    if !(:drawdt in k)
+        kwargs[:drawdt] = false
+    end
     if !(:legend in k)
         kwargs[:legend] = true
     end
@@ -325,6 +336,18 @@
     end
 
     p = pkplot!(time, obs;  lcd = yticksn, tcd = xticksn, kwargs...)
+
+    if isa(subj, PDSubject)
+        if kwargs[:drawth] == true
+            plot!(p, [minimum(subj.time), maximum(subj.time)], [getth(subj), getth(subj)], lc = kwargs[:linecolor], ls = :dashdot, label = "TH")
+        end
+        if kwargs[:drawbl] == true
+            plot!(p, [minimum(subj.time), maximum(subj.time)], [getbl(subj), getbl(subj)], lc = kwargs[:linecolor], ls = :dash, label = "BL")
+        end
+    end
+    if kwargs[:drawdt] == true && !isnan(subj.dosetime.time) 
+        plot!(p, [subj.dosetime.time, subj.dosetime.time], [minimum(subj.obs),  maximum(subj.obs)], label = "DoseTime", ls = :dot, lc = kwargs[:linecolor])
+    end
     return p
 end
 

src/setdosetime.jl

@@ -1,20 +1,20 @@
 #Subject
 """
-    setdosetime!(data::T, dosetime::DoseTime) where T <: PKSubject
+    setdosetime!(data::T, dosetime::DoseTime) where T <: AbstractSubject
 
 Set dose time `dosetime` for subject `data`.
 """
-function setdosetime!(data::PKSubject, dosetime::DoseTime)
+function setdosetime!(data::AbstractSubject, dosetime::DoseTime)
     data.dosetime = dosetime
     data
 end
 #DS ind Int
 """
-    setdosetime!(data::DataSet{T}, dosetime::DoseTime, ind::Int) where T <: PKSubject
+    setdosetime!(data::DataSet{T}, dosetime::DoseTime, ind::Int) where T <: AbstractSubject
 
 * `ind` - index in DataSet.
 """
-function setdosetime!(data::DataSet{<:PKSubject}, dosetime::DoseTime, ind::Int)
+function setdosetime!(data::DataSet{<:AbstractSubject}, dosetime::DoseTime, ind::Int)
     setdosetime!(data[ind], dosetime)
     data
 end
@@ -24,31 +24,31 @@ end
 
 * `inds` - indexes in DataSet.
 """
-function setdosetime!(data::DataSet{<:PKSubject}, dosetime::DoseTime, inds::Union{Vector{Int}, UnitRange{Int}, Tuple{Vararg{Int}}})
+function setdosetime!(data::DataSet{<:AbstractSubject}, dosetime::DoseTime, inds::Union{Vector{Int}, UnitRange{Int}, Tuple{Vararg{Int}}})
     for i in inds
         setdosetime!(data[i], dosetime)
     end
     data
 end
 #DS all
 """
-    setdosetime!(data::DataSet{T}, dosetime::DoseTime) where T <: PKSubject
+    setdosetime!(data::DataSet{T}, dosetime::DoseTime) where T <: AbstractSubject
 
 For all subjects in DataSet.
 """
-function setdosetime!(data::DataSet{<:PKSubject}, dosetime::DoseTime)
+function setdosetime!(data::DataSet{<:AbstractSubject}, dosetime::DoseTime)
     for i = 1:length(data)
         setdosetime!(data[i], dosetime)
     end
     data
 end
 #DS Dict
 """
-    setdosetime!(data::DataSet{T}, dosetime::DoseTime, sort::Dict) where T <: PKSubject
+    setdosetime!(data::DataSet{T}, dosetime::DoseTime, sort::Dict) where T <: AbstractSubject
 
 Set dose time `dosetime` for subjects if `sort` ⊆ subject's `id`.
 """
-function setdosetime!(data::DataSet{<:PKSubject}, dosetime::DoseTime, sort::Dict)
+function setdosetime!(data::DataSet{<:AbstractSubject}, dosetime::DoseTime, sort::Dict)
     for i = 1:length(data)
         if sort ⊆ data[i].id setdosetime!(data[i], dosetime) end
     end
@@ -60,7 +60,7 @@ end
 
 Return dosetime.
 """
-function getdosetime(data::PKSubject)
+function getdosetime(data::AbstractSubject)
     data.dosetime
 end
 

src/show.jl

@@ -59,13 +59,13 @@
     PrettyTables.pretty_table(io, metida_table(obj.time, obj.obs; names = (:Time, :Observation)); tf = PrettyTables.tf_compact)
 end
 
-function subject_type_str(subj::Type{<:PKSubject})
+function subject_type_str(subj::Type{PKS}) where PKS <: PKSubject
     "Pharmacokinetics subject"
 end
-function subject_type_str(subj::Type{<:UPKSubject})
+function subject_type_str(subj::Type{UPKS}) where UPKS <: UPKSubject
     "Pharmacokinetics subject (urine)"
 end
-function subject_type_str(subj::Type{<:PDSubject})
+function subject_type_str(subj::Type{PDS}) where PDS <: PDSubject
     "Pharmacodynamics subject"
 end
 function Base.show(io::IO, obj::DataSet{ST}) where ST <: AbstractSubject