Skip to content

Commit

Permalink
Updates for MRO 3.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich Calaway committed May 23, 2017
1 parent c70caf0 commit fdef074
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions additionalPackages/RevoIOQ/DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Expand All @@ -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
Binary file added additionalPackages/RevoIOQ/inst/unitTestData/regression_3.4.0.Rdata
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.version.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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"),""))
{
Expand Down
18 changes: 9 additions & 9 deletions additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runitRegression.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(){
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions additionalPackages/RevoUtils/DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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
4 changes: 2 additions & 2 deletions additionalPackages/RevoUtils/R/readNews.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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="")
Expand Down

0 comments on commit fdef074

Please sign in to comment.