Dev (#14)

* fix partials
PharmCat · Jul 19, 2023 · 11c136a · 11c136a · PharmCat · Jul 19, 2023
1 parent e14950c
commit 11c136a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,8 @@
 name = "MetidaNCA"
 uuid = "097c2839-c7bc-4c4b-a5f2-b4167c1b4e7c"
 authors = ["PharmCat <[email protected]>"]
-version = "0.5.6"
+version = "0.5.7"
+
 
 [deps]
 

diff --git a/src/nca.jl b/src/nca.jl
@@ -724,7 +724,7 @@ function nca!(data::PKSubject{T, O}; adm = :ev, calcm = :lint, intpm = nothing,
                 lastpartc  = interpolate(time_cp[lastp], time_cp[lastp + 1], etime, obs_cp[lastp], obs_cp[lastp + 1], intpm,  time_cp[lastp] > result[:Tmax])
                 lastpart +=  aucpart(time_cp[lastp], etime, obs_cp[lastp], lastpartc, calcm, time_cp[lastp] > result[:Tmax])
                 #println("lastpartc = $lastpartc , lastpart = $lastpart")
-            elseif etime > time_cp[lastp] && prtext == :last
+            elseif etime >= time_cp[lastp] && prtext == :last
                 lastpartc = zero(O)
             elseif etime > time_cp[lastp] && prtext == :extr && !isnan(result[:Kel])
                 lastpartc = exp(result[:LZint] + result[:LZ] * etime)

diff --git a/test/tests.jl b/test/tests.jl
@@ -1501,6 +1501,8 @@ end
     dsnca = MetidaNCA.nca!(ds, adm = :ev, calcm = :luld, partials = [(0, 100)], prtext = :extr)
     @test dsnca[:, :AUCtau] ≈ dsnca[:, :AUC_0_100] atol=1E-6
 
+    dsnca = MetidaNCA.nca!(ds, adm = :ev, calcm = :luld, partials = [(0, 72)], prtext = :last)
+    @test dsnca[:, :AUCall] ≈ dsnca[:, :AUC_0_72] atol=1E-6
 end
 
 @testset "  set-get*! tests                                          " begin