Updates for MRO 3.4.0

microsoft · May 23, 2017 · fdef074 · fdef074
1 parent c70caf0
commit fdef074
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/additionalPackages/RevoIOQ/DESCRIPTION b/additionalPackages/RevoIOQ/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: RevoIOQ
-Version: 8.0.6
-Date: 2016-11-23
+Version: 8.0.7
+Date: 2017-05-23
 Title: Microsoft R Services Test Suite
 Author: Microsoft Corporation
 Maintainer: Microsoft Corporation <mrspack@microsoft.com>
@@ -9,4 +9,4 @@ Suggests: RevoUtils
 Description: Test suite for Microsoft R Services.
 License: GPL-2
 Copyright: Copyright 2016 Microsoft Corporation
-BuildID: 8.0.6.0478
+BuildID: 8.0.7.0504
diff --git a/additionalPackages/RevoIOQ/inst/unitTestData/regression_3.4.0.Rdata b/additionalPackages/RevoIOQ/inst/unitTestData/regression_3.4.0.Rdata
diff --git a/additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.version.R b/additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.version.R
@@ -18,15 +18,15 @@ if (!identical(system.file(package="RevoScaleR") , "")) {
     "test.revor.RevoUtilsMath.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtilsMath", ver = "10.0.0"))
 }
 if (!identical(system.file(package="foreach") , "")) {
-    "test.revoparallelr.foreach.version" <- function() checkTrue("checkPackageVersion"(pkg = "foreach", ver = "1.4.3"))
+    "test.revoparallelr.foreach.version" <- function() checkTrue("checkPackageVersion"(pkg = "foreach", ver = "1.4.4"))
     "test.revoparallelr.iterators.version" <- function() checkTrue("checkPackageVersion"(pkg = "iterators", ver = "1.0.8"))
 }
 if (!identical(system.file(package="RevoMods"), ""))
 {
     "test.revor.RevoIOQ.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoIOQ", ver = revover))
     "test.revor.RUnit.version" <- function() checkTrue("checkPackageVersion"(pkg = "RUnit", ver = "0.4.26"))
     "test.revoparallelr.doParallel.version" <- function() checkTrue("checkPackageVersion"(pkg = "doParallel", ver = "1.0.10"))
-    "test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "10.0.3"))
+    "test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "10.0.4"))
     "test.revor.RevoMods.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoMods", ver = "11.0.0"))
 } else
 {
@@ -36,7 +36,7 @@ if (!identical(system.file(package="RevoMods"), ""))
     } 
 	if (!identical(system.file(package="RevoUtils"),""))
 	{
-		"test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "10.0.3"))
+		"test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "10.0.4"))
 	}
     if (!identical(system.file(package="doParallel"),""))
 	{

diff --git a/additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runitRegression.R b/additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runitRegression.R
@@ -6,19 +6,21 @@
 if (compareVersion(paste(R.version$major, R.version$minor, sep=".") ,"2.9.0") < 0) {
     load(system.file(file.path("unitTestData", "regression.Rdata"), package="RevoIOQ"))
 } else if (compareVersion(paste(R.version$major, R.version$minor, sep="."), "2.10.1") < 0) {
-      load(system.file(file.path("unitTestData", "regression_2.9.0.Rdata"), package="RevoIOQ"))
+    load(system.file(file.path("unitTestData", "regression_2.9.0.Rdata"), package="RevoIOQ"))
 } else if (compareVersion(paste(R.version$major, R.version$minor, sep="."), "2.14.1") < 0) {
-      load(system.file(file.path("unitTestData", "regression_2.10.1.Rdata"), package="RevoIOQ"))
+    load(system.file(file.path("unitTestData", "regression_2.10.1.Rdata"), package="RevoIOQ"))
 } else if (compareVersion(paste(R.version$major, R.version$minor, sep="."), "2.15.2") < 0) {
-      load(system.file(file.path("unitTestData", "regression_2.14.1.Rdata"), package="RevoIOQ"))
+    load(system.file(file.path("unitTestData", "regression_2.14.1.Rdata"), package="RevoIOQ"))
 } else if (compareVersion(paste(R.version$major, R.version$minor, sep="."), "3.0.1") < 0) {
-      load(system.file(file.path("unitTestData", "regression_2.15.2.Rdata"), package="RevoIOQ"))
+    load(system.file(file.path("unitTestData", "regression_2.15.2.Rdata"), package="RevoIOQ"))
 } else if (compareVersion(paste(R.version$major, R.version$minor, sep="."), "3.0.3") < 0) {
-      load(system.file(file.path("unitTestData", "regression_3.0.1.Rdata"), package="RevoIOQ"))
+    load(system.file(file.path("unitTestData", "regression_3.0.1.Rdata"), package="RevoIOQ"))
 } else if (compareVersion(paste(R.version$major, R.version$minor, sep="."), "3.1.0") < 0) {
-      load(system.file(file.path("unitTestData", "regression_3.0.3.Rdata"), package="RevoIOQ"))
+    load(system.file(file.path("unitTestData", "regression_3.0.3.Rdata"), package="RevoIOQ"))
+} else if (compareVersion(paste(R.version$major, R.version$minor, sep="."), "3.4.0") < 0){
+	load(system.file(file.path("unitTestData", "regression_3.1.0.Rdata"), package="RevoIOQ"))
 } else {
-	  load(system.file(file.path("unitTestData", "regression_3.1.0.Rdata"), package="RevoIOQ"))
+	load(system.file(file.path("unitTestData", "regression_3.4.0.Rdata"), package="RevoIOQ"))
 }
 
 test.lm<- function(){
@@ -180,15 +182,13 @@ test.nls <- function(){
 
 	## Venables and Ripley (2002) Modern Applied Statistics wtih S, Fourth Edition
 	## Non-linear Regression using plinear algorithm (Section 8.3)
-
 	A <- model.matrix(~ Strip - 1, data = muscle)
 	rats.nls1.test <-  nls(log(Length) ~ cbind(A, rho^Conc), data=muscle, start = c(rho=0.1), algorithm = "plinear")
 	B <- coef(rats.nls1.test)
 	st <- list(alpha = B[2:22], beta=B[23], rho = B[1])
 	rats.nls2.test <- nls(log(Length) ~ alpha[Strip] + beta*rho^Conc, data=muscle, start=st)
 
 
-
 	checkEquals(wtloss.ss.test, wtloss.ss, tolerance=10e-06)
 	checkEquals(summary(wtloss.fm.test), summary(wtloss.fm),tolerance =10e-06)
 	checkEquals(vcov(wtloss.gr.test), vcov(wtloss.gr), tolerance=10e-06)

diff --git a/additionalPackages/RevoUtils/DESCRIPTION b/additionalPackages/RevoUtils/DESCRIPTION
@@ -1,12 +1,12 @@
 Package: RevoUtils
-Version: 10.0.3
-Date: 2017-03-15
-RevoBuildID: 9.1.0.4444
+Version: 10.0.4
+Date: 2017-05-23
+RevoBuildID: 10.0.4.0093
 Title: Microsoft R Utility Package
 Author: Microsoft Corporation
 Maintainer: Microsoft Corporation <mrspack@microsoft.com>
 SystemRequirements: R (>= 3.0.0)
 Description: Utility functions for Microsoft R
 License: GPL-2
 Copyright: Copyright 2017 Microsoft Corporation
-MRANDate: 2017-03-15
+MRANDate: 2017-05-01
diff --git a/additionalPackages/RevoUtils/R/readNews.R b/additionalPackages/RevoUtils/R/readNews.R
@@ -7,7 +7,7 @@ readNews <- function(package)
             rNewsUrl <- paste("http://mran.revolutionanalytics.com/news/", rver, sep="")
             browseURL(rNewsUrl)
         } else {
-            if ((.Platform$OS.type=="windows" && !RevoMods:::isXP()) ||
+            if ((.Platform$OS.type=="windows" ) ||
             !(!is.na(grep("linux", R.version["os"])[1]) && 
                     !capabilities()["X11"])){	
                 RShowDoc("NEWS")
@@ -24,7 +24,7 @@ readNews <- function(package)
 	if (!file.exists(system.file("NEWS.Rd", package=package))) {
 		stop("No NEWS.Rd or NEWS file in specified package")
 	} else {
-	    if ((.Platform$OS.type=="windows" && !RevoMods:::isXP()) ||
+	    if ((.Platform$OS.type=="windows" ) ||
 		!(!is.na(grep("linux", R.version["os"])[1]) && 
                 !capabilities()["X11"])){	
 			HTMLout <- paste(tempfile(), ".html", sep="")