Skip to content

Commit

Permalink
Updated webpage
Browse files Browse the repository at this point in the history
  • Loading branch information
droglenc committed Jun 1, 2021
1 parent a65f731 commit 57bbef6
Show file tree
Hide file tree
Showing 13 changed files with 290 additions and 230 deletions.
3 changes: 2 additions & 1 deletion R/FSAUtils.R
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ fishR <- function(where=c("home","IFAR","general","books",
invisible(tmp)
}


#' @name fsaNews
#'
#' @title Read news and changes for the 'FSA' package.
#'
#' @description Opens up the \href{https://github.com/droglenc/FSA/blob/master/NEWS.md}{News.md GitHub file} for the \sQuote{FSA} package in an external browser.
Expand Down
20 changes: 10 additions & 10 deletions R/deprecated_fitPlot.R
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@
#' fitPlot(glm1)
#' fitPlot(glm1,yaxis1.ticks=c(0,1),yaxis1.lbls=c(0,1))
#'
#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot <- function (object, ...) {
if ("lm" %in% class(object)) ## This is a hack so no double deprecation warning
.Deprecated(msg="'fitPlot' is deprecated and will soon be removed from 'FSA'; see fishR post from 25-May-2021 for alternative methods.")
UseMethod("fitPlot")
}

#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot.lm <- function(object, ...) {
object <- iTypeoflm(object)
Expand All @@ -137,7 +137,7 @@ fitPlot.lm <- function(object, ...) {
fitPlot(object,...)
}

#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot.SLR <- function(object,plot.pts=TRUE,pch=16,col.pt="black",
col.mdl="red",lwd=3,lty=1,
Expand Down Expand Up @@ -196,7 +196,7 @@ fitPlot.SLR <- function(object,plot.pts=TRUE,pch=16,col.pt="black",
}


#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot.IVR <- function(object,...) {
## Do some checks
Expand Down Expand Up @@ -369,14 +369,14 @@ iFitPlotIVR2 <- function(object,plot.pts=TRUE,pch=c(16,21,15,22,17,24,c(3:14)),
} # nocov end
}

#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot.POLY <- function(object,...) {
fitPlot.SLR(object,...)
}


#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot.ONEWAY <- function (object,
xlab=object$Enames[1],ylab=object$Rname,main="",
Expand Down Expand Up @@ -410,7 +410,7 @@ fitPlot.ONEWAY <- function (object,
} # nocov end


#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot.TWOWAY <- function(object,which,change.order=FALSE,
xlab=object$Enames[ord[1]],ylab=object$Rname,
Expand Down Expand Up @@ -465,7 +465,7 @@ fitPlot.TWOWAY <- function(object,which,change.order=FALSE,
}


#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot.nls <- function(object,d,
pch=c(19,1),col.pt=c("black","red"),col.mdl=col.pt,
Expand Down Expand Up @@ -544,7 +544,7 @@ fitPlot.nls <- function(object,d,
}
} # nocov end

#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot.glm <- function(object, ...) {
if (object$family$family=="binomial" & object$family$link=="logit")
Expand All @@ -553,7 +553,7 @@ fitPlot.glm <- function(object, ...) {
STOP("Currently only logistic regression GLM models are supported by fitPlot.")
}

#' @rdname fitPlot-deprecated
#' @rdname fitPlot
#' @export
fitPlot.logreg <- function(object,
xlab=names(object$model)[2],ylab=names(object$model)[1],
Expand Down
3 changes: 2 additions & 1 deletion _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ reference:
- binCI
- hyperCI
- poiCI
- bootstrap
- boot
- dunnTest
- extraSS
- geomean
Expand All @@ -100,6 +100,7 @@ reference:
- ksTest
- logbtcf
- lrt
- nlsBoot
- nlsTracePlot
- pcumsum
- rSquared
Expand Down
56 changes: 28 additions & 28 deletions docs/news/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pandoc: 2.11.4
pkgdown: 1.6.1
pkgdown_sha: ~
articles: {}
last_built: 2021-06-01T13:23Z
last_built: 2021-06-01T21:47Z
urls:
reference: http://derekogle.com/FSA/reference
article: http://derekogle.com/FSA/articles
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/CodNorwegian.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 22 additions & 22 deletions docs/reference/fitPlot.html

Large diffs are not rendered by default.

352 changes: 205 additions & 147 deletions docs/reference/growthModels.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/reference/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/reference/nlsTracePlot.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/reference/srStarts.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 57bbef6

Please sign in to comment.