|
 |
b955629 |
From 2125f0860aba9fbf7dd55ba113dd6d188511a141 Mon Sep 17 00:00:00 2001
|
|
|
5312951 |
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
|
5312951 |
Date: Tue, 24 Jul 2018 19:53:52 -0400
|
|
|
5312951 |
Subject: [PATCH 5/5] Update test results for Rawhide.
|
|
|
5312951 |
|
|
|
5312951 |
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
|
5312951 |
---
|
|
|
5312951 |
tests/testthat/test_layout.fr.R | 2 --
|
|
|
ada9683 |
tests/testthat/test_layout.kk.R | 4 +---
|
|
|
5312951 |
tests/testthat/test_sir.R | 6 +-----
|
|
|
ada9683 |
3 files changed, 2 insertions(+), 10 deletions(-)
|
|
|
5312951 |
|
|
|
5312951 |
diff --git a/tests/testthat/test_layout.fr.R b/tests/testthat/test_layout.fr.R
|
|
|
5312951 |
index f6a7ad2..71b9be4 100644
|
|
|
5312951 |
--- a/tests/testthat/test_layout.fr.R
|
|
|
5312951 |
+++ b/tests/testthat/test_layout.fr.R
|
|
|
5312951 |
@@ -16,8 +16,6 @@ test_that("", {
|
|
|
5312951 |
l <- layout_with_fr(g, niter=500, dim=3, start.temp=20)
|
|
|
5312951 |
if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) {
|
|
|
5312951 |
expect_that(sum(l), equals(1079, tolerance = 1))
|
|
|
5312951 |
- } else if (Sys.info()["machine"] == "i686") {
|
|
|
5312951 |
- expect_that(sum(l), equals(1004.00737470853))
|
|
|
5312951 |
} else {
|
|
|
5312951 |
expect_that(sum(l), equals(941.472420651506))
|
|
|
5312951 |
}
|
|
|
5312951 |
diff --git a/tests/testthat/test_layout.kk.R b/tests/testthat/test_layout.kk.R
|
|
|
ada9683 |
index aa189f7..9e10c2c 100644
|
|
|
5312951 |
--- a/tests/testthat/test_layout.kk.R
|
|
|
5312951 |
+++ b/tests/testthat/test_layout.kk.R
|
|
|
ada9683 |
@@ -9,7 +9,7 @@ test_that("Kamada-Kawai layout generator works", {
|
|
|
ada9683 |
if (Sys.info()["sysname"] == "Darwin") {
|
|
|
ada9683 |
expect_that(sum(l), equals(-1.13071769106689))
|
|
|
ada9683 |
} else if (Sys.info()["sysname"] == "Linux") {
|
|
|
ada9683 |
- if (Sys.info()["machine"] %in% c("aarch64", "i686", "ppc64", "ppc64le", "s390x")) {
|
|
|
ada9683 |
+ if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) {
|
|
|
ada9683 |
expect_that(sum(l), equals(0.914809637353466))
|
|
|
ada9683 |
} else {
|
|
|
ada9683 |
expect_that(sum(l), equals(-6.77278645472984e-05))
|
|
|
5312951 |
@@ -32,8 +32,6 @@ test_that("Kamada-Kawai layout generator works", {
|
|
|
5312951 |
} else if (Sys.info()["sysname"] == "Linux") {
|
|
|
5312951 |
if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) {
|
|
|
5312951 |
expect_that(sum(l), equals(1.54, tolerance = 0.01))
|
|
|
5312951 |
- } else if (Sys.info()["machine"] == "i686") {
|
|
|
5312951 |
- expect_that(sum(l), equals(0.0631144692360025))
|
|
|
5312951 |
} else {
|
|
|
5312951 |
expect_that(sum(l), equals(-1.83036635516248))
|
|
|
5312951 |
}
|
|
|
5312951 |
diff --git a/tests/testthat/test_sir.R b/tests/testthat/test_sir.R
|
|
|
b955629 |
index a64d873..2059270 100644
|
|
|
5312951 |
--- a/tests/testthat/test_sir.R
|
|
|
5312951 |
+++ b/tests/testthat/test_sir.R
|
|
|
5312951 |
@@ -11,10 +11,6 @@ test_that("SIR works", {
|
|
|
5312951 |
|
|
|
5312951 |
g <- sample_gnm(50, 50)
|
|
|
5312951 |
res <- sir(g, beta=5, gamma=1, no.sim=10)
|
|
|
b955629 |
- if (Sys.info()["machine"] == "i686") {
|
|
|
5312951 |
- expect_that(digest(res), equals("b73a8ad03b832b3543f2f03d07330398"))
|
|
|
5312951 |
- } else {
|
|
|
5312951 |
- expect_that(digest(res), equals("bc42d0cbe0bb3321e83979c0432f9cea"))
|
|
|
5312951 |
- }
|
|
|
5312951 |
+ expect_that(digest(res), equals("bc42d0cbe0bb3321e83979c0432f9cea"))
|
|
|
5312951 |
})
|
|
|
5312951 |
|
|
|
5312951 |
--
|
|
|
5312951 |
2.17.1
|
|
|
5312951 |
|