From ccd54663243aed9869862190dbf69401e36a8108 Mon Sep 17 00:00:00 2001 From: ranke Date: Tue, 23 May 2006 08:25:16 +0000 Subject: Only print 5 digits in the tests, since I get some differences in the last digits between amd64 and i386. git-svn-id: http://kriemhild.uft.uni-bremen.de/svn/drfit@81 d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc --- tests/IM1xIPC81.R | 2 +- tests/IM1xIPC81.Rout.save | 40 ++++++++++++++--------------- tests/IM1xVibrio.R | 2 +- tests/IM1xVibrio.Rout.save | 40 ++++++++++++++--------------- tests/XY.R | 2 +- tests/XY.Rout.save | 26 +++++++++---------- tests/antifoul.R | 2 +- tests/antifoul.Rout.save | 16 ++++++------ tests/pyrithione.R | 2 +- tests/pyrithione.Rout.save | 64 +++++++++++++++++++++++----------------------- 10 files changed, 98 insertions(+), 98 deletions(-) diff --git a/tests/IM1xIPC81.R b/tests/IM1xIPC81.R index 075c84d..52b5653 100644 --- a/tests/IM1xIPC81.R +++ b/tests/IM1xIPC81.R @@ -1,4 +1,4 @@ library(drfit) data(IM1xIPC81) rIM1xIPC81 <- drfit(IM1xIPC81,linlogit=TRUE) -rIM1xIPC81 +print(rIM1xIPC81,digits=5) diff --git a/tests/IM1xIPC81.Rout.save b/tests/IM1xIPC81.Rout.save index 5d9bcc7..41d4e48 100644 --- a/tests/IM1xIPC81.Rout.save +++ b/tests/IM1xIPC81.Rout.save @@ -1,6 +1,6 @@ R : Copyright 2006, The R Foundation for Statistical Computing -Version 2.3.0 (2006-04-24) +Version 2.3.1 beta (2006-05-18 r38119) ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -58,23 +58,23 @@ NaNs produced in: pnorm(q, mean, sd, lower.tail, log.p) IM1-10 BF4: Fitting data... Waiting for profiling to be done... -> rIM1xIPC81 - Substance ndl n lld lhd mtype logED50 2.5% -1 IM13 BF4 9 81 0.59176003 3.000000 inactive NA NA -2 IM14 BF4 20 216 -0.01030017 3.176091 no fit NA NA -3 IM15 BF4 9 135 0.59176003 3.000000 inactive NA NA -4 IM16 BF4 9 108 0.59176003 3.000000 inactive NA NA -5 IM17 BF4 9 81 0.59176003 3.000000 linlogit 2.5785719 2.5057219 -6 IM18 BF4 9 135 0.59176003 3.000000 linlogit 1.6806040 1.6229756 -7 IM19 BF4 9 81 0.59176003 3.000000 linlogit 1.6496121 1.5984793 -8 IM1-10 BF4 11 162 -0.01030017 3.000000 linlogit 0.7696961 0.6870081 - 97.5% unit sigma a b c -1 NA 然 NA NA NA NA -2 NA 然 NA NA NA NA -3 NA 然 NA NA NA NA -4 NA 然 NA NA NA NA -5 2.6617385 然 0.2375857 2.5785719 2.300216 0.01468034 -6 1.7418917 然 0.2324871 1.6806040 2.237338 0.05719295 -7 1.7031463 然 0.1452716 1.6496121 1.976976 0.10956088 -8 0.8544213 然 0.2987708 0.7696961 1.936253 0.45808611 +> print(rIM1xIPC81,digits=5) + Substance ndl n lld lhd mtype logED50 2.5% 97.5% unit +1 IM13 BF4 9 81 0.591760 3.0000 inactive NA NA NA 然 +2 IM14 BF4 20 216 -0.010300 3.1761 no fit NA NA NA 然 +3 IM15 BF4 9 135 0.591760 3.0000 inactive NA NA NA 然 +4 IM16 BF4 9 108 0.591760 3.0000 inactive NA NA NA 然 +5 IM17 BF4 9 81 0.591760 3.0000 linlogit 2.5786 2.50572 2.66174 然 +6 IM18 BF4 9 135 0.591760 3.0000 linlogit 1.6806 1.62298 1.74189 然 +7 IM19 BF4 9 81 0.591760 3.0000 linlogit 1.6496 1.59848 1.70315 然 +8 IM1-10 BF4 11 162 -0.010300 3.0000 linlogit 0.7697 0.68701 0.85442 然 + sigma a b c +1 NA NA NA NA +2 NA NA NA NA +3 NA NA NA NA +4 NA NA NA NA +5 0.23759 2.5786 2.3002 0.014680 +6 0.23249 1.6806 2.2373 0.057193 +7 0.14527 1.6496 1.9770 0.109561 +8 0.29877 0.7697 1.9363 0.458086 > diff --git a/tests/IM1xVibrio.R b/tests/IM1xVibrio.R index ed1a698..8fb23d2 100644 --- a/tests/IM1xVibrio.R +++ b/tests/IM1xVibrio.R @@ -1,4 +1,4 @@ library(drfit) data(IM1xVibrio) rIM1xVibrio <- drfit(IM1xVibrio) -rIM1xVibrio +print(rIM1xVibrio,digits=5) diff --git a/tests/IM1xVibrio.Rout.save b/tests/IM1xVibrio.Rout.save index bebdcea..e3df372 100644 --- a/tests/IM1xVibrio.Rout.save +++ b/tests/IM1xVibrio.Rout.save @@ -1,6 +1,6 @@ R : Copyright 2006, The R Foundation for Statistical Computing -Version 2.3.0 (2006-04-24) +Version 2.3.1 beta (2006-05-18 r38119) ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -44,23 +44,23 @@ Waiting for profiling to be done... IM1-10 BF4: Fitting data... Waiting for profiling to be done... -> rIM1xVibrio - Substance ndl n lld lhd mtype logED50 2.5% 97.5% -1 IM13 BF4 13 22 -5.30103 4.69897 probit 3.9399128 3.8636215 4.0160099 -2 IM14 BF4 12 57 -4.30103 4.69897 probit 3.5442110 3.5030166 3.5855474 -3 IM15 BF4 7 20 -0.30103 4.69897 probit 3.1398488 3.1135935 3.1662394 -4 IM16 BF4 13 30 -4.30103 4.69897 probit 3.1804247 3.1435815 3.2176152 -5 IM17 BF4 10 20 -1.30103 4.69897 probit 2.4317301 2.3680656 2.4951179 -6 IM18 BF4 10 17 -2.30103 2.69897 probit 1.4015187 1.3146736 1.4880647 -7 IM19 BF4 13 22 -5.30103 2.69897 probit 0.7157942 0.6703743 0.7592458 -8 IM1-10 BF4 11 20 -6.30103 2.69897 probit -0.1790307 -0.2569430 -0.1037183 - unit sigma a b -1 然 0.06302893 3.9399128 0.5763074 -2 然 0.05905375 3.5442110 0.6561300 -3 然 0.02695476 3.1398488 0.5526675 -4 然 0.04514079 3.1804247 0.4881559 -5 然 0.04773317 2.4317301 0.6386547 -6 然 0.05611347 1.4015187 0.8008513 -7 然 0.02956284 0.7157942 0.6969275 -8 然 0.04098662 -0.1790307 0.8019351 +> print(rIM1xVibrio,digits=5) + Substance ndl n lld lhd mtype logED50 2.5% 97.5% unit +1 IM13 BF4 13 22 -5.30103 4.6990 probit 3.93991 3.86362 4.01601 然 +2 IM14 BF4 12 57 -4.30103 4.6990 probit 3.54421 3.50302 3.58555 然 +3 IM15 BF4 7 20 -0.30103 4.6990 probit 3.13985 3.11359 3.16624 然 +4 IM16 BF4 13 30 -4.30103 4.6990 probit 3.18042 3.14358 3.21762 然 +5 IM17 BF4 10 20 -1.30103 4.6990 probit 2.43173 2.36807 2.49512 然 +6 IM18 BF4 10 17 -2.30103 2.6990 probit 1.40152 1.31467 1.48806 然 +7 IM19 BF4 13 22 -5.30103 2.6990 probit 0.71579 0.67037 0.75925 然 +8 IM1-10 BF4 11 20 -6.30103 2.6990 probit -0.17903 -0.25694 -0.10372 然 + sigma a b +1 0.063029 3.93991 0.57631 +2 0.059054 3.54421 0.65613 +3 0.026955 3.13985 0.55267 +4 0.045141 3.18042 0.48816 +5 0.047733 2.43173 0.63865 +6 0.056113 1.40152 0.80085 +7 0.029563 0.71579 0.69693 +8 0.040987 -0.17903 0.80194 > diff --git a/tests/XY.R b/tests/XY.R index 7e3ecb2..228f736 100644 --- a/tests/XY.R +++ b/tests/XY.R @@ -1,4 +1,4 @@ library(drfit) data(XY) rXY <- drfit(XY,logit=TRUE,weibull=TRUE,chooseone=FALSE) -rXY +print(rXY,digits=5) diff --git a/tests/XY.Rout.save b/tests/XY.Rout.save index 9da519f..749e699 100644 --- a/tests/XY.Rout.save +++ b/tests/XY.Rout.save @@ -28,17 +28,17 @@ Waiting for profiling to be done... Waiting for profiling to be done... Substance Y: Fitting data... -> rXY - Substance ndl n lld lhd mtype logED50 2.5% 97.5% unit -1 Control 1 6 -Inf -Inf inactive NA NA NA mg/L -2 Substance X 4 12 1 3 probit 2.161905 2.105861 2.214359 mg/L -3 Substance X 4 12 1 3 logit 2.160948 2.112152 2.207912 mg/L -4 Substance X 4 12 1 3 weibull 2.174365 NA NA mg/L -5 Substance Y 4 12 1 3 active NA NA NA mg/L - sigma a b -1 NA NA NA -2 0.04131746 2.161905 0.5061306 -3 0.03758732 2.160948 0.2991424 -4 0.05723870 3.009640 2.0362368 -5 NA NA NA +> print(rXY,digits=5) + Substance ndl n lld lhd mtype logED50 2.5% 97.5% unit sigma +1 Control 1 6 -Inf -Inf inactive NA NA NA mg/L NA +2 Substance X 4 12 1 3 probit 2.1619 2.1059 2.2144 mg/L 0.041317 +3 Substance X 4 12 1 3 logit 2.1609 2.1122 2.2079 mg/L 0.037587 +4 Substance X 4 12 1 3 weibull 2.1744 NA NA mg/L 0.057239 +5 Substance Y 4 12 1 3 active NA NA NA mg/L NA + a b +1 NA NA +2 2.1619 0.50613 +3 2.1609 0.29914 +4 3.0096 2.03624 +5 NA NA > diff --git a/tests/antifoul.R b/tests/antifoul.R index f9c1a9d..ae63391 100644 --- a/tests/antifoul.R +++ b/tests/antifoul.R @@ -1,4 +1,4 @@ library(drfit) data(antifoul) rantifoul <- drfit(antifoul) -rantifoul +print(rantifoul,digits=5) diff --git a/tests/antifoul.Rout.save b/tests/antifoul.Rout.save index 9967240..8f1d276 100644 --- a/tests/antifoul.Rout.save +++ b/tests/antifoul.Rout.save @@ -1,6 +1,6 @@ R : Copyright 2006, The R Foundation for Statistical Computing -Version 2.3.0 (2006-04-24) +Version 2.3.1 beta (2006-05-18 r38119) ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -26,11 +26,11 @@ Waiting for profiling to be done... Zn Pyrithion: Fitting data... Waiting for profiling to be done... -> rantifoul - Substance ndl n lld lhd mtype logED50 2.5% -1 TBT 38 135 -2.709271 2.39794 probit -0.1643560 -0.2650411 -2 Zn Pyrithion 27 81 -2.107210 2.00000 probit -0.3979222 -0.5078291 - 97.5% unit sigma a b -1 -0.05648615 然 0.1928611 -0.1643560 0.6763882 -2 -0.29156056 然 0.2286560 -0.3979222 0.4169632 +> print(rantifoul,digits=5) + Substance ndl n lld lhd mtype logED50 2.5% 97.5% unit +1 TBT 38 135 -2.7093 2.3979 probit -0.16436 -0.26504 -0.056486 然 +2 Zn Pyrithion 27 81 -2.1072 2.0000 probit -0.39792 -0.50783 -0.291561 然 + sigma a b +1 0.19286 -0.16436 0.67639 +2 0.22866 -0.39792 0.41696 > diff --git a/tests/pyrithione.R b/tests/pyrithione.R index f05988d..d78492d 100644 --- a/tests/pyrithione.R +++ b/tests/pyrithione.R @@ -1,4 +1,4 @@ library(drfit) data(pyrithione) rpyr <- drfit(pyrithione,linlogit=TRUE,linlogitWrong=c("MSPT","MSPHI")) -rpyr +print(rpyr,digits=5) diff --git a/tests/pyrithione.Rout.save b/tests/pyrithione.Rout.save index 553f91b..b9b142d 100644 --- a/tests/pyrithione.Rout.save +++ b/tests/pyrithione.Rout.save @@ -1,6 +1,6 @@ R : Copyright 2006, The R Foundation for Statistical Computing -Version 2.3.0 (2006-04-24) +Version 2.3.1 beta (2006-05-18 r38119) ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -67,35 +67,35 @@ TBT: Fitting data... Waiting for profiling to be done... NaJ: Fitting data... -> rpyr - Substance ndl n lld lhd mtype logED50 2.5% -1 Na Pyrithion 20 108 -2.107210 2.00000 linlogit -0.3461318 NA -2 Pyridin 19 161 0.591760 3.69897 inactive NA NA -3 PyNO 19 81 0.591760 3.69897 no fit NA NA -4 (PT)2 19 81 -2.408240 2.00000 linlogit -0.4197031 -0.5326102 -5 MSO2P 28 108 -1.709271 3.69897 inactive NA NA -6 MSPHI 19 81 0.591760 3.69897 probit 3.6625025 3.5548278 -7 PyS 18 80 -0.408240 3.00000 probit 2.6817944 NA -8 Zn Pyrithion 27 81 -2.107210 2.00000 linlogit -0.4132885 -0.5293327 -9 Cu Pyrithion 19 79 -2.408240 2.00000 linlogit -0.3074717 -0.4753489 -10 Fe Pyrithion 19 81 -2.408240 2.00000 linlogit -0.3534572 -0.5003829 -11 (PyS)2 20 81 -0.408240 3.00000 probit 1.7840499 1.6726792 -12 MSPT 18 108 -0.408240 3.00000 probit 2.1384811 2.0709306 -13 TBT 38 135 -2.709271 2.39794 linlogit -0.1580954 -0.2602139 -14 NaJ 10 108 0.591760 3.30103 inactive NA NA - 97.5% unit sigma a b c -1 NA 然 0.20857751 -0.3461318 2.1188272 -0.26698979 -2 NA 然 NA NA NA NA -3 NA 然 0.09188853 NA NA NA -4 NA 然 0.20509070 -0.4197031 1.8466994 -0.51508088 -5 NA 然 NA NA NA NA -6 3.88053203 然 0.12943273 3.6625025 0.4387540 NA -7 NA 然 0.13401920 2.6817944 0.1250523 NA -8 -0.29979846 然 0.22877916 -0.4132885 1.7424846 0.61078660 -9 -0.15442805 然 0.24494451 -0.3074717 1.0150649 -0.04897422 -10 -0.21459555 然 0.23383185 -0.3534572 1.1823558 0.02510613 -11 1.88824519 然 0.23298721 1.7840499 0.4098018 NA -12 2.20511512 然 0.22881257 2.1384811 0.2112625 NA -13 -0.05045493 然 0.19264079 -0.1580954 1.0406576 -0.02416104 -14 NA 然 NA NA NA NA +> print(rpyr,digits=5) + Substance ndl n lld lhd mtype logED50 2.5% 97.5% +1 Na Pyrithion 20 108 -2.10721 2.0000 linlogit -0.34613 NA NA +2 Pyridin 19 161 0.59176 3.6990 inactive NA NA NA +3 PyNO 19 81 0.59176 3.6990 no fit NA NA NA +4 (PT)2 19 81 -2.40824 2.0000 linlogit -0.41970 -0.53261 NA +5 MSO2P 28 108 -1.70927 3.6990 inactive NA NA NA +6 MSPHI 19 81 0.59176 3.6990 probit 3.66250 3.55483 3.880532 +7 PyS 18 80 -0.40824 3.0000 probit 2.68179 NA NA +8 Zn Pyrithion 27 81 -2.10721 2.0000 linlogit -0.41329 -0.52933 -0.299798 +9 Cu Pyrithion 19 79 -2.40824 2.0000 linlogit -0.30747 -0.47535 -0.154428 +10 Fe Pyrithion 19 81 -2.40824 2.0000 linlogit -0.35346 -0.50038 -0.214596 +11 (PyS)2 20 81 -0.40824 3.0000 probit 1.78405 1.67268 1.888245 +12 MSPT 18 108 -0.40824 3.0000 probit 2.13848 2.07093 2.205115 +13 TBT 38 135 -2.70927 2.3979 linlogit -0.15810 -0.26021 -0.050455 +14 NaJ 10 108 0.59176 3.3010 inactive NA NA NA + unit sigma a b c +1 然 0.208578 -0.34613 2.11883 -0.266989 +2 然 NA NA NA NA +3 然 0.091889 NA NA NA +4 然 0.205091 -0.41970 1.84673 -0.515056 +5 然 NA NA NA NA +6 然 0.129433 3.66250 0.43875 NA +7 然 0.134019 2.68179 0.12505 NA +8 然 0.228779 -0.41329 1.74248 0.610790 +9 然 0.244945 -0.30747 1.01507 -0.048974 +10 然 0.233832 -0.35346 1.18236 0.025107 +11 然 0.232987 1.78405 0.40980 NA +12 然 0.228813 2.13848 0.21126 NA +13 然 0.192641 -0.15810 1.04066 -0.024161 +14 然 NA NA NA NA > -- cgit v1.2.1