From 8c8378295d231452a974acd75ee3a9eaa648837d Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 20 Feb 2026 11:00:52 +0000 Subject: [PATCH 01/11] Update version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index bc5e3973..fabf52d8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -5,7 +5,7 @@ Description: Base 'DataSHIELD' functions for the server side. 'DataSHIELD' is a been designed to only share non disclosive summary statistics, with built in automated output checking based on statistical disclosure control. With data sites setting the threshold values for the automated output checks. For more details, see 'citation("dsBase")'. -Version: 6.3.5.9000 +Version: 6.3.5 Authors@R: c(person(given = "Paul", family = "Burton", role = c("aut"), From 69d4bb426b9e2e84fff7d2f761aa7aba92a6290a Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 20 Feb 2026 11:01:28 +0000 Subject: [PATCH 02/11] Update to glmSLMADS.assign --- R/glmSLMADS.assign.R | 41 +++++++++++++---------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/R/glmSLMADS.assign.R b/R/glmSLMADS.assign.R index 275e1f47..68fe6929 100644 --- a/R/glmSLMADS.assign.R +++ b/R/glmSLMADS.assign.R @@ -18,40 +18,25 @@ #' @export glmSLMADS.assign <- function(formula, family, offsetName, weightsName, dataName){ -############################################################# -#MODULE 1: CAPTURE THE nfilter SETTINGS # -thr <- dsBase::listDisclosureSettingsDS() # -nfilter.tab <- as.numeric(thr$nfilter.tab) # -nfilter.glm <- as.numeric(thr$nfilter.glm) # -#nfilter.subset<-as.numeric(thr$nfilter.subset) # -#nfilter.string<-as.numeric(thr$nfilter.string) # -############################################################# + # Convert transmitable text for special link variance combinations back to full representation + if(family=="quasigamma.link_log") + {family<-"quasi(link=log,variance=mu^2)"} -######################################## -############ -#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)"} -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)") -#Activate family object (this may not be necessary as character string may already be OK -#but just checking -final.family.object<-eval(parse(text=family)) + eval(parse(text=calltext)) + # update the call object to include the actual formula + mg$call$formula <- formula -#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)) - -return(mg) + return(mg) } - # ASSIGN FUNCTION # glmSLMADS.assign From 2a4a3496f810b7ad4cfeaf5390afda6f45439631 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 20 Feb 2026 11:02:18 +0000 Subject: [PATCH 03/11] Update to documents --- docs/404.html | 2 +- docs/LICENSE.html | 2 +- docs/authors.html | 6 +++--- docs/index.html | 2 +- docs/pkgdown.yml | 2 +- docs/reference/BooleDS.html | 2 +- docs/reference/absDS.html | 2 +- docs/reference/asCharacterDS.html | 2 +- docs/reference/asDataMatrixDS.html | 2 +- docs/reference/asFactorDS1.html | 2 +- docs/reference/asFactorDS2.html | 2 +- docs/reference/asFactorSimpleDS.html | 2 +- docs/reference/asIntegerDS.html | 2 +- docs/reference/asListDS.html | 2 +- docs/reference/asLogicalDS.html | 2 +- docs/reference/asMatrixDS.html | 2 +- docs/reference/asNumericDS.html | 2 +- docs/reference/aucDS.html | 2 +- docs/reference/blackBoxDS.html | 2 +- docs/reference/blackBoxRanksDS.html | 2 +- docs/reference/boxPlotGGDS.html | 2 +- docs/reference/boxPlotGG_data_TreatmentDS.html | 2 +- docs/reference/boxPlotGG_data_Treatment_numericDS.html | 2 +- docs/reference/bp_standardsDS.html | 2 +- docs/reference/cDS.html | 2 +- docs/reference/cbindDS.html | 2 +- docs/reference/changeRefGroupDS.html | 2 +- docs/reference/checkNegValueDS.html | 2 +- docs/reference/checkPermissivePrivacyControlLevel.html | 2 +- docs/reference/classDS.html | 2 +- docs/reference/colnamesDS.html | 2 +- docs/reference/completeCasesDS.html | 2 +- docs/reference/corDS.html | 2 +- docs/reference/corTestDS.html | 2 +- docs/reference/covDS.html | 2 +- docs/reference/dataFrameDS.html | 2 +- docs/reference/dataFrameFillDS.html | 2 +- docs/reference/dataFrameSortDS.html | 2 +- docs/reference/dataFrameSubsetDS1.html | 2 +- docs/reference/dataFrameSubsetDS2.html | 2 +- docs/reference/densityGridDS.html | 2 +- docs/reference/dimDS.html | 2 +- docs/reference/dmtC2SDS.html | 2 +- docs/reference/dsBase-package.html | 2 +- docs/reference/elsplineDS.html | 2 +- docs/reference/extractQuantilesDS1.html | 2 +- docs/reference/extractQuantilesDS2.html | 2 +- docs/reference/gamlssDS.html | 2 +- docs/reference/getWGSRDS.html | 2 +- docs/reference/glmDS1.html | 2 +- docs/reference/glmDS2.html | 2 +- docs/reference/glmPredictDS.ag.html | 2 +- docs/reference/glmPredictDS.as.html | 2 +- docs/reference/glmSLMADS.assign.html | 2 +- docs/reference/glmSLMADS1.html | 2 +- docs/reference/glmSLMADS2.html | 2 +- docs/reference/glmSummaryDS.ag.html | 2 +- docs/reference/glmSummaryDS.as.html | 2 +- docs/reference/glmerSLMADS.assign.html | 2 +- docs/reference/glmerSLMADS2.html | 2 +- docs/reference/heatmapPlotDS.html | 2 +- docs/reference/hetcorDS.html | 2 +- docs/reference/histogramDS1.html | 2 +- docs/reference/histogramDS2.html | 2 +- docs/reference/igb_standardsDS.html | 2 +- docs/reference/index.html | 2 +- docs/reference/isNaDS.html | 2 +- docs/reference/isValidDS.html | 2 +- docs/reference/kurtosisDS1.html | 2 +- docs/reference/kurtosisDS2.html | 2 +- docs/reference/lengthDS.html | 2 +- docs/reference/levelsDS.html | 2 +- docs/reference/lexisDS1.html | 2 +- docs/reference/lexisDS2.html | 2 +- docs/reference/lexisDS3.html | 2 +- docs/reference/listDS.html | 2 +- docs/reference/listDisclosureSettingsDS.html | 2 +- docs/reference/lmerSLMADS.assign.html | 2 +- docs/reference/lmerSLMADS2.html | 2 +- docs/reference/lsDS.html | 2 +- docs/reference/lsplineDS.html | 2 +- docs/reference/matrixDS.html | 2 +- docs/reference/matrixDetDS1.html | 2 +- docs/reference/matrixDetDS2.html | 2 +- docs/reference/matrixDiagDS.html | 2 +- docs/reference/matrixDimnamesDS.html | 2 +- docs/reference/matrixInvertDS.html | 2 +- docs/reference/matrixMultDS.html | 2 +- docs/reference/matrixTransposeDS.html | 2 +- docs/reference/mdPatternDS.html | 2 +- docs/reference/meanDS.html | 2 +- docs/reference/meanSdGpDS.html | 2 +- docs/reference/mergeDS.html | 2 +- docs/reference/messageDS.html | 2 +- docs/reference/metadataDS.html | 2 +- docs/reference/miceDS.html | 2 +- docs/reference/minMaxRandDS.html | 2 +- docs/reference/namesDS.html | 2 +- docs/reference/nsDS.html | 2 +- docs/reference/numNaDS.html | 2 +- docs/reference/qlsplineDS.html | 2 +- docs/reference/quantileMeanDS.html | 2 +- docs/reference/rBinomDS.html | 2 +- docs/reference/rNormDS.html | 2 +- docs/reference/rPoisDS.html | 2 +- docs/reference/rUnifDS.html | 2 +- docs/reference/rangeDS.html | 2 +- docs/reference/ranksSecureDS1.html | 2 +- docs/reference/ranksSecureDS2.html | 2 +- docs/reference/ranksSecureDS3.html | 2 +- docs/reference/ranksSecureDS4.html | 2 +- docs/reference/ranksSecureDS5.html | 2 +- docs/reference/rbindDS.html | 2 +- docs/reference/reShapeDS.html | 2 +- docs/reference/recodeLevelsDS.html | 2 +- docs/reference/recodeValuesDS.html | 2 +- docs/reference/repDS.html | 2 +- docs/reference/replaceNaDS.html | 2 +- docs/reference/rmDS.html | 2 +- docs/reference/rowColCalcDS.html | 2 +- docs/reference/sampleDS.html | 2 +- docs/reference/scatterPlotDS.html | 2 +- docs/reference/seqDS.html | 2 +- docs/reference/setSeedDS.html | 2 +- docs/reference/skewnessDS1.html | 2 +- docs/reference/skewnessDS2.html | 2 +- docs/reference/sqrtDS.html | 2 +- docs/reference/subsetByClassDS.html | 2 +- docs/reference/subsetDS.html | 2 +- docs/reference/table1DDS.html | 2 +- docs/reference/table2DDS.html | 2 +- docs/reference/tableDS.assign.html | 2 +- docs/reference/tableDS.html | 2 +- docs/reference/tableDS2.html | 2 +- docs/reference/tapplyDS.assign.html | 2 +- docs/reference/tapplyDS.html | 2 +- docs/reference/testObjExistsDS.html | 2 +- docs/reference/unListDS.html | 2 +- docs/reference/uniqueDS.html | 2 +- docs/reference/varDS.html | 2 +- docs/reference/vectorDS.html | 2 +- 141 files changed, 143 insertions(+), 143 deletions(-) diff --git a/docs/404.html b/docs/404.html index 828175ea..91a82d08 100644 --- a/docs/404.html +++ b/docs/404.html @@ -32,7 +32,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/LICENSE.html b/docs/LICENSE.html index 5faa2d0e..7fde2a96 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/authors.html b/docs/authors.html index a1aec549..47c4a8d1 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 @@ -102,12 +102,12 @@

Citation

Burton P, Wilson R, Butters O, Ryser-Welch P, Westerberg A, Abarrategui L, Villegas-Diaz R, Avraam D, Marcon Y, Bishop T, Gaye A, Escribà-Montagut X, Wheater S (????). dsBase: 'DataSHIELD' Server Side Base Functions. -R package version 6.3.5.9000. +R package version 6.3.5. 

@Manual{,
   title = {dsBase: 'DataSHIELD' Server Side Base Functions},
   author = {Paul Burton and Rebecca Wilson and Olly Butters and Patricia Ryser-Welch and Alex Westerberg and Leire Abarrategui and Roberto Villegas-Diaz and Demetris Avraam and Yannick Marcon and Tom Bishop and Amadou Gaye and Xavier Escribà-Montagut and Stuart Wheater},
-  note = {R package version 6.3.5.9000},
+  note = {R package version 6.3.5},
 }

Gaye A, Marcon Y, Isaeva J, LaFlamme P, Turner A, Jones E, Minion J, Boyd A, Newby C, Nuotio M, Wilson R, Butters O, Murtagh B, Demir I, Doiron D, Giepmans L, Wallace S, Budin-Ljøsne I, Schmidt C, Boffetta P, Boniol M, Bota M, Carter K, deKlerk N, Dibben C, Francis R, Hiekkalinna T, Hveem K, Kvaløy K, Millar S, Perry I, Peters A, Phillips C, Popham F, Raab G, Reischl E, Sheehan N, Waldenberger M, Perola M, van den Heuvel E, Macleod J, Knoppers B, Stolk R, Fortier I, Harris J, Woffenbuttel B, Murtagh M, Ferretti V, Burton P (2014). “DataSHIELD: taking the analysis to the data, not the data to the analysis.” diff --git a/docs/index.html b/docs/index.html index 1f70741d..9ae6f613 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index c3eb19af..9cfbee88 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,4 +2,4 @@ pandoc: 3.1.3 pkgdown: 2.2.0 pkgdown_sha: ~ articles: {} -last_built: 2025-11-30T16:44Z +last_built: 2026-02-20T10:54Z diff --git a/docs/reference/BooleDS.html b/docs/reference/BooleDS.html index 7cecbed2..b6c3e109 100644 --- a/docs/reference/BooleDS.html +++ b/docs/reference/BooleDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/absDS.html b/docs/reference/absDS.html index ca83bf9d..2c9094a2 100644 --- a/docs/reference/absDS.html +++ b/docs/reference/absDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asCharacterDS.html b/docs/reference/asCharacterDS.html index 8f461038..066e14ec 100644 --- a/docs/reference/asCharacterDS.html +++ b/docs/reference/asCharacterDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asDataMatrixDS.html b/docs/reference/asDataMatrixDS.html index 2b8fb1d3..17007438 100644 --- a/docs/reference/asDataMatrixDS.html +++ b/docs/reference/asDataMatrixDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asFactorDS1.html b/docs/reference/asFactorDS1.html index a5463d70..ab9f62c7 100644 --- a/docs/reference/asFactorDS1.html +++ b/docs/reference/asFactorDS1.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asFactorDS2.html b/docs/reference/asFactorDS2.html index 7e1711d3..009d6ff3 100644 --- a/docs/reference/asFactorDS2.html +++ b/docs/reference/asFactorDS2.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asFactorSimpleDS.html b/docs/reference/asFactorSimpleDS.html index 971a9169..ba2b1e93 100644 --- a/docs/reference/asFactorSimpleDS.html +++ b/docs/reference/asFactorSimpleDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asIntegerDS.html b/docs/reference/asIntegerDS.html index 0de6c670..dd246175 100644 --- a/docs/reference/asIntegerDS.html +++ b/docs/reference/asIntegerDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asListDS.html b/docs/reference/asListDS.html index ab9910cc..834ff96d 100644 --- a/docs/reference/asListDS.html +++ b/docs/reference/asListDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asLogicalDS.html b/docs/reference/asLogicalDS.html index 689e2461..e6255513 100644 --- a/docs/reference/asLogicalDS.html +++ b/docs/reference/asLogicalDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asMatrixDS.html b/docs/reference/asMatrixDS.html index a85c0c7c..06eb9e9f 100644 --- a/docs/reference/asMatrixDS.html +++ b/docs/reference/asMatrixDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/asNumericDS.html b/docs/reference/asNumericDS.html index da79a362..2c014e7c 100644 --- a/docs/reference/asNumericDS.html +++ b/docs/reference/asNumericDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/aucDS.html b/docs/reference/aucDS.html index 4800d9d1..a5cb55e8 100644 --- a/docs/reference/aucDS.html +++ b/docs/reference/aucDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/blackBoxDS.html b/docs/reference/blackBoxDS.html index 5d02e3a9..88d9dd8e 100644 --- a/docs/reference/blackBoxDS.html +++ b/docs/reference/blackBoxDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/blackBoxRanksDS.html b/docs/reference/blackBoxRanksDS.html index 458737b0..79d6e36e 100644 --- a/docs/reference/blackBoxRanksDS.html +++ b/docs/reference/blackBoxRanksDS.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/boxPlotGGDS.html b/docs/reference/boxPlotGGDS.html index a0177c41..d4d1e5b2 100644 --- a/docs/reference/boxPlotGGDS.html +++ b/docs/reference/boxPlotGGDS.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/boxPlotGG_data_TreatmentDS.html b/docs/reference/boxPlotGG_data_TreatmentDS.html index 7acead1e..7810441d 100644 --- a/docs/reference/boxPlotGG_data_TreatmentDS.html +++ b/docs/reference/boxPlotGG_data_TreatmentDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/boxPlotGG_data_Treatment_numericDS.html b/docs/reference/boxPlotGG_data_Treatment_numericDS.html index 1aa7bd26..4dd00885 100644 --- a/docs/reference/boxPlotGG_data_Treatment_numericDS.html +++ b/docs/reference/boxPlotGG_data_Treatment_numericDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/bp_standardsDS.html b/docs/reference/bp_standardsDS.html index b7e661c4..733a4804 100644 --- a/docs/reference/bp_standardsDS.html +++ b/docs/reference/bp_standardsDS.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/cDS.html b/docs/reference/cDS.html index 3cc043db..2ffc1148 100644 --- a/docs/reference/cDS.html +++ b/docs/reference/cDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/cbindDS.html b/docs/reference/cbindDS.html index 3bed8b0a..b8b31245 100644 --- a/docs/reference/cbindDS.html +++ b/docs/reference/cbindDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/changeRefGroupDS.html b/docs/reference/changeRefGroupDS.html index fbf6ba5f..c33cd976 100644 --- a/docs/reference/changeRefGroupDS.html +++ b/docs/reference/changeRefGroupDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/checkNegValueDS.html b/docs/reference/checkNegValueDS.html index e9d00fca..04101e3e 100644 --- a/docs/reference/checkNegValueDS.html +++ b/docs/reference/checkNegValueDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/checkPermissivePrivacyControlLevel.html b/docs/reference/checkPermissivePrivacyControlLevel.html index 6c19c2b0..962d61c6 100644 --- a/docs/reference/checkPermissivePrivacyControlLevel.html +++ b/docs/reference/checkPermissivePrivacyControlLevel.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/classDS.html b/docs/reference/classDS.html index 47976968..107f1659 100644 --- a/docs/reference/classDS.html +++ b/docs/reference/classDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/colnamesDS.html b/docs/reference/colnamesDS.html index 4282c514..10e7d0e9 100644 --- a/docs/reference/colnamesDS.html +++ b/docs/reference/colnamesDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/completeCasesDS.html b/docs/reference/completeCasesDS.html index d84a6ede..3c77cf08 100644 --- a/docs/reference/completeCasesDS.html +++ b/docs/reference/completeCasesDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/corDS.html b/docs/reference/corDS.html index a1972b2c..00770184 100644 --- a/docs/reference/corDS.html +++ b/docs/reference/corDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/corTestDS.html b/docs/reference/corTestDS.html index 40678688..fe0e9a3c 100644 --- a/docs/reference/corTestDS.html +++ b/docs/reference/corTestDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/covDS.html b/docs/reference/covDS.html index b92bbd44..45147a8e 100644 --- a/docs/reference/covDS.html +++ b/docs/reference/covDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/dataFrameDS.html b/docs/reference/dataFrameDS.html index 8791fbbe..ba349247 100644 --- a/docs/reference/dataFrameDS.html +++ b/docs/reference/dataFrameDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/dataFrameFillDS.html b/docs/reference/dataFrameFillDS.html index 6114470e..08a058c5 100644 --- a/docs/reference/dataFrameFillDS.html +++ b/docs/reference/dataFrameFillDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/dataFrameSortDS.html b/docs/reference/dataFrameSortDS.html index d8e8cd13..ba4bc8cf 100644 --- a/docs/reference/dataFrameSortDS.html +++ b/docs/reference/dataFrameSortDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/dataFrameSubsetDS1.html b/docs/reference/dataFrameSubsetDS1.html index 98c1bb41..392231b0 100644 --- a/docs/reference/dataFrameSubsetDS1.html +++ b/docs/reference/dataFrameSubsetDS1.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/dataFrameSubsetDS2.html b/docs/reference/dataFrameSubsetDS2.html index 91a1413e..4f976476 100644 --- a/docs/reference/dataFrameSubsetDS2.html +++ b/docs/reference/dataFrameSubsetDS2.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/densityGridDS.html b/docs/reference/densityGridDS.html index b84830f0..4326881e 100644 --- a/docs/reference/densityGridDS.html +++ b/docs/reference/densityGridDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/dimDS.html b/docs/reference/dimDS.html index 36ae7dbf..978a17ae 100644 --- a/docs/reference/dimDS.html +++ b/docs/reference/dimDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/dmtC2SDS.html b/docs/reference/dmtC2SDS.html index e5bce26b..2dfce50b 100644 --- a/docs/reference/dmtC2SDS.html +++ b/docs/reference/dmtC2SDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/dsBase-package.html b/docs/reference/dsBase-package.html index 36aa5804..7b685ecd 100644 --- a/docs/reference/dsBase-package.html +++ b/docs/reference/dsBase-package.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/elsplineDS.html b/docs/reference/elsplineDS.html index 699ad119..b49663ff 100644 --- a/docs/reference/elsplineDS.html +++ b/docs/reference/elsplineDS.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/extractQuantilesDS1.html b/docs/reference/extractQuantilesDS1.html index 8db3348b..737a022f 100644 --- a/docs/reference/extractQuantilesDS1.html +++ b/docs/reference/extractQuantilesDS1.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/extractQuantilesDS2.html b/docs/reference/extractQuantilesDS2.html index ab0bab81..1bc21891 100644 --- a/docs/reference/extractQuantilesDS2.html +++ b/docs/reference/extractQuantilesDS2.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/gamlssDS.html b/docs/reference/gamlssDS.html index fc7898fe..506f33aa 100644 --- a/docs/reference/gamlssDS.html +++ b/docs/reference/gamlssDS.html @@ -23,7 +23,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/getWGSRDS.html b/docs/reference/getWGSRDS.html index 7ed44dbb..fe30a859 100644 --- a/docs/reference/getWGSRDS.html +++ b/docs/reference/getWGSRDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmDS1.html b/docs/reference/glmDS1.html index ecd2010f..4a752e2d 100644 --- a/docs/reference/glmDS1.html +++ b/docs/reference/glmDS1.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmDS2.html b/docs/reference/glmDS2.html index 03731c72..bf885f71 100644 --- a/docs/reference/glmDS2.html +++ b/docs/reference/glmDS2.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmPredictDS.ag.html b/docs/reference/glmPredictDS.ag.html index 8d31da48..62d1c17f 100644 --- a/docs/reference/glmPredictDS.ag.html +++ b/docs/reference/glmPredictDS.ag.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmPredictDS.as.html b/docs/reference/glmPredictDS.as.html index 62461b0b..c3522e90 100644 --- a/docs/reference/glmPredictDS.as.html +++ b/docs/reference/glmPredictDS.as.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmSLMADS.assign.html b/docs/reference/glmSLMADS.assign.html index 7a63760d..18208778 100644 --- a/docs/reference/glmSLMADS.assign.html +++ b/docs/reference/glmSLMADS.assign.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmSLMADS1.html b/docs/reference/glmSLMADS1.html index a4d8badd..326b4688 100644 --- a/docs/reference/glmSLMADS1.html +++ b/docs/reference/glmSLMADS1.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmSLMADS2.html b/docs/reference/glmSLMADS2.html index b50e51c9..4ce4fc57 100644 --- a/docs/reference/glmSLMADS2.html +++ b/docs/reference/glmSLMADS2.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmSummaryDS.ag.html b/docs/reference/glmSummaryDS.ag.html index e0f2239e..33a50104 100644 --- a/docs/reference/glmSummaryDS.ag.html +++ b/docs/reference/glmSummaryDS.ag.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmSummaryDS.as.html b/docs/reference/glmSummaryDS.as.html index ca99af8e..d062eda8 100644 --- a/docs/reference/glmSummaryDS.as.html +++ b/docs/reference/glmSummaryDS.as.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmerSLMADS.assign.html b/docs/reference/glmerSLMADS.assign.html index 983b845e..984e1ea4 100644 --- a/docs/reference/glmerSLMADS.assign.html +++ b/docs/reference/glmerSLMADS.assign.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/glmerSLMADS2.html b/docs/reference/glmerSLMADS2.html index d1c2c9c2..84c47acb 100644 --- a/docs/reference/glmerSLMADS2.html +++ b/docs/reference/glmerSLMADS2.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/heatmapPlotDS.html b/docs/reference/heatmapPlotDS.html index 7c0acfa9..64dad8a2 100644 --- a/docs/reference/heatmapPlotDS.html +++ b/docs/reference/heatmapPlotDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/hetcorDS.html b/docs/reference/hetcorDS.html index f080e55c..d1ed8860 100644 --- a/docs/reference/hetcorDS.html +++ b/docs/reference/hetcorDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/histogramDS1.html b/docs/reference/histogramDS1.html index 3d90be9e..8b8c65ad 100644 --- a/docs/reference/histogramDS1.html +++ b/docs/reference/histogramDS1.html @@ -23,7 +23,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/histogramDS2.html b/docs/reference/histogramDS2.html index 21f77287..c89e0843 100644 --- a/docs/reference/histogramDS2.html +++ b/docs/reference/histogramDS2.html @@ -21,7 +21,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/igb_standardsDS.html b/docs/reference/igb_standardsDS.html index 56a62b4a..653f7718 100644 --- a/docs/reference/igb_standardsDS.html +++ b/docs/reference/igb_standardsDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/index.html b/docs/reference/index.html index ce6e0a97..a81cedd3 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/isNaDS.html b/docs/reference/isNaDS.html index 60110a6c..c6234365 100644 --- a/docs/reference/isNaDS.html +++ b/docs/reference/isNaDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/isValidDS.html b/docs/reference/isValidDS.html index 453aa84d..9368da66 100644 --- a/docs/reference/isValidDS.html +++ b/docs/reference/isValidDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/kurtosisDS1.html b/docs/reference/kurtosisDS1.html index 6c942ba4..654f0f45 100644 --- a/docs/reference/kurtosisDS1.html +++ b/docs/reference/kurtosisDS1.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/kurtosisDS2.html b/docs/reference/kurtosisDS2.html index a3be6590..f03b7e81 100644 --- a/docs/reference/kurtosisDS2.html +++ b/docs/reference/kurtosisDS2.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/lengthDS.html b/docs/reference/lengthDS.html index 550e337b..445ec690 100644 --- a/docs/reference/lengthDS.html +++ b/docs/reference/lengthDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/levelsDS.html b/docs/reference/levelsDS.html index 93bec9bb..add624c2 100644 --- a/docs/reference/levelsDS.html +++ b/docs/reference/levelsDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/lexisDS1.html b/docs/reference/lexisDS1.html index d59e1378..5142ba62 100644 --- a/docs/reference/lexisDS1.html +++ b/docs/reference/lexisDS1.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/lexisDS2.html b/docs/reference/lexisDS2.html index 9e1e61a3..3ed488c7 100644 --- a/docs/reference/lexisDS2.html +++ b/docs/reference/lexisDS2.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/lexisDS3.html b/docs/reference/lexisDS3.html index 97182f3d..4b128681 100644 --- a/docs/reference/lexisDS3.html +++ b/docs/reference/lexisDS3.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/listDS.html b/docs/reference/listDS.html index 8e1f3729..8d4a7c1a 100644 --- a/docs/reference/listDS.html +++ b/docs/reference/listDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/listDisclosureSettingsDS.html b/docs/reference/listDisclosureSettingsDS.html index 37e561ee..8a357ea2 100644 --- a/docs/reference/listDisclosureSettingsDS.html +++ b/docs/reference/listDisclosureSettingsDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/lmerSLMADS.assign.html b/docs/reference/lmerSLMADS.assign.html index 160ae781..926390d9 100644 --- a/docs/reference/lmerSLMADS.assign.html +++ b/docs/reference/lmerSLMADS.assign.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/lmerSLMADS2.html b/docs/reference/lmerSLMADS2.html index e34c8da9..1b3b1e08 100644 --- a/docs/reference/lmerSLMADS2.html +++ b/docs/reference/lmerSLMADS2.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/lsDS.html b/docs/reference/lsDS.html index 886204b6..e1584a8a 100644 --- a/docs/reference/lsDS.html +++ b/docs/reference/lsDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/lsplineDS.html b/docs/reference/lsplineDS.html index bced6894..8ebc4fdb 100644 --- a/docs/reference/lsplineDS.html +++ b/docs/reference/lsplineDS.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/matrixDS.html b/docs/reference/matrixDS.html index c095cf58..4fd12e4b 100644 --- a/docs/reference/matrixDS.html +++ b/docs/reference/matrixDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/matrixDetDS1.html b/docs/reference/matrixDetDS1.html index 1f6f482a..58e680b9 100644 --- a/docs/reference/matrixDetDS1.html +++ b/docs/reference/matrixDetDS1.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/matrixDetDS2.html b/docs/reference/matrixDetDS2.html index 85e2457e..3d61f58a 100644 --- a/docs/reference/matrixDetDS2.html +++ b/docs/reference/matrixDetDS2.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/matrixDiagDS.html b/docs/reference/matrixDiagDS.html index 8939f343..eb393686 100644 --- a/docs/reference/matrixDiagDS.html +++ b/docs/reference/matrixDiagDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/matrixDimnamesDS.html b/docs/reference/matrixDimnamesDS.html index bb2d6cfb..6c004859 100644 --- a/docs/reference/matrixDimnamesDS.html +++ b/docs/reference/matrixDimnamesDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/matrixInvertDS.html b/docs/reference/matrixInvertDS.html index 31bf8aee..859560e2 100644 --- a/docs/reference/matrixInvertDS.html +++ b/docs/reference/matrixInvertDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/matrixMultDS.html b/docs/reference/matrixMultDS.html index 4a473555..0e2089e0 100644 --- a/docs/reference/matrixMultDS.html +++ b/docs/reference/matrixMultDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/matrixTransposeDS.html b/docs/reference/matrixTransposeDS.html index 2dc8d9a7..eafafa7f 100644 --- a/docs/reference/matrixTransposeDS.html +++ b/docs/reference/matrixTransposeDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/mdPatternDS.html b/docs/reference/mdPatternDS.html index 6ed7c777..c4bba870 100644 --- a/docs/reference/mdPatternDS.html +++ b/docs/reference/mdPatternDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/meanDS.html b/docs/reference/meanDS.html index 7806e4e4..d0fa735d 100644 --- a/docs/reference/meanDS.html +++ b/docs/reference/meanDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/meanSdGpDS.html b/docs/reference/meanSdGpDS.html index da49bc49..10e6d4c6 100644 --- a/docs/reference/meanSdGpDS.html +++ b/docs/reference/meanSdGpDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/mergeDS.html b/docs/reference/mergeDS.html index 3687174e..9f7e8b90 100644 --- a/docs/reference/mergeDS.html +++ b/docs/reference/mergeDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/messageDS.html b/docs/reference/messageDS.html index ec5f3f82..d06fb722 100644 --- a/docs/reference/messageDS.html +++ b/docs/reference/messageDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/metadataDS.html b/docs/reference/metadataDS.html index 83b97211..9809dedf 100644 --- a/docs/reference/metadataDS.html +++ b/docs/reference/metadataDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/miceDS.html b/docs/reference/miceDS.html index e8d36df9..22359341 100644 --- a/docs/reference/miceDS.html +++ b/docs/reference/miceDS.html @@ -23,7 +23,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/minMaxRandDS.html b/docs/reference/minMaxRandDS.html index 573110da..8da03fb2 100644 --- a/docs/reference/minMaxRandDS.html +++ b/docs/reference/minMaxRandDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/namesDS.html b/docs/reference/namesDS.html index c7de77a6..1a3f8cd7 100644 --- a/docs/reference/namesDS.html +++ b/docs/reference/namesDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/nsDS.html b/docs/reference/nsDS.html index 7d74fa0b..5573aecc 100644 --- a/docs/reference/nsDS.html +++ b/docs/reference/nsDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/numNaDS.html b/docs/reference/numNaDS.html index 7599a247..ccb1a8bd 100644 --- a/docs/reference/numNaDS.html +++ b/docs/reference/numNaDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/qlsplineDS.html b/docs/reference/qlsplineDS.html index 5db49162..ae647ca2 100644 --- a/docs/reference/qlsplineDS.html +++ b/docs/reference/qlsplineDS.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/quantileMeanDS.html b/docs/reference/quantileMeanDS.html index 741edf5f..c05c2f77 100644 --- a/docs/reference/quantileMeanDS.html +++ b/docs/reference/quantileMeanDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/rBinomDS.html b/docs/reference/rBinomDS.html index fe27c36a..79ede53b 100644 --- a/docs/reference/rBinomDS.html +++ b/docs/reference/rBinomDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/rNormDS.html b/docs/reference/rNormDS.html index 8f07ac7f..c8b84df5 100644 --- a/docs/reference/rNormDS.html +++ b/docs/reference/rNormDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/rPoisDS.html b/docs/reference/rPoisDS.html index 5eae496f..481f25d2 100644 --- a/docs/reference/rPoisDS.html +++ b/docs/reference/rPoisDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/rUnifDS.html b/docs/reference/rUnifDS.html index 5fdd2c11..bfad7b29 100644 --- a/docs/reference/rUnifDS.html +++ b/docs/reference/rUnifDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/rangeDS.html b/docs/reference/rangeDS.html index e05a1a91..a5b8f7b8 100644 --- a/docs/reference/rangeDS.html +++ b/docs/reference/rangeDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/ranksSecureDS1.html b/docs/reference/ranksSecureDS1.html index 6ed0128f..0c281d79 100644 --- a/docs/reference/ranksSecureDS1.html +++ b/docs/reference/ranksSecureDS1.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/ranksSecureDS2.html b/docs/reference/ranksSecureDS2.html index 904eee81..d194174c 100644 --- a/docs/reference/ranksSecureDS2.html +++ b/docs/reference/ranksSecureDS2.html @@ -24,7 +24,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/ranksSecureDS3.html b/docs/reference/ranksSecureDS3.html index 3d5df277..53137542 100644 --- a/docs/reference/ranksSecureDS3.html +++ b/docs/reference/ranksSecureDS3.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/ranksSecureDS4.html b/docs/reference/ranksSecureDS4.html index ae6ef70a..d82516bd 100644 --- a/docs/reference/ranksSecureDS4.html +++ b/docs/reference/ranksSecureDS4.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/ranksSecureDS5.html b/docs/reference/ranksSecureDS5.html index 1b6788c3..4903f733 100644 --- a/docs/reference/ranksSecureDS5.html +++ b/docs/reference/ranksSecureDS5.html @@ -20,7 +20,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/rbindDS.html b/docs/reference/rbindDS.html index 43b5148a..73c7e777 100644 --- a/docs/reference/rbindDS.html +++ b/docs/reference/rbindDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/reShapeDS.html b/docs/reference/reShapeDS.html index 3efbac3d..a3783c37 100644 --- a/docs/reference/reShapeDS.html +++ b/docs/reference/reShapeDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/recodeLevelsDS.html b/docs/reference/recodeLevelsDS.html index a2d5b275..50c2e55c 100644 --- a/docs/reference/recodeLevelsDS.html +++ b/docs/reference/recodeLevelsDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/recodeValuesDS.html b/docs/reference/recodeValuesDS.html index da0679e3..5adf8999 100644 --- a/docs/reference/recodeValuesDS.html +++ b/docs/reference/recodeValuesDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/repDS.html b/docs/reference/repDS.html index d7a1fb03..5375fbd3 100644 --- a/docs/reference/repDS.html +++ b/docs/reference/repDS.html @@ -21,7 +21,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/replaceNaDS.html b/docs/reference/replaceNaDS.html index 60d2bb00..5e26e986 100644 --- a/docs/reference/replaceNaDS.html +++ b/docs/reference/replaceNaDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/rmDS.html b/docs/reference/rmDS.html index 0e722d5b..240767b7 100644 --- a/docs/reference/rmDS.html +++ b/docs/reference/rmDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/rowColCalcDS.html b/docs/reference/rowColCalcDS.html index d5acc41a..8d4ab25e 100644 --- a/docs/reference/rowColCalcDS.html +++ b/docs/reference/rowColCalcDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/sampleDS.html b/docs/reference/sampleDS.html index 9e63a62b..36b144f5 100644 --- a/docs/reference/sampleDS.html +++ b/docs/reference/sampleDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/scatterPlotDS.html b/docs/reference/scatterPlotDS.html index e7391a39..200b2e38 100644 --- a/docs/reference/scatterPlotDS.html +++ b/docs/reference/scatterPlotDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/seqDS.html b/docs/reference/seqDS.html index 5436c17f..355ba5a9 100644 --- a/docs/reference/seqDS.html +++ b/docs/reference/seqDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/setSeedDS.html b/docs/reference/setSeedDS.html index 3f93d5d5..f5a48255 100644 --- a/docs/reference/setSeedDS.html +++ b/docs/reference/setSeedDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/skewnessDS1.html b/docs/reference/skewnessDS1.html index 7fcff17c..18856c27 100644 --- a/docs/reference/skewnessDS1.html +++ b/docs/reference/skewnessDS1.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/skewnessDS2.html b/docs/reference/skewnessDS2.html index 96ca37f2..044b0cfb 100644 --- a/docs/reference/skewnessDS2.html +++ b/docs/reference/skewnessDS2.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/sqrtDS.html b/docs/reference/sqrtDS.html index 7b232fd0..4bb74aae 100644 --- a/docs/reference/sqrtDS.html +++ b/docs/reference/sqrtDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/subsetByClassDS.html b/docs/reference/subsetByClassDS.html index fc546a46..7d022642 100644 --- a/docs/reference/subsetByClassDS.html +++ b/docs/reference/subsetByClassDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/subsetDS.html b/docs/reference/subsetDS.html index 82f92ba4..7bea1371 100644 --- a/docs/reference/subsetDS.html +++ b/docs/reference/subsetDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/table1DDS.html b/docs/reference/table1DDS.html index 574f90e4..a66f87d4 100644 --- a/docs/reference/table1DDS.html +++ b/docs/reference/table1DDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/table2DDS.html b/docs/reference/table2DDS.html index b120d9ab..97ce4b0b 100644 --- a/docs/reference/table2DDS.html +++ b/docs/reference/table2DDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/tableDS.assign.html b/docs/reference/tableDS.assign.html index 5c5ea7d7..3ce7fadc 100644 --- a/docs/reference/tableDS.assign.html +++ b/docs/reference/tableDS.assign.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/tableDS.html b/docs/reference/tableDS.html index 96b9b031..eec81395 100644 --- a/docs/reference/tableDS.html +++ b/docs/reference/tableDS.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/tableDS2.html b/docs/reference/tableDS2.html index 360bd692..8cbd6534 100644 --- a/docs/reference/tableDS2.html +++ b/docs/reference/tableDS2.html @@ -18,7 +18,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/tapplyDS.assign.html b/docs/reference/tapplyDS.assign.html index 325a9d7c..abb654ab 100644 --- a/docs/reference/tapplyDS.assign.html +++ b/docs/reference/tapplyDS.assign.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/tapplyDS.html b/docs/reference/tapplyDS.html index ba1dec6d..e657b616 100644 --- a/docs/reference/tapplyDS.html +++ b/docs/reference/tapplyDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/testObjExistsDS.html b/docs/reference/testObjExistsDS.html index d8baf8bd..879ac5cb 100644 --- a/docs/reference/testObjExistsDS.html +++ b/docs/reference/testObjExistsDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/unListDS.html b/docs/reference/unListDS.html index c59d955e..71ee1d0f 100644 --- a/docs/reference/unListDS.html +++ b/docs/reference/unListDS.html @@ -19,7 +19,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/uniqueDS.html b/docs/reference/uniqueDS.html index c65fdb87..890f8f44 100644 --- a/docs/reference/uniqueDS.html +++ b/docs/reference/uniqueDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/varDS.html b/docs/reference/varDS.html index f4a05a39..b2951662 100644 --- a/docs/reference/varDS.html +++ b/docs/reference/varDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 diff --git a/docs/reference/vectorDS.html b/docs/reference/vectorDS.html index 36faaa54..5660f127 100644 --- a/docs/reference/vectorDS.html +++ b/docs/reference/vectorDS.html @@ -17,7 +17,7 @@ dsBase - 6.3.5.9000 + 6.3.5 From d79c7d2158265b60204325fb9bc96d59edaac4c3 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 20 Feb 2026 12:15:29 +0000 Subject: [PATCH 04/11] Removed checking of 'opal' --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4a207074..e91b05ad 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -253,7 +253,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' From fbdfa42b431b6148ae8ad7ed0e0158d7a6db7f57 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 10 Apr 2026 11:38:37 +0100 Subject: [PATCH 05/11] Permit perf test duration to be set, seconds, by environment variable 'PERF_DURATION_SEC' --- tests/testthat/test-perf-meanDS.R | 6 +++--- tests/testthat/test-perf-varDS.R | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/testthat/test-perf-meanDS.R b/tests/testthat/test-perf-meanDS.R index 794e61b2..947c46ef 100644 --- a/tests/testthat/test-perf-meanDS.R +++ b/tests/testthat/test-perf-meanDS.R @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -# Copyright (c) 2024 Arjuna Technologies, Newcastle upon Tyne. All rights reserved. +# Copyright (c) 2024-2026 Arjuna Technologies, Newcastle upon Tyne. All rights reserved. # # This program and the accompanying materials # are made available under the terms of the GNU Public License v3.0. @@ -30,7 +30,7 @@ test_that("numeric meanDS - performance", { input <- c(0.0, 1.0, 2.0, 3.0, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time @@ -65,7 +65,7 @@ test_that("numeric meanDS, with NA - performance", { input <- c(0.0, NA, 2.0, NA, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time diff --git a/tests/testthat/test-perf-varDS.R b/tests/testthat/test-perf-varDS.R index d468c5da..1e81e646 100644 --- a/tests/testthat/test-perf-varDS.R +++ b/tests/testthat/test-perf-varDS.R @@ -30,7 +30,7 @@ test_that("numeric varDS - performance", { input <- c(0.0, 1.0, 2.0, 3.0, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time @@ -65,7 +65,7 @@ test_that("numeric varDS, with NA - performance", { input <- c(0.0, NA, 2.0, NA, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time From 1f12d53330c09ea6107fa8b1fecfe4b0ac530af2 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 10 Apr 2026 11:54:51 +0100 Subject: [PATCH 06/11] Permit perf test duration to be set, seconds, by environment variable 'PERF_DURATION_SEC' --- tests/testthat/test-perf-meanDS.R | 4 ++-- tests/testthat/test-perf-varDS.R | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/testthat/test-perf-meanDS.R b/tests/testthat/test-perf-meanDS.R index 794e61b2..5004a995 100644 --- a/tests/testthat/test-perf-meanDS.R +++ b/tests/testthat/test-perf-meanDS.R @@ -30,7 +30,7 @@ test_that("numeric meanDS - performance", { input <- c(0.0, 1.0, 2.0, 3.0, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time @@ -65,7 +65,7 @@ test_that("numeric meanDS, with NA - performance", { input <- c(0.0, NA, 2.0, NA, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time diff --git a/tests/testthat/test-perf-varDS.R b/tests/testthat/test-perf-varDS.R index d468c5da..1e81e646 100644 --- a/tests/testthat/test-perf-varDS.R +++ b/tests/testthat/test-perf-varDS.R @@ -30,7 +30,7 @@ test_that("numeric varDS - performance", { input <- c(0.0, 1.0, 2.0, 3.0, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time @@ -65,7 +65,7 @@ test_that("numeric varDS, with NA - performance", { input <- c(0.0, NA, 2.0, NA, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time From e75797beb347b98c37e966937c24e0c8f2a4bf1b Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Mon, 13 Apr 2026 12:35:23 +0100 Subject: [PATCH 07/11] Refactor perf test duration obtaining --- tests/testthat/perf_tests/perf_rate.R | 5 +++++ tests/testthat/test-perf-meanDS.R | 4 ++-- tests/testthat/test-perf-varDS.R | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/testthat/perf_tests/perf_rate.R b/tests/testthat/perf_tests/perf_rate.R index 90905e12..b8930889 100644 --- a/tests/testthat/perf_tests/perf_rate.R +++ b/tests/testthat/perf_tests/perf_rate.R @@ -45,6 +45,11 @@ perf.reference.save <- function(perf.ref.name, rate, tolerance.lower, tolerance. .perf.reference <<- .perf.reference } +# Obtain performance test duration from PERF_DURATION_SEC environment variable, otherwise default.duration argument, otherwise "30". +perf.testduration <- function(default.duration = 30) { + base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = base::as.character(default.duration))) +} + perf.reference.rate <- function(perf.ref.name) { if (is.null(.perf.reference)) .load.pref() diff --git a/tests/testthat/test-perf-meanDS.R b/tests/testthat/test-perf-meanDS.R index 5004a995..e0915068 100644 --- a/tests/testthat/test-perf-meanDS.R +++ b/tests/testthat/test-perf-meanDS.R @@ -30,7 +30,7 @@ test_that("numeric meanDS - performance", { input <- c(0.0, 1.0, 2.0, 3.0, 4.0) - .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds + .durationSec <- perf.testduration(30) .count <- 0 .start.time <- Sys.time() .current.time <- .start.time @@ -65,7 +65,7 @@ test_that("numeric meanDS, with NA - performance", { input <- c(0.0, NA, 2.0, NA, 4.0) - .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds + .durationSec <- perf.testduration(30) .count <- 0 .start.time <- Sys.time() .current.time <- .start.time diff --git a/tests/testthat/test-perf-varDS.R b/tests/testthat/test-perf-varDS.R index 1e81e646..5d9cec4a 100644 --- a/tests/testthat/test-perf-varDS.R +++ b/tests/testthat/test-perf-varDS.R @@ -30,7 +30,7 @@ test_that("numeric varDS - performance", { input <- c(0.0, 1.0, 2.0, 3.0, 4.0) - .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds + .durationSec <- perf.testduration(30) .count <- 0 .start.time <- Sys.time() .current.time <- .start.time @@ -65,7 +65,7 @@ test_that("numeric varDS, with NA - performance", { input <- c(0.0, NA, 2.0, NA, 4.0) - .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds + .durationSec <- perf.testduration(30) .count <- 0 .start.time <- Sys.time() .current.time <- .start.time From dd6133f4ad4583339d8756d93ee408383d0729ac Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 21 Apr 2026 22:08:05 +0100 Subject: [PATCH 08/11] Added libuv1-dev to deployment --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e91b05ad..7eb3e47e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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)" From d40d899d8076b750b2c6c680092811d25ac6a23f Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Wed, 22 Apr 2026 13:10:54 +0100 Subject: [PATCH 09/11] Add 'libuv1' --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a59ed99d..ec6d40e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 From b01c92370763400703729bf9ec15f172f10635e5 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Wed, 22 Apr 2026 14:44:08 +0100 Subject: [PATCH 10/11] Updated version to 'v6.3.6-dev' --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index fabf52d8..18c70ac7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -5,7 +5,7 @@ Description: Base 'DataSHIELD' functions for the server side. 'DataSHIELD' is a been designed to only share non disclosive summary statistics, with built in automated output checking based on statistical disclosure control. With data sites setting the threshold values for the automated output checks. For more details, see 'citation("dsBase")'. -Version: 6.3.5 +Version: 6.3.6.9000 Authors@R: c(person(given = "Paul", family = "Burton", role = c("aut"), From a63b4bb9de05cf6f1743f66671335ce5cb5e2e12 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Mon, 27 Apr 2026 15:56:58 +0100 Subject: [PATCH 11/11] Fixes needed to changes in 6.3.6-dev --- docs/404.html | 4 - docs/LICENSE.html | 4 - docs/authors.html | 24 ----- docs/index.html | 8 -- docs/reference/BooleDS.html | 8 -- docs/reference/absDS.html | 8 -- docs/reference/asCharacterDS.html | 8 -- docs/reference/asDataMatrixDS.html | 28 +----- docs/reference/asFactorDS1.html | 8 -- docs/reference/asFactorDS2.html | 8 -- docs/reference/asFactorSimpleDS.html | 8 -- docs/reference/asIntegerDS.html | 8 -- docs/reference/asListDS.html | 8 -- docs/reference/asLogicalDS.html | 8 -- docs/reference/asMatrixDS.html | 8 -- docs/reference/asNumericDS.html | 8 -- docs/reference/aucDS.html | 8 -- docs/reference/blackBoxDS.html | 8 -- docs/reference/blackBoxRanksDS.html | 8 -- docs/reference/boxPlotGGDS.html | 8 -- .../reference/boxPlotGG_data_TreatmentDS.html | 8 -- .../boxPlotGG_data_Treatment_numericDS.html | 8 -- docs/reference/bp_standardsDS.html | 8 -- docs/reference/cDS.html | 8 -- docs/reference/cbindDS.html | 8 -- docs/reference/changeRefGroupDS.html | 8 -- docs/reference/checkNegValueDS.html | 8 -- .../checkPermissivePrivacyControlLevel.html | 16 ---- docs/reference/classDS.html | 8 -- docs/reference/colnamesDS.html | 8 -- docs/reference/completeCasesDS.html | 8 -- docs/reference/corDS.html | 8 -- docs/reference/corTestDS.html | 8 -- docs/reference/covDS.html | 8 -- docs/reference/dataFrameDS.html | 8 -- docs/reference/dataFrameFillDS.html | 8 -- docs/reference/dataFrameSortDS.html | 8 -- docs/reference/dataFrameSubsetDS1.html | 8 -- docs/reference/dataFrameSubsetDS2.html | 8 -- docs/reference/densityGridDS.html | 8 -- docs/reference/dimDS.html | 8 -- docs/reference/dmtC2SDS.html | 8 -- docs/reference/dsBase-package.html | 95 ------------------- docs/reference/elsplineDS.html | 8 -- docs/reference/extract.html | 4 - docs/reference/extractQuantilesDS1.html | 8 -- docs/reference/extractQuantilesDS2.html | 8 -- docs/reference/gamlssDS.html | 8 -- docs/reference/getWGSRDS.html | 8 -- docs/reference/glmDS1.html | 16 ---- docs/reference/glmDS2.html | 16 ---- docs/reference/glmPredictDS.ag.html | 8 -- docs/reference/glmPredictDS.as.html | 8 -- docs/reference/glmSLMADS.assign.html | 8 -- docs/reference/glmSLMADS1.html | 8 -- docs/reference/glmSLMADS2.html | 8 -- docs/reference/glmSummaryDS.ag.html | 8 -- docs/reference/glmSummaryDS.as.html | 8 -- docs/reference/glmerSLMADS.assign.html | 8 -- docs/reference/glmerSLMADS2.html | 8 -- docs/reference/heatmapPlotDS.html | 8 -- docs/reference/hetcorDS.html | 8 -- docs/reference/histogramDS1.html | 8 -- docs/reference/histogramDS2.html | 8 -- docs/reference/igb_standardsDS.html | 8 -- docs/reference/index.html | 8 -- docs/reference/isNaDS.html | 8 -- docs/reference/isValidDS.html | 8 -- docs/reference/kurtosisDS1.html | 8 -- docs/reference/kurtosisDS2.html | 8 -- docs/reference/lengthDS.html | 8 -- docs/reference/levelsDS.html | 8 -- docs/reference/lexisDS1.html | 16 ---- docs/reference/lexisDS2.html | 8 -- docs/reference/lexisDS3.html | 8 -- docs/reference/listDS.html | 8 -- docs/reference/listDisclosureSettingsDS.html | 8 -- docs/reference/lmerSLMADS.assign.html | 8 -- docs/reference/lmerSLMADS2.html | 8 -- docs/reference/lsDS.html | 8 -- docs/reference/lsplineDS.html | 8 -- docs/reference/matrixDS.html | 8 -- docs/reference/matrixDetDS1.html | 8 -- docs/reference/matrixDetDS2.html | 8 -- docs/reference/matrixDiagDS.html | 8 -- docs/reference/matrixDimnamesDS.html | 8 -- docs/reference/matrixInvertDS.html | 8 -- docs/reference/matrixMultDS.html | 8 -- docs/reference/matrixTransposeDS.html | 8 -- docs/reference/mdPatternDS.html | 8 -- docs/reference/meanDS.html | 8 -- docs/reference/meanSdGpDS.html | 16 ---- docs/reference/mergeDS.html | 8 -- docs/reference/messageDS.html | 8 -- docs/reference/metadataDS.html | 8 -- docs/reference/miceDS.html | 8 -- docs/reference/minMaxRandDS.html | 8 -- docs/reference/namesDS.html | 8 -- docs/reference/nsDS.html | 8 -- docs/reference/numNaDS.html | 8 -- docs/reference/qlsplineDS.html | 8 -- docs/reference/quantileMeanDS.html | 8 -- docs/reference/rBinomDS.html | 8 -- docs/reference/rNormDS.html | 8 -- docs/reference/rPoisDS.html | 8 -- docs/reference/rUnifDS.html | 8 -- docs/reference/rangeDS.html | 8 -- docs/reference/ranksSecureDS1.html | 8 -- docs/reference/ranksSecureDS2.html | 8 -- docs/reference/ranksSecureDS3.html | 8 -- docs/reference/ranksSecureDS4.html | 8 -- docs/reference/ranksSecureDS5.html | 8 -- docs/reference/rbindDS.html | 8 -- docs/reference/reShapeDS.html | 8 -- docs/reference/recodeLevelsDS.html | 8 -- docs/reference/recodeValuesDS.html | 8 -- docs/reference/repDS.html | 8 -- docs/reference/replaceNaDS.html | 8 -- docs/reference/rmDS.html | 8 -- docs/reference/rowColCalcDS.html | 8 -- docs/reference/sampleDS.html | 8 -- docs/reference/scatterPlotDS.html | 8 -- docs/reference/seqDS.html | 8 -- docs/reference/setFilterDS.html | 4 - docs/reference/setSeedDS.html | 8 -- docs/reference/skewnessDS1.html | 8 -- docs/reference/skewnessDS2.html | 8 -- docs/reference/sqrtDS.html | 8 -- docs/reference/subsetByClassDS.html | 8 -- docs/reference/subsetDS.html | 8 -- docs/reference/table1DDS.html | 8 -- docs/reference/table2DDS.html | 8 -- docs/reference/tableDS.assign.html | 8 -- docs/reference/tableDS.html | 8 -- docs/reference/tableDS2.html | 8 -- docs/reference/tapplyDS.assign.html | 8 -- docs/reference/tapplyDS.html | 8 -- docs/reference/testObjExistsDS.html | 16 ---- docs/reference/unListDS.html | 8 -- docs/reference/uniqueDS.html | 8 -- docs/reference/varDS.html | 8 -- docs/reference/vectorDS.html | 8 -- 142 files changed, 2 insertions(+), 1289 deletions(-) delete mode 100644 docs/reference/dsBase-package.html diff --git a/docs/404.html b/docs/404.html index 3822dc48..0e809232 100644 --- a/docs/404.html +++ b/docs/404.html @@ -32,11 +32,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/LICENSE.html b/docs/LICENSE.html index 6a2e3da7..f1cadf0d 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/authors.html b/docs/authors.html index 3dd44aa5..3526a873 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev @@ -110,28 +102,12 @@

Citation

Burton P, Wilson R, Butters O, Ryser-Welch P, Westerberg A, Abarrategui L, Villegas-Diaz R, Avraam D, Marcon Y, Bishop T, Gaye A, Escribà-Montagut X, Wheater S (????). dsBase: 'DataSHIELD' Server Side Base Functions. -<<<<<<< HEAD -<<<<<<< HEAD R package version 6.4.0.9000. -======= -R package version 6.3.5.9000. ->>>>>>> origin/v6.3.5-dev -======= -R package version 6.3.5. ->>>>>>> origin/v6.3.6-dev 

@Manual{,
   title = {dsBase: 'DataSHIELD' Server Side Base Functions},
   author = {Paul Burton and Rebecca Wilson and Olly Butters and Patricia Ryser-Welch and Alex Westerberg and Leire Abarrategui and Roberto Villegas-Diaz and Demetris Avraam and Yannick Marcon and Tom Bishop and Amadou Gaye and Xavier Escribà-Montagut and Stuart Wheater},
-<<<<<<< HEAD
-<<<<<<< HEAD
   note = {R package version 6.4.0.9000},
-=======
-  note = {R package version 6.3.5.9000},
->>>>>>> origin/v6.3.5-dev
-=======
-  note = {R package version 6.3.5},
->>>>>>> origin/v6.3.6-dev
 }

Gaye A, Marcon Y, Isaeva J, LaFlamme P, Turner A, Jones E, Minion J, Boyd A, Newby C, Nuotio M, Wilson R, Butters O, Murtagh B, Demir I, Doiron D, Giepmans L, Wallace S, Budin-Ljøsne I, Schmidt C, Boffetta P, Boniol M, Bota M, Carter K, deKlerk N, Dibben C, Francis R, Hiekkalinna T, Hveem K, Kvaløy K, Millar S, Perry I, Peters A, Phillips C, Popham F, Raab G, Reischl E, Sheehan N, Waldenberger M, Perola M, van den Heuvel E, Macleod J, Knoppers B, Stolk R, Fortier I, Harris J, Woffenbuttel B, Murtagh M, Ferretti V, Burton P (2014). “DataSHIELD: taking the analysis to the data, not the data to the analysis.” diff --git a/docs/index.html b/docs/index.html index be74b154..1d86586f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,15 +33,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/BooleDS.html b/docs/reference/BooleDS.html index 6d47719e..6c120d76 100644 --- a/docs/reference/BooleDS.html +++ b/docs/reference/BooleDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/absDS.html b/docs/reference/absDS.html index 5ac81779..9ffeb870 100644 --- a/docs/reference/absDS.html +++ b/docs/reference/absDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/asCharacterDS.html b/docs/reference/asCharacterDS.html index 3de57e07..24b7fe91 100644 --- a/docs/reference/asCharacterDS.html +++ b/docs/reference/asCharacterDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/asDataMatrixDS.html b/docs/reference/asDataMatrixDS.html index e31aec4b..eae50c28 100644 --- a/docs/reference/asDataMatrixDS.html +++ b/docs/reference/asDataMatrixDS.html @@ -1,9 +1,6 @@ -<<<<<<< HEAD -asDataFrameDS a serverside assign function called by ds.asDataFrame — asDataMatrixDS • dsBaseasDataMatrixDS a serverside assign function called by ds.asDataMatrix — asDataMatrixDS • dsBase< +head>asDataFrameDS a serverside assign function called by ds.asDataFrame — asDataMatrixDS • dsBasecheckPermissivePrivacyControlLevel — checkPermissivePrivacyControlLevel • dsBasecheckPermissivePrivacyControlLevel — checkPermissivePrivacyControlLevel • dsBase @@ -21,19 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0-9000 -======= - 6.3.4 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/classDS.html b/docs/reference/classDS.html index 1d11ea1c..55390ce4 100644 --- a/docs/reference/classDS.html +++ b/docs/reference/classDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/colnamesDS.html b/docs/reference/colnamesDS.html index 98a60bd4..c43ba5cb 100644 --- a/docs/reference/colnamesDS.html +++ b/docs/reference/colnamesDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/completeCasesDS.html b/docs/reference/completeCasesDS.html index 06f6be63..a53e10fa 100644 --- a/docs/reference/completeCasesDS.html +++ b/docs/reference/completeCasesDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/corDS.html b/docs/reference/corDS.html index 71c52972..07cbf5e9 100644 --- a/docs/reference/corDS.html +++ b/docs/reference/corDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/corTestDS.html b/docs/reference/corTestDS.html index 1c663687..5b58cb0a 100644 --- a/docs/reference/corTestDS.html +++ b/docs/reference/corTestDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/covDS.html b/docs/reference/covDS.html index 5a6e1524..f4901bf1 100644 --- a/docs/reference/covDS.html +++ b/docs/reference/covDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/dataFrameDS.html b/docs/reference/dataFrameDS.html index 40fb30ff..eba9e1a6 100644 --- a/docs/reference/dataFrameDS.html +++ b/docs/reference/dataFrameDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/dataFrameFillDS.html b/docs/reference/dataFrameFillDS.html index e0819f2d..3f9e3a32 100644 --- a/docs/reference/dataFrameFillDS.html +++ b/docs/reference/dataFrameFillDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/dataFrameSortDS.html b/docs/reference/dataFrameSortDS.html index 9dcff41c..01144cd3 100644 --- a/docs/reference/dataFrameSortDS.html +++ b/docs/reference/dataFrameSortDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/dataFrameSubsetDS1.html b/docs/reference/dataFrameSubsetDS1.html index ff2568ee..4585d60c 100644 --- a/docs/reference/dataFrameSubsetDS1.html +++ b/docs/reference/dataFrameSubsetDS1.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/dataFrameSubsetDS2.html b/docs/reference/dataFrameSubsetDS2.html index 65811f4a..929ae49c 100644 --- a/docs/reference/dataFrameSubsetDS2.html +++ b/docs/reference/dataFrameSubsetDS2.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/densityGridDS.html b/docs/reference/densityGridDS.html index 32e25b89..6fba6784 100644 --- a/docs/reference/densityGridDS.html +++ b/docs/reference/densityGridDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/dimDS.html b/docs/reference/dimDS.html index 2a3fe21b..b9b9f448 100644 --- a/docs/reference/dimDS.html +++ b/docs/reference/dimDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/dmtC2SDS.html b/docs/reference/dmtC2SDS.html index 30d0afef..787d6d90 100644 --- a/docs/reference/dmtC2SDS.html +++ b/docs/reference/dmtC2SDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/dsBase-package.html b/docs/reference/dsBase-package.html deleted file mode 100644 index eddf9b80..00000000 --- a/docs/reference/dsBase-package.html +++ /dev/null @@ -1,95 +0,0 @@ - -dsBase: 'DataSHIELD' Server Side Base Functions — dsBase-package • dsBase - - -

-
- - - -
-
-
-

dsBase: 'DataSHIELD' Server Side Base Functions

- - -
- -
-

Base 'DataSHIELD' functions for the server side. 'DataSHIELD' is a software package which allows you to do non-disclosive federated analysis on sensitive data. 'DataSHIELD' analytic functions have been designed to only share non disclosive summary statistics, with built in automated output checking based on statistical disclosure control. With data sites setting the threshold values for the automated output checks. For more details, see 'citation("dsBase")'.

-
- - -
-

Author

-

Maintainer: Stuart Wheater stuart.wheater@arjuna.com (ORCID)

-

Authors:

- -
- -
- - -
-

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

-
- -
-

Site built with pkgdown 2.2.0.

-
- -
- - - - - - - - diff --git a/docs/reference/elsplineDS.html b/docs/reference/elsplineDS.html index 76f012c4..58b697b2 100644 --- a/docs/reference/elsplineDS.html +++ b/docs/reference/elsplineDS.html @@ -20,15 +20,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/extract.html b/docs/reference/extract.html index 4d91f651..497cd06a 100644 --- a/docs/reference/extract.html +++ b/docs/reference/extract.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.3 ->>>>>>> origin/v6.3.3-dev diff --git a/docs/reference/extractQuantilesDS1.html b/docs/reference/extractQuantilesDS1.html index 9c0009b6..39592b32 100644 --- a/docs/reference/extractQuantilesDS1.html +++ b/docs/reference/extractQuantilesDS1.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/extractQuantilesDS2.html b/docs/reference/extractQuantilesDS2.html index d5f15b83..c923aade 100644 --- a/docs/reference/extractQuantilesDS2.html +++ b/docs/reference/extractQuantilesDS2.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/gamlssDS.html b/docs/reference/gamlssDS.html index f01682b8..4154cb98 100644 --- a/docs/reference/gamlssDS.html +++ b/docs/reference/gamlssDS.html @@ -23,15 +23,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/getWGSRDS.html b/docs/reference/getWGSRDS.html index d567e76a..f508fd7e 100644 --- a/docs/reference/getWGSRDS.html +++ b/docs/reference/getWGSRDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmDS1.html b/docs/reference/glmDS1.html index 0de95e58..fc6eaad7 100644 --- a/docs/reference/glmDS1.html +++ b/docs/reference/glmDS1.html @@ -1,9 +1,5 @@ -<<<<<<< HEAD glmDS1 called by ds.glm — glmDS1 • dsBaseglmDS1 called by ds.glm — glmDS1 • dsBase @@ -21,19 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0-9000 -======= - 6.3.4 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmDS2.html b/docs/reference/glmDS2.html index 9aae609b..8ebfd011 100644 --- a/docs/reference/glmDS2.html +++ b/docs/reference/glmDS2.html @@ -1,9 +1,5 @@ -<<<<<<< HEAD glmDS2 called by ds.glm — glmDS2 • dsBaseglmDS2 called by ds.glm — glmDS2 • dsBase @@ -21,19 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0-9000 -======= - 6.3.4 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmPredictDS.ag.html b/docs/reference/glmPredictDS.ag.html index afbaaf4b..0b109c1a 100644 --- a/docs/reference/glmPredictDS.ag.html +++ b/docs/reference/glmPredictDS.ag.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmPredictDS.as.html b/docs/reference/glmPredictDS.as.html index 2b886a68..002579d5 100644 --- a/docs/reference/glmPredictDS.as.html +++ b/docs/reference/glmPredictDS.as.html @@ -20,15 +20,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmSLMADS.assign.html b/docs/reference/glmSLMADS.assign.html index f6fbc71a..2b74522b 100644 --- a/docs/reference/glmSLMADS.assign.html +++ b/docs/reference/glmSLMADS.assign.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmSLMADS1.html b/docs/reference/glmSLMADS1.html index 837db029..dc0ff1c1 100644 --- a/docs/reference/glmSLMADS1.html +++ b/docs/reference/glmSLMADS1.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmSLMADS2.html b/docs/reference/glmSLMADS2.html index ba4fc19b..da588dbc 100644 --- a/docs/reference/glmSLMADS2.html +++ b/docs/reference/glmSLMADS2.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmSummaryDS.ag.html b/docs/reference/glmSummaryDS.ag.html index 94cbe710..62722c50 100644 --- a/docs/reference/glmSummaryDS.ag.html +++ b/docs/reference/glmSummaryDS.ag.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmSummaryDS.as.html b/docs/reference/glmSummaryDS.as.html index b60dcb0e..a5b7e116 100644 --- a/docs/reference/glmSummaryDS.as.html +++ b/docs/reference/glmSummaryDS.as.html @@ -20,15 +20,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmerSLMADS.assign.html b/docs/reference/glmerSLMADS.assign.html index eb82ecd5..27b81174 100644 --- a/docs/reference/glmerSLMADS.assign.html +++ b/docs/reference/glmerSLMADS.assign.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/glmerSLMADS2.html b/docs/reference/glmerSLMADS2.html index f2606920..c1ae0c27 100644 --- a/docs/reference/glmerSLMADS2.html +++ b/docs/reference/glmerSLMADS2.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/heatmapPlotDS.html b/docs/reference/heatmapPlotDS.html index 57eed484..269a92a2 100644 --- a/docs/reference/heatmapPlotDS.html +++ b/docs/reference/heatmapPlotDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/hetcorDS.html b/docs/reference/hetcorDS.html index 48fce479..80051a85 100644 --- a/docs/reference/hetcorDS.html +++ b/docs/reference/hetcorDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/histogramDS1.html b/docs/reference/histogramDS1.html index 22cc47a5..3d71cf6f 100644 --- a/docs/reference/histogramDS1.html +++ b/docs/reference/histogramDS1.html @@ -23,15 +23,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/histogramDS2.html b/docs/reference/histogramDS2.html index 4fdba0a5..679967c7 100644 --- a/docs/reference/histogramDS2.html +++ b/docs/reference/histogramDS2.html @@ -21,15 +21,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/igb_standardsDS.html b/docs/reference/igb_standardsDS.html index ba9a6dd3..7cafd7ed 100644 --- a/docs/reference/igb_standardsDS.html +++ b/docs/reference/igb_standardsDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/index.html b/docs/reference/index.html index 6561137c..efa3d316 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/isNaDS.html b/docs/reference/isNaDS.html index a87e2670..5c9fcca6 100644 --- a/docs/reference/isNaDS.html +++ b/docs/reference/isNaDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/isValidDS.html b/docs/reference/isValidDS.html index 2e37a8f8..2c695d33 100644 --- a/docs/reference/isValidDS.html +++ b/docs/reference/isValidDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/kurtosisDS1.html b/docs/reference/kurtosisDS1.html index b614e26e..6867e232 100644 --- a/docs/reference/kurtosisDS1.html +++ b/docs/reference/kurtosisDS1.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/kurtosisDS2.html b/docs/reference/kurtosisDS2.html index 1f5f379b..29d4c56d 100644 --- a/docs/reference/kurtosisDS2.html +++ b/docs/reference/kurtosisDS2.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/lengthDS.html b/docs/reference/lengthDS.html index 15dc27a5..b0cc498d 100644 --- a/docs/reference/lengthDS.html +++ b/docs/reference/lengthDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/levelsDS.html b/docs/reference/levelsDS.html index bdae5c80..3bda828c 100644 --- a/docs/reference/levelsDS.html +++ b/docs/reference/levelsDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/lexisDS1.html b/docs/reference/lexisDS1.html index 4ef1d775..7117f909 100644 --- a/docs/reference/lexisDS1.html +++ b/docs/reference/lexisDS1.html @@ -1,9 +1,5 @@ -<<<<<<< HEAD lexisDS1 — lexisDS1 • dsBaselexisDS1 — lexisDS1 • dsBase @@ -21,19 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0-9000 -======= - 6.3.4 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/lexisDS2.html b/docs/reference/lexisDS2.html index 5c2179cd..16d5547b 100644 --- a/docs/reference/lexisDS2.html +++ b/docs/reference/lexisDS2.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/lexisDS3.html b/docs/reference/lexisDS3.html index d4da3c39..b5b5c79d 100644 --- a/docs/reference/lexisDS3.html +++ b/docs/reference/lexisDS3.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/listDS.html b/docs/reference/listDS.html index bd2cdbc7..d1e47dd2 100644 --- a/docs/reference/listDS.html +++ b/docs/reference/listDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/listDisclosureSettingsDS.html b/docs/reference/listDisclosureSettingsDS.html index 0ad4e0d1..231c3372 100644 --- a/docs/reference/listDisclosureSettingsDS.html +++ b/docs/reference/listDisclosureSettingsDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/lmerSLMADS.assign.html b/docs/reference/lmerSLMADS.assign.html index a8569af4..cf28e3e1 100644 --- a/docs/reference/lmerSLMADS.assign.html +++ b/docs/reference/lmerSLMADS.assign.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/lmerSLMADS2.html b/docs/reference/lmerSLMADS2.html index 4ebb4566..9a324996 100644 --- a/docs/reference/lmerSLMADS2.html +++ b/docs/reference/lmerSLMADS2.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/lsDS.html b/docs/reference/lsDS.html index 9ef284d2..faed01e5 100644 --- a/docs/reference/lsDS.html +++ b/docs/reference/lsDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/lsplineDS.html b/docs/reference/lsplineDS.html index a54cf2e9..1f54ed5a 100644 --- a/docs/reference/lsplineDS.html +++ b/docs/reference/lsplineDS.html @@ -20,15 +20,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/matrixDS.html b/docs/reference/matrixDS.html index edcdcc3f..5dbae7c2 100644 --- a/docs/reference/matrixDS.html +++ b/docs/reference/matrixDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/matrixDetDS1.html b/docs/reference/matrixDetDS1.html index 570a9c2d..4528346e 100644 --- a/docs/reference/matrixDetDS1.html +++ b/docs/reference/matrixDetDS1.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/matrixDetDS2.html b/docs/reference/matrixDetDS2.html index 0883ecdb..728ef556 100644 --- a/docs/reference/matrixDetDS2.html +++ b/docs/reference/matrixDetDS2.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/matrixDiagDS.html b/docs/reference/matrixDiagDS.html index 7975f107..53382d75 100644 --- a/docs/reference/matrixDiagDS.html +++ b/docs/reference/matrixDiagDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/matrixDimnamesDS.html b/docs/reference/matrixDimnamesDS.html index 074a8e6c..276f377f 100644 --- a/docs/reference/matrixDimnamesDS.html +++ b/docs/reference/matrixDimnamesDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/matrixInvertDS.html b/docs/reference/matrixInvertDS.html index 9c52b823..79d56475 100644 --- a/docs/reference/matrixInvertDS.html +++ b/docs/reference/matrixInvertDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/matrixMultDS.html b/docs/reference/matrixMultDS.html index 542c7037..854dd216 100644 --- a/docs/reference/matrixMultDS.html +++ b/docs/reference/matrixMultDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/matrixTransposeDS.html b/docs/reference/matrixTransposeDS.html index 44bf60dc..d9f0cbfb 100644 --- a/docs/reference/matrixTransposeDS.html +++ b/docs/reference/matrixTransposeDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/mdPatternDS.html b/docs/reference/mdPatternDS.html index ebd75dfb..f9187ff5 100644 --- a/docs/reference/mdPatternDS.html +++ b/docs/reference/mdPatternDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/meanDS.html b/docs/reference/meanDS.html index a1013d92..3a75d1c6 100644 --- a/docs/reference/meanDS.html +++ b/docs/reference/meanDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/meanSdGpDS.html b/docs/reference/meanSdGpDS.html index c2ffbbdc..9fa9ee0e 100644 --- a/docs/reference/meanSdGpDS.html +++ b/docs/reference/meanSdGpDS.html @@ -1,9 +1,5 @@ -<<<<<<< HEAD MeanSdGpDS — meanSdGpDS • dsBaseMeanSdGpDS — meanSdGpDS • dsBase @@ -21,19 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0-9000 -======= - 6.3.4 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/mergeDS.html b/docs/reference/mergeDS.html index d7adf832..b7ddf47b 100644 --- a/docs/reference/mergeDS.html +++ b/docs/reference/mergeDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/messageDS.html b/docs/reference/messageDS.html index 2d890c67..7f4a190e 100644 --- a/docs/reference/messageDS.html +++ b/docs/reference/messageDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/metadataDS.html b/docs/reference/metadataDS.html index c38162b4..79913002 100644 --- a/docs/reference/metadataDS.html +++ b/docs/reference/metadataDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/miceDS.html b/docs/reference/miceDS.html index ff6bb49a..fff5eafb 100644 --- a/docs/reference/miceDS.html +++ b/docs/reference/miceDS.html @@ -23,15 +23,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/minMaxRandDS.html b/docs/reference/minMaxRandDS.html index 12ce60c0..3e42e684 100644 --- a/docs/reference/minMaxRandDS.html +++ b/docs/reference/minMaxRandDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/namesDS.html b/docs/reference/namesDS.html index 9a492f49..3e39c9ae 100644 --- a/docs/reference/namesDS.html +++ b/docs/reference/namesDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/nsDS.html b/docs/reference/nsDS.html index 9e46228d..2dec2458 100644 --- a/docs/reference/nsDS.html +++ b/docs/reference/nsDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/numNaDS.html b/docs/reference/numNaDS.html index 688dc983..9cc7a6c2 100644 --- a/docs/reference/numNaDS.html +++ b/docs/reference/numNaDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/qlsplineDS.html b/docs/reference/qlsplineDS.html index db80e264..7150fcef 100644 --- a/docs/reference/qlsplineDS.html +++ b/docs/reference/qlsplineDS.html @@ -20,15 +20,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/quantileMeanDS.html b/docs/reference/quantileMeanDS.html index 507a6044..a227b129 100644 --- a/docs/reference/quantileMeanDS.html +++ b/docs/reference/quantileMeanDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/rBinomDS.html b/docs/reference/rBinomDS.html index 29a47285..385d3a2c 100644 --- a/docs/reference/rBinomDS.html +++ b/docs/reference/rBinomDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/rNormDS.html b/docs/reference/rNormDS.html index 90f07b98..84f8fb67 100644 --- a/docs/reference/rNormDS.html +++ b/docs/reference/rNormDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/rPoisDS.html b/docs/reference/rPoisDS.html index f0064eb7..f644a9e7 100644 --- a/docs/reference/rPoisDS.html +++ b/docs/reference/rPoisDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/rUnifDS.html b/docs/reference/rUnifDS.html index 44743370..2b98c15a 100644 --- a/docs/reference/rUnifDS.html +++ b/docs/reference/rUnifDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/rangeDS.html b/docs/reference/rangeDS.html index 2b778f03..87ac7d3f 100644 --- a/docs/reference/rangeDS.html +++ b/docs/reference/rangeDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/ranksSecureDS1.html b/docs/reference/ranksSecureDS1.html index 22747659..b858383b 100644 --- a/docs/reference/ranksSecureDS1.html +++ b/docs/reference/ranksSecureDS1.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/ranksSecureDS2.html b/docs/reference/ranksSecureDS2.html index 0132245e..c0d88cc7 100644 --- a/docs/reference/ranksSecureDS2.html +++ b/docs/reference/ranksSecureDS2.html @@ -24,15 +24,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/ranksSecureDS3.html b/docs/reference/ranksSecureDS3.html index 73a15c81..acbb0e4a 100644 --- a/docs/reference/ranksSecureDS3.html +++ b/docs/reference/ranksSecureDS3.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/ranksSecureDS4.html b/docs/reference/ranksSecureDS4.html index ba537cab..e5acc10b 100644 --- a/docs/reference/ranksSecureDS4.html +++ b/docs/reference/ranksSecureDS4.html @@ -20,15 +20,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/ranksSecureDS5.html b/docs/reference/ranksSecureDS5.html index 33540a89..44a9158f 100644 --- a/docs/reference/ranksSecureDS5.html +++ b/docs/reference/ranksSecureDS5.html @@ -20,15 +20,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/rbindDS.html b/docs/reference/rbindDS.html index 6be63d6b..64939f08 100644 --- a/docs/reference/rbindDS.html +++ b/docs/reference/rbindDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/reShapeDS.html b/docs/reference/reShapeDS.html index c80dfd12..bb1201e2 100644 --- a/docs/reference/reShapeDS.html +++ b/docs/reference/reShapeDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/recodeLevelsDS.html b/docs/reference/recodeLevelsDS.html index 2c626c4d..c34a5520 100644 --- a/docs/reference/recodeLevelsDS.html +++ b/docs/reference/recodeLevelsDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/recodeValuesDS.html b/docs/reference/recodeValuesDS.html index cdf7a230..ddf2d26d 100644 --- a/docs/reference/recodeValuesDS.html +++ b/docs/reference/recodeValuesDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/repDS.html b/docs/reference/repDS.html index 5586cc0b..503c7fb8 100644 --- a/docs/reference/repDS.html +++ b/docs/reference/repDS.html @@ -21,15 +21,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/replaceNaDS.html b/docs/reference/replaceNaDS.html index 9f8650aa..cf56b323 100644 --- a/docs/reference/replaceNaDS.html +++ b/docs/reference/replaceNaDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/rmDS.html b/docs/reference/rmDS.html index e0fa54c2..c1cc4c39 100644 --- a/docs/reference/rmDS.html +++ b/docs/reference/rmDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/rowColCalcDS.html b/docs/reference/rowColCalcDS.html index f9728cd9..5a40ca49 100644 --- a/docs/reference/rowColCalcDS.html +++ b/docs/reference/rowColCalcDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/sampleDS.html b/docs/reference/sampleDS.html index 61c828bc..7a482911 100644 --- a/docs/reference/sampleDS.html +++ b/docs/reference/sampleDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/scatterPlotDS.html b/docs/reference/scatterPlotDS.html index 7812a370..858452d4 100644 --- a/docs/reference/scatterPlotDS.html +++ b/docs/reference/scatterPlotDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/seqDS.html b/docs/reference/seqDS.html index 106c1adf..ca737326 100644 --- a/docs/reference/seqDS.html +++ b/docs/reference/seqDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/setFilterDS.html b/docs/reference/setFilterDS.html index 252a4d6f..1b071236 100644 --- a/docs/reference/setFilterDS.html +++ b/docs/reference/setFilterDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.3 ->>>>>>> origin/v6.3.3-dev diff --git a/docs/reference/setSeedDS.html b/docs/reference/setSeedDS.html index 8b6cb5fd..f7fbf96f 100644 --- a/docs/reference/setSeedDS.html +++ b/docs/reference/setSeedDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/skewnessDS1.html b/docs/reference/skewnessDS1.html index 7c38af5b..d75060b2 100644 --- a/docs/reference/skewnessDS1.html +++ b/docs/reference/skewnessDS1.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/skewnessDS2.html b/docs/reference/skewnessDS2.html index 51510f9e..3a1f7b67 100644 --- a/docs/reference/skewnessDS2.html +++ b/docs/reference/skewnessDS2.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/sqrtDS.html b/docs/reference/sqrtDS.html index 31292a75..575ce4f7 100644 --- a/docs/reference/sqrtDS.html +++ b/docs/reference/sqrtDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/subsetByClassDS.html b/docs/reference/subsetByClassDS.html index dfdf5de2..c9f7a973 100644 --- a/docs/reference/subsetByClassDS.html +++ b/docs/reference/subsetByClassDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/subsetDS.html b/docs/reference/subsetDS.html index 92eb59ca..6ebe3cc2 100644 --- a/docs/reference/subsetDS.html +++ b/docs/reference/subsetDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/table1DDS.html b/docs/reference/table1DDS.html index ae066f4b..ff21fd5d 100644 --- a/docs/reference/table1DDS.html +++ b/docs/reference/table1DDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/table2DDS.html b/docs/reference/table2DDS.html index 26b39a60..b3009107 100644 --- a/docs/reference/table2DDS.html +++ b/docs/reference/table2DDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/tableDS.assign.html b/docs/reference/tableDS.assign.html index c88c019c..7df8b1d3 100644 --- a/docs/reference/tableDS.assign.html +++ b/docs/reference/tableDS.assign.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/tableDS.html b/docs/reference/tableDS.html index 756de3e3..d0fb2550 100644 --- a/docs/reference/tableDS.html +++ b/docs/reference/tableDS.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/tableDS2.html b/docs/reference/tableDS2.html index dd9a1151..713d4f3a 100644 --- a/docs/reference/tableDS2.html +++ b/docs/reference/tableDS2.html @@ -18,15 +18,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/tapplyDS.assign.html b/docs/reference/tapplyDS.assign.html index c8a65d9f..cdb99f48 100644 --- a/docs/reference/tapplyDS.assign.html +++ b/docs/reference/tapplyDS.assign.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/tapplyDS.html b/docs/reference/tapplyDS.html index 4a2940fe..c9a9b945 100644 --- a/docs/reference/tapplyDS.html +++ b/docs/reference/tapplyDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/testObjExistsDS.html b/docs/reference/testObjExistsDS.html index 8759c1fb..ed693254 100644 --- a/docs/reference/testObjExistsDS.html +++ b/docs/reference/testObjExistsDS.html @@ -1,9 +1,5 @@ -<<<<<<< HEAD testObjExistsDS — testObjExistsDS • dsBasetestObjExistsDS — testObjExistsDS • dsBase @@ -21,19 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0-9000 -======= - 6.3.4 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/unListDS.html b/docs/reference/unListDS.html index 1a00a286..f613a8d0 100644 --- a/docs/reference/unListDS.html +++ b/docs/reference/unListDS.html @@ -19,15 +19,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/uniqueDS.html b/docs/reference/uniqueDS.html index fc6b86b8..65899058 100644 --- a/docs/reference/uniqueDS.html +++ b/docs/reference/uniqueDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/varDS.html b/docs/reference/varDS.html index 232b2e3d..86e0bac6 100644 --- a/docs/reference/varDS.html +++ b/docs/reference/varDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev diff --git a/docs/reference/vectorDS.html b/docs/reference/vectorDS.html index 475af49c..6fbba822 100644 --- a/docs/reference/vectorDS.html +++ b/docs/reference/vectorDS.html @@ -17,15 +17,7 @@ dsBase -<<<<<<< HEAD -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev -======= - 6.3.5 ->>>>>>> origin/v6.3.6-dev