From e901b84d58fc722181f3f4694d36fd9b8d26aaac Mon Sep 17 00:00:00 2001
From: Ron Keizer <ron@insight-rx.com>
Date: Sat, 12 Jul 2025 07:06:58 +0000
Subject: [PATCH] merge fix

---
 DESCRIPTION                            |  4 ++--
 R/parse_input_data.R                   | 12 ++++++------
 tests/testthat/test-parse_input_data.R |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index d1f1985..cc283fd 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: PKPDmap
 Type: Package
 Title: MAP Bayesian estimates
-Version: 1.0.3
-Date: 2025-06-18
+Version: 1.0.4
+Date: 2025-07-12
 Author: Ron Keizer, Jasmine Hughes, Kara Woo
 Maintainer: Ron Keizer <ron@insight-rx.com>
 Description: Obtain MAP Bayesian estimates based on individual data and
diff --git a/R/parse_input_data.R b/R/parse_input_data.R
index 62bd2fd..aefe23b 100644
--- a/R/parse_input_data.R
+++ b/R/parse_input_data.R
@@ -7,6 +7,12 @@ parse_input_data <- function(
   cols = list(x = "t", y = "y"),
   obs_type_label = NULL
 ) {
+  ## Parse data to include label for obs_type
+  if(is.null(obs_type_label)) {
+    data$obs_type <- 1
+  } else {
+    data$obs_type <- data[[obs_type_label]]
+  }
   colnames(data) <- tolower(colnames(data))
   if(!all(tolower(unlist(cols)) %in% names(data))) {
     stop("Expected column names were not found in data. Please use 'cols' argument to specify column names for independent and dependent variable.")
@@ -18,12 +24,6 @@ parse_input_data <- function(
       data$evid <- 0
     }
   }
-  ## Parse data to include label for obs_type
-  if(is.null(obs_type_label)) {
-    data$obs_type <- 1
-  } else {
-    data$obs_type <- data[[obs_type_label]]
-  }
   if("evid" %in% colnames(data)) {
     data <- data[data$evid == 0,]
   }
diff --git a/tests/testthat/test-parse_input_data.R b/tests/testthat/test-parse_input_data.R
index 2457a2f..05b279e 100644
--- a/tests/testthat/test-parse_input_data.R
+++ b/tests/testthat/test-parse_input_data.R
@@ -9,11 +9,11 @@ test_that("parse_input_data handles regular data frame input", {
   result <- parse_input_data(data)
   
   # Check column names are lowercase
-  expect_equal(names(result), c("t", "obs_type", "y"))
+  expect_equal(names(result), c("t", "obs_type", "y", "obs_type"))
   
   # Check sorting
   expect_equal(result$t, c(1, 2, 3))
-  expect_equal(result$obs_type, c(1, 1, 1))
+  expect_equal(result$obs_type, c(1, 2, 1))
 })
 
 test_that("parse_input_data handles PKPDsim object", {
@@ -133,3 +133,4 @@ test_that("parse_input_data preserves data values after transformations", {
   expect_equal(result$dv, c(10, 30))
   expect_equal(result$t, c(2, 3))
 })
+