diff options
| author | ranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc> | 2007-03-29 19:12:44 +0000 |
|---|---|---|
| committer | ranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc> | 2007-03-29 19:12:44 +0000 |
| commit | b7d1496a061f7d0e575b2742a5ef3933ae55b476 (patch) | |
| tree | 38c9410b26f846906b68319cf3eb7e83e1e3a1f8 | |
| parent | b5d0004f8902913094f8d787760e349d6f131bac (diff) | |
- Changed "繕M" in all datasets to "microM", since non-Ascii characters
cause a warning in the upcoming R 2.5.0
git-svn-id: http://kriemhild.uft.uni-bremen.de/svn/drfit@89 d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc
| -rw-r--r-- | DESCRIPTION | 2 | ||||
| -rw-r--r-- | data/IM1xIPC81.rda | bin | 39498 -> 7535 bytes | |||
| -rw-r--r-- | data/IM1xVibrio.rda | bin | 9524 -> 2011 bytes | |||
| -rw-r--r-- | data/antifoul.rda | bin | 10643 -> 2624 bytes | |||
| -rw-r--r-- | data/pyrithione.rda | bin | 12931 -> 13049 bytes | |||
| -rw-r--r-- | tests/IM1xIPC81.Rout.save | 18 | ||||
| -rw-r--r-- | tests/IM1xVibrio.Rout.save | 22 | ||||
| -rw-r--r-- | tests/antifoul.Rout.save | 6 | ||||
| -rw-r--r-- | tests/pyrithione.Rout.save | 28 |
9 files changed, 38 insertions, 38 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index a31c084..7da500f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: drfit -Version: 0.05-88 +Version: 0.05-89 Date: 2007-03-29 Title: Dose-response data evaluation Author: Johannes Ranke <jranke@uni-bremen.de> diff --git a/data/IM1xIPC81.rda b/data/IM1xIPC81.rda Binary files differindex 458f8b1..88c48cf 100644 --- a/data/IM1xIPC81.rda +++ b/data/IM1xIPC81.rda diff --git a/data/IM1xVibrio.rda b/data/IM1xVibrio.rda Binary files differindex daef0b1..bd45682 100644 --- a/data/IM1xVibrio.rda +++ b/data/IM1xVibrio.rda diff --git a/data/antifoul.rda b/data/antifoul.rda Binary files differindex 4fc0ba6..17bc544 100644 --- a/data/antifoul.rda +++ b/data/antifoul.rda diff --git a/data/pyrithione.rda b/data/pyrithione.rda Binary files differindex 2ce3baf..6e77ac4 100644 --- a/data/pyrithione.rda +++ b/data/pyrithione.rda diff --git a/tests/IM1xIPC81.Rout.save b/tests/IM1xIPC81.Rout.save index c927d25..022ef9a 100644 --- a/tests/IM1xIPC81.Rout.save +++ b/tests/IM1xIPC81.Rout.save @@ -59,15 +59,15 @@ NaNs produced in: pnorm(q, mean, sd, lower.tail, log.p) IM1-10 BF4: Fitting data... Waiting for profiling to be done... > 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 然 + 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 microM +2 IM14 BF4 20 216 -0.010300 3.1761 no fit NA NA NA microM +3 IM15 BF4 9 135 0.591760 3.0000 inactive NA NA NA microM +4 IM16 BF4 9 108 0.591760 3.0000 inactive NA NA NA microM +5 IM17 BF4 9 81 0.591760 3.0000 linlogit 2.5786 2.50572 2.66174 microM +6 IM18 BF4 9 135 0.591760 3.0000 linlogit 1.6806 1.62298 1.74189 microM +7 IM19 BF4 9 81 0.591760 3.0000 linlogit 1.6496 1.59848 1.70315 microM +8 IM1-10 BF4 11 162 -0.010300 3.0000 linlogit 0.7697 0.68701 0.85442 microM sigma a b c 1 NA NA NA NA 2 NA NA NA NA diff --git a/tests/IM1xVibrio.Rout.save b/tests/IM1xVibrio.Rout.save index e3df372..6ba7310 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.1 beta (2006-05-18 r38119) +R version 2.4.1 (2006-12-18) +Copyright (C) 2006 The R Foundation for Statistical Computing ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -45,15 +45,15 @@ Waiting for profiling to be done... IM1-10 BF4: Fitting data... Waiting for profiling to be done... > 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 然 + 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 microM +2 IM14 BF4 12 57 -4.30103 4.6990 probit 3.54421 3.50302 3.58555 microM +3 IM15 BF4 7 20 -0.30103 4.6990 probit 3.13985 3.11359 3.16624 microM +4 IM16 BF4 13 30 -4.30103 4.6990 probit 3.18042 3.14358 3.21762 microM +5 IM17 BF4 10 20 -1.30103 4.6990 probit 2.43173 2.36807 2.49512 microM +6 IM18 BF4 10 17 -2.30103 2.6990 probit 1.40152 1.31467 1.48806 microM +7 IM19 BF4 13 22 -5.30103 2.6990 probit 0.71579 0.67037 0.75925 microM +8 IM1-10 BF4 11 20 -6.30103 2.6990 probit -0.17903 -0.25694 -0.10372 microM sigma a b 1 0.063029 3.93991 0.57631 2 0.059054 3.54421 0.65613 diff --git a/tests/antifoul.Rout.save b/tests/antifoul.Rout.save index 9cd818f..7bcba6a 100644 --- a/tests/antifoul.Rout.save +++ b/tests/antifoul.Rout.save @@ -27,9 +27,9 @@ Waiting for profiling to be done... Zn Pyrithion: Fitting data... Waiting for profiling to be done... > 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 然 + 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 microM +2 Zn Pyrithion 27 81 -2.1072 2.0000 probit -0.39792 -0.50783 -0.291561 microM sigma a b 1 0.19286 -0.16436 0.67637 2 0.22866 -0.39792 0.41696 diff --git a/tests/pyrithione.Rout.save b/tests/pyrithione.Rout.save index b5712db..6df94db 100644 --- a/tests/pyrithione.Rout.save +++ b/tests/pyrithione.Rout.save @@ -60,20 +60,20 @@ Waiting for profiling to be done... NaJ: Fitting data... > print(rpyr,digits=3) - Substance ndl n lld lhd mtype logED50 2.5% 97.5% unit sigma -1 Na Pyrithion 20 108 -2.107 2.0 linlogit -0.346 NA NA 然 0.209 -2 Pyridin 19 161 0.592 3.7 inactive NA NA NA 然 NA -3 PyNO 19 81 0.592 3.7 no fit NA NA NA 然 0.107 -4 (PT)2 19 81 -2.408 2.0 linlogit -0.420 -0.533 NA 然 0.205 -5 MSO2P 28 108 -1.709 3.7 inactive NA NA NA 然 NA -6 MSPHI 19 81 0.592 3.7 probit 3.663 3.555 3.8805 然 0.129 -7 PyS 18 80 -0.408 3.0 linlogit 2.756 NA NA 然 0.146 -8 Zn Pyrithion 27 81 -2.107 2.0 linlogit -0.413 -0.529 -0.2998 然 0.229 -9 Cu Pyrithion 19 79 -2.408 2.0 linlogit -0.307 -0.475 -0.1544 然 0.245 -10 Fe Pyrithion 19 81 -2.408 2.0 linlogit -0.353 -0.500 -0.2146 然 0.234 -11 MSPT 18 108 -0.408 3.0 probit 2.138 2.071 2.2051 然 0.229 -12 TBT 38 135 -2.709 2.4 linlogit -0.158 -0.260 -0.0505 然 0.193 -13 NaJ 10 108 0.592 3.3 inactive NA NA NA 然 NA + Substance ndl n lld lhd mtype logED50 2.5% 97.5% unit sigma +1 Na Pyrithion 20 108 -2.107 2.0 linlogit -0.346 NA NA microM 0.209 +2 Pyridin 19 161 0.592 3.7 inactive NA NA NA microM NA +3 PyNO 19 81 0.592 3.7 no fit NA NA NA microM 0.107 +4 (PT)2 19 81 -2.408 2.0 linlogit -0.420 -0.533 NA microM 0.205 +5 MSO2P 28 108 -1.709 3.7 inactive NA NA NA microM NA +6 MSPHI 19 81 0.592 3.7 probit 3.663 3.555 3.8805 microM 0.129 +7 PyS 18 80 -0.408 3.0 linlogit 2.756 NA NA microM 0.146 +8 Zn Pyrithion 27 81 -2.107 2.0 linlogit -0.413 -0.529 -0.2998 microM 0.229 +9 Cu Pyrithion 19 79 -2.408 2.0 linlogit -0.307 -0.475 -0.1544 microM 0.245 +10 Fe Pyrithion 19 81 -2.408 2.0 linlogit -0.353 -0.500 -0.2146 microM 0.234 +11 MSPT 18 108 -0.408 3.0 probit 2.138 2.071 2.2051 microM 0.229 +12 TBT 38 135 -2.709 2.4 linlogit -0.158 -0.260 -0.0505 microM 0.193 +13 NaJ 10 108 0.592 3.3 inactive NA NA NA microM NA a b c 1 -0.346 2.119 -0.266998 2 NA NA NA |