Skip to content

Commit e9357d4

Browse files
Merge pull request #38 from datashield/v6.3.4-dev
Fix typos
2 parents a238a20 + 77da88a commit e9357d4

60 files changed

Lines changed: 105 additions & 105 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

R/asDataMatrixDS.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#' class for all columns in data.frames.
44
#' @details This assign function is based on the native R function \code{data.matrix}
55
#' If applied to a data.frame, the native R function \code{as.matrix}
6-
#' coverts all columns into character class. In contrast, if applied to
6+
#' converts all columns into character class. In contrast, if applied to
77
#' a data.frame the native R function \code{data.matrix} converts
88
#' the data.frame to a matrix but maintains all data columns in their
99
#' original class

R/checkNegValueDS.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#'
22
#' @title Checks if a numeric variable has negative values
33
#' @description this function is only called by the client function \code{ds.glm}.
4-
#' @details if a user sets the parameter 'weights' on the client site function \code{ds.glm} this
4+
#' @details if a user sets the parameter 'weights' on the client side function \code{ds.glm} this
55
#' server side function is called to verify that the 'weights' vector does not have negative values
66
#' because no negative are allowed in weights.
77
#' @param weights a numeric vector

R/densityGridDS.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#'
22
#' @title Generates a density grid with or without a priori defined limits
3-
#' @description Generates a density grid that can then be used for heatmap or countour plots.
3+
#' @description Generates a density grid that can then be used for heatmap or contour plots.
44
#' @details Invalid cells (cells with count < to the set filter value for the minimum allowed
55
#' counts in table cells) are turn to 0.
66
#' @param xvect a numerical vector

R/dmtC2SDS.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#' @param ncols.transmit specifies the number of columns in the matrix to be created.
2323
#' Fixed by the clientside function as equal to the number of columns in
2424
#' the clientside DMT to be transferred.
25-
#' @param colnames.transmit a parser-transmissable vector specifying the name of each column
25+
#' @param colnames.transmit a parser-transmissible vector specifying the name of each column
2626
#' in the DMT being transferred from clientside to serverside.
2727
#' Generated automatically by clientside function from colnames of clientside DMT.
28-
#' @param colclass.transmit a parser-transmissable vector specifying the class of the
28+
#' @param colclass.transmit a parser-transmissible vector specifying the class of the
2929
#' vector representing each individual column in the DMT to be transferred.
3030
#' Generated automatically by clientside function. This allows the transmission of DMTs
3131
#' containing columns with different classes.If something is going to go wrong with

R/gamlssDS.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#'
2-
#' @title gamlssDS an aggregate function called by ds.galmss
2+
#' @title gamlssDS an aggregate function called by ds.gamlss
33
#' @description This function calls the gamlssDS that is a wrapper function from
44
#' the gamlss R package. The function returns an object of class "gamlss", which
55
#' is a generalized additive model for location, scale and shape (GAMLSS). The

R/glmerSLMADS.assign.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#' The analytic work engine is the glmer function in R which sits in the lme4 package.
66
#' glmerSLMADS.assign fits a generalized linear mixed effects model (glme) - e.g. a logistic or
77
#' Poisson regression model including both fixed and random effects - on data
8-
#' from each single data source and saves the regression outcomes on the serveside.
8+
#' from each single data source and saves the regression outcomes on the serverside.
99
#' @param formula see help for ds.glmerSLMA
1010
#' @param offset see help for ds.glmerSLMA
1111
#' @param weights see help for ds.glmerSLMA

R/hetcorDS.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#'
22
#' @title Heterogeneous Correlation Matrix
33
#' @description This function is based on the hetcor function from the R package \code{polycor}.
4-
#' @details Computes a heterogenous correlation matrix, consisting of Pearson product-moment
4+
#' @details Computes a heterogeneous correlation matrix, consisting of Pearson product-moment
55
#' correlations between numeric variables, polyserial correlations between numeric and ordinal
66
#' variables, and polychoric correlations between ordinal variables.
77
#' @param data the name of a data frame consisting of factors, ordered factors, logical variables,

R/lexisDS2.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#' @description The second serverside function called by ds.lexis.
44
#' @details This is the assign
55
#' function which actually creates
6-
#' the expanded dataframe containing surival data for a piecewise exponential
6+
#' the expanded dataframe containing survival data for a piecewise exponential
77
#' regression. lexisDS2 also
88
#' carries out a series of disclosure checks and if the arguments or data fail any of
99
#' those tests,

R/lmerSLMADS.assign.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#' @title Fitting linear mixed effect models - serverside function
2-
#' @description lmerSLMADS.assing is the same as lmerSLMADS2 which fits a linear
2+
#' @description lmerSLMADS.assign is the same as lmerSLMADS2 which fits a linear
33
#' mixed effects model (lme) per study and saves the outcomes in each study
44
#' @details lmerSLMADS.assign is a serverside function called by ds.lmerSLMA on the clientside.
55
#' The analytic work engine is the lmer function in R which sits in the lme4 package.
66
#' lmerSLMADS.assign fits a linear mixed effects model (lme) including both fixed and random
7-
#' effects - on data from each single data source and saves the regression outcomes on the serveside.
7+
#' effects - on data from each single data source and saves the regression outcomes on the serverside.
88
#' @param formula see help for ds.lmerSLMA
99
#' @param offset see help for ds.lmerSLMA
1010
#' @param weights see help for ds.lmerSLMA

R/meanDS.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#'
2-
#' @title Computes statistical mean of a vectores
2+
#' @title Computes statistical mean of a vector
33
#' @description Calculates the mean value.
44
#' @details if the length of input vector is less than the set filter
55
#' a missing value is returned.

0 commit comments

Comments
 (0)