Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8c83782
Update version
StuartWheater Feb 20, 2026
69d4bb4
Update to glmSLMADS.assign
StuartWheater Feb 20, 2026
2a4a349
Update to documents
StuartWheater Feb 20, 2026
d79c7d2
Removed checking of 'opal'
StuartWheater Feb 20, 2026
1aa5c13
Merge pull request #458 from StuartWheater/v6.3.5-dev
StuartWheater Feb 22, 2026
2f6184e
Merge pull request #459 from datashield/v6.3.5-dev
StuartWheater Feb 23, 2026
fbdfa42
Permit perf test duration to be set, seconds, by environment variable…
StuartWheater Apr 10, 2026
1f12d53
Permit perf test duration to be set, seconds, by environment variable…
StuartWheater Apr 10, 2026
e75797b
Refactor perf test duration obtaining
StuartWheater Apr 13, 2026
6a1b21f
Merge pull request #468 from StuartWheater/v6.3.6-dev_feat-perf-support
StuartWheater Apr 14, 2026
dd6133f
Added libuv1-dev to deployment
StuartWheater Apr 21, 2026
9f94f63
Merge branch 'datashield:v6.3.6-dev' into v6.3.6-dev
StuartWheater Apr 22, 2026
90b6f86
Update to perf test suppoer and 'libuv1'
StuartWheater Apr 22, 2026
d40d899
Add 'libuv1'
StuartWheater Apr 22, 2026
b01c923
Updated version to 'v6.3.6-dev'
StuartWheater Apr 22, 2026
baab62b
Merge pull request #476 from StuartWheater/v6.3.6-dev
StuartWheater Apr 23, 2026
4b5a0ec
Merge remote-tracking branch 'origin/v6.3.6-dev' into origin/v6.4.0-d…
StuartWheater Apr 27, 2026
a63b4bb
Fixes needed to changes in 6.3.6-dev
StuartWheater Apr 27, 2026
15fdc5e
V6.4.0 dev feat/update 20260427
StuartWheater May 3, 2026
6d5cd81
Update of RoxygenNote from '7.3.3' to '8.0.0'
StuartWheater May 3, 2026
0edbbfc
Merge branch 'v6.4.0-dev_feat/update_20260427' of github.com:datashie…
StuartWheater May 3, 2026
de5d374
Updated 'dsBase-package.Rd'
StuartWheater May 3, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
sudo apt-get install -y r-base-core cmake
- run:
command: |
sudo apt-get install -y libxml2-dev
sudo apt-get install -y libxml2-dev libuv1-dev
- run:
command: |
echo "options(Ncpus=4)" >> ~/.Rprofile
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ Suggests:
spelling,
testthat,
tidytable
RoxygenNote: 7.3.3
RoxygenNote: 8.0.0
Encoding: UTF-8
Language: en-GB
12 changes: 6 additions & 6 deletions R/glmSLMADS.assign.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ glmSLMADS.assign <- function(formula, family, offsetName, weightsName, dataName)
# Convert transmitable text for special link variance combinations back to full representation
if(family=="quasigamma.link_log")
{family<-"quasi(link=log,variance=mu^2)"}

if(family=="Gamma.link_log")
{family<-"Gamma(link=log)"}

# Correctly name offset, weights and data objects in function call
# (to allow glmPredict to work correctly later)
calltext <- paste0("mg<-glm(formula,family=",family,",offset=",
offsetName,",weights=",weightsName,",data=", dataName,",x=TRUE)")

eval(parse(text=calltext))

# update the call object to include the actual formula
mg$call$formula <- formula
return(mg)

return(mg)

}
# ASSIGN FUNCTION
Expand Down
3 changes: 1 addition & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:

sudo apt-get install -qq pkg-config -y
sudo apt-get install -qq libxml2-dev libcurl4-openssl-dev libssl-dev libgit2-dev libharfbuzz-dev libfribidi-dev libfontconfig1-dev -y
sudo apt-get install -qq libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev -y
sudo apt-get install -qq libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev libuv1-dev -y
sudo apt-get install -qq r-base -y
sudo R -e "install.packages('devtools', dependencies=TRUE)"
sudo R -e "install.packages('RANN', dependencies=TRUE)"
Expand Down Expand Up @@ -257,7 +257,6 @@ jobs:
echo 'branch:'$(branchName) >> $(datetime).txt
echo 'os:'$(lsb_release -ds) >> $(datetime).txt
echo 'R:'$(R --version | head -n 1) >> $(datetime).txt
echo 'opal:'$(opal system --opal localhost:8080 --user administrator --password "datashield_test&" --version) >> $(datetime).txt

workingDirectory: $(Pipeline.Workspace)/logs
displayName: 'Write versions to file'
Expand Down
12 changes: 0 additions & 12 deletions docs/authors.html

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

4 changes: 0 additions & 4 deletions docs/index.html

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

6 changes: 1 addition & 5 deletions docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@ pandoc: 3.1.3
pkgdown: 2.2.0
pkgdown_sha: ~
articles: {}
<<<<<<< HEAD
last_built: 2025-11-28T12:54Z
=======
last_built: 2025-11-30T16:44Z
>>>>>>> origin/v6.3.5-dev
last_built: 2026-02-20T10:54Z
4 changes: 0 additions & 4 deletions docs/reference/BooleDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/absDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/asCharacterDS.html

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

24 changes: 2 additions & 22 deletions docs/reference/asDataMatrixDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/asFactorDS1.html

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

4 changes: 0 additions & 4 deletions docs/reference/asFactorDS2.html

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

4 changes: 0 additions & 4 deletions docs/reference/asFactorSimpleDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/asIntegerDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/asListDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/asLogicalDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/asMatrixDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/asNumericDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/aucDS.html

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

4 changes: 0 additions & 4 deletions docs/reference/blackBoxDS.html

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

Loading
Loading