improved logo

NAMESPACE

@@ -12,6 +12,7 @@ S3method(residuals,hystar_fit)
 S3method(summary,hystar_fit)
 S3method(summary,hystar_sim)
 export(hystar_fit)
+export(hystar_info)
 export(hystar_sim)
 export(z_sim)
 importFrom(Rcpp,sourceCpp)
@@ -28,5 +29,6 @@ importFrom(stats,qnorm)
 importFrom(stats,quantile)
 importFrom(stats,residuals)
 importFrom(stats,rnorm)
+importFrom(utils,browseURL)
 importFrom(utils,combn)
 useDynLib(hystar, .registration = TRUE)

NEWS.md

@@ -18,5 +18,5 @@
 
 # `hystar` 1.0.0
 
-* First CRAN release! 🎉
+* First CRAN release!
 

R/optimize.R

@@ -35,13 +35,20 @@ get_optims <- function(y, eff, x, z, p0, p1, grid) {
   prev <- rep(-9L, times = length(eff))
 
   for (i in 1:nrow(grid)) {
+    message("\rsearching delay, r0, r1 for p0 = ", p0, " and p1 = ", p1,
+            ". ", round(100 * i / nrow(grid), 0), "%", appendLF = FALSE)
+    #message("Searching delay, r0, r1: ",
+    #        paste(grid[i, "d"], round(grid[i, "r0"], 2), round(grid[i, "r1"], 2),
+    #              sep = ", "),
+    #        "\r", appendLF = FALSE)
     H <- ts_hys(z[eff - grid[i, "d"]], grid[i, "r0"], grid[i, "r1"])
     R <- ts_reg(H, start = grid[i, "s"])
     if (all(R == prev)) {
       results[i] <- results[i-1]
     } else {
       X <- create_X(x, p0, p1, R)
-      results[i] <- fit(y[eff], X)$rss
+      results[i] <- Inf
+      try(results[i] <- fit(y[eff], X)$rss, silent = TRUE)
     }
     prev <- R
   }

R/print.R

@@ -34,7 +34,7 @@ print.hystar_sim <- function(x, ...) {
 }
 
 print_hystar <- function(n, d, r0, r1, coe0, coe1, rv0, rv1, simfit, tar) {
-  model <- if (tar) "TAR model " else "HysTAR model "
+  model <- if (tar) "\nTAR model " else "\nHysTAR model "
   cat(paste0(model, simfit, " ", n, " observations."),
       "\n\n",
       "if R[t] = 0:\n", make_formula(coe0, rv0),

R/zzz.R

@@ -0,0 +1,25 @@
+.onAttach <- function(libname, pkgname) {
+hystar_string <- "
+   __            __
+  / /_ __ ______/ /_________
+ / _  / // (_ -/  _/ _  / __\\
+/_//_/\\_, /___)\\__/\\_,_/_/
+     /___/             1.2.0
+
+Estimation and simulation of the HysTAR Model.
+For function help, run `?hystar_fit`, `?hystar_sim` or `?z_sim`.
+For more information, run `hystar_info()` (opens a URL in your browser).
+"
+
+packageStartupMessage(hystar_string)
+}
+
+#' @export
+#' @importFrom utils browseURL
+hystar_info <- function() {
+  browseURL("https://daandejongen.github.io/hystar/index.html")
+}
+
+
+
+