Merge pull request #9 from UofUEpiBio/vectorization

Vectorization
UofUEpiBio · Dec 1, 2023 · 68de576 · 68de576
2 parents bf344f7 + 5283c3b
commit 68de576
Show file tree

Hide file tree

Showing 59 changed files with 3,317 additions and 2,175 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -63,7 +63,12 @@
     "thread": "cpp",
     "typeinfo": "cpp",
     "variant": "cpp",
-    "semaphore": "cpp"
+    "semaphore": "cpp",
+    "list": "cpp",
+    "unordered_set": "cpp",
+    "shared_mutex": "cpp",
+    "cfenv": "cpp",
+    "cinttypes": "cpp"
   },
   "intel-corporation.oneapi-analysis-configurator.binary-path": "/home/george/Documents/development/epiworld/tests/01c.o"
 }
diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ int main()
 
     virus.set_status(1, 2);
 
-    model.add_virus_n(virus, 1000);
+    model.default_add_virus<TSeq>n(virus, 1000);
 
     // Generating a random pop from a smallworld network
     model.agents_smallworld(100000, 4L, false, .01);

diff --git a/epiworld-hpp.R b/epiworld-hpp.R
@@ -37,7 +37,7 @@ unfolder <- function(txt, rel = "include/epiworld/") {
 
         loc <- heads[h]
 
-        fn <- paste0(rel, fns[h])
+        fn <- trimws(paste0(rel, fns[h]))
         tmp_lines <- readLines(fn, warn = FALSE)
 
         # Extracting relative path