From 68fc48f66f3804b5e5a798c3f50fd2a53485eb43 Mon Sep 17 00:00:00 2001
From: "Matthew L. Fidler" <matthew.fidler@gmail.com>
Date: Wed, 11 Oct 2023 15:35:48 -0500
Subject: [PATCH] store evid

---
 inst/include/rxode2parseSortInd.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/inst/include/rxode2parseSortInd.h b/inst/include/rxode2parseSortInd.h
index d38d3935..f5f64b67 100644
--- a/inst/include/rxode2parseSortInd.h
+++ b/inst/include/rxode2parseSortInd.h
@@ -14,15 +14,17 @@ static inline void rxode2parse_sortInd(rx_solving_options_ind *ind) {
   for (int i = 0; i < ind->n_all_times; i++) {
     ind->ix[i] = i;
     ind->idx = i;
-    if (!isObs(getEvid(ind, i))) {
+    int evid = getEvid(ind, i);
+    if (!isObs(evid)) {
       time[i] = getTime__(ind->ix[i], ind, 1);
       ind->ixds++;
     } else {
-      if (getEvid(ind, i) == 3) {
+      if (evid == 3) {
         ind->curShift -= rx->maxShift;
       }
       time[i] = getTime__(ind->ix[i], ind, 1);
     }
+    /* REprintf("i: %d; evid: %d; %f -> %f\n", i, evid, getAllTimes(ind, i), time[i]); */
     if (op->naTime == 1){
       doSort=0;
       break;