git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/OncoSimulR@121143 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -1,8 +1,8 @@ |
1 | 1 |
Package: OncoSimulR |
2 | 2 |
Type: Package |
3 | 3 |
Title: Forward Genetic Simulation of Cancer Progression with Epistasis |
4 |
-Version: 2.3.15 |
|
5 |
-Date: 2016-09-14 |
|
4 |
+Version: 2.3.16 |
|
5 |
+Date: 2016-09-19 |
|
6 | 6 |
Authors@R: c(person("Ramon", "Diaz-Uriarte", role = c("aut", "cre"), |
7 | 7 |
email = "rdiaz02@gmail.com"), |
8 | 8 |
person("Mark", "Taylor", role = "ctb", email = "ningkiling@gmail.com")) |
... | ... |
@@ -222,23 +222,23 @@ simulations. |
222 | 222 |
named elements (see \sQuote{Details}): |
223 | 223 |
\itemize{ |
224 | 224 |
|
225 |
- \item{PDBaseline}{Baseline size subtracted to total population size |
|
225 |
+ \item{PDBaseline:}{ Baseline size subtracted to total population size |
|
226 | 226 |
to compute the probability of detection. If not given explicitly, |
227 | 227 |
the default is \code{1.2 * initSize}. |
228 | 228 |
} |
229 | 229 |
|
230 |
- \item{p2}{The probability of detection at population size |
|
230 |
+ \item{p2:}{ The probability of detection at population size |
|
231 | 231 |
\code{n2}. If you specificy \code{p2} you must also specify |
232 | 232 |
\code{n2} and you must not specify \code{cPDetect}. The fault is 0.1.} |
233 | 233 |
|
234 |
- \item{n2}{The population size at which probability of detection is |
|
235 |
- \code{p2}. The default is \code{1.1*initSize}.} |
|
234 |
+ \item{n2:}{ The population size at which probability of detection is |
|
235 |
+ \code{p2}. The default is \code{2 * initSize}.} |
|
236 | 236 |
|
237 |
- \item{cPDetect}{The change in probability of detection with size. If |
|
237 |
+ \item{cPDetect:}{ The change in probability of detection with size. If |
|
238 | 238 |
you specify it, you should not specify either of \code{p2} or |
239 | 239 |
\code{n2}. See \sQuote{Details}. } |
240 | 240 |
|
241 |
- \item{checkSizePEvery}{Time between successive checks for the |
|
241 |
+ \item{checkSizePEvery:}{ Time between successive checks for the |
|
242 | 242 |
probability of exiting as a function of population size. If not |
243 | 243 |
given explicitly, the default is 20. See \sQuote{Details}.} |
244 | 244 |
|
... | ... |
@@ -93,6 +93,7 @@ bool detectedSizeP(const double n, const double cPDetect, |
93 | 93 |
} else { |
94 | 94 |
std::uniform_real_distribution<double> runif(0.0, 1.0); |
95 | 95 |
double prob = probDetectSize(n, cPDetect, PDBaseline); |
96 |
+ if(prob <= 0.0) return false; |
|
96 | 97 |
if(runif(ran_gen) <= prob) { |
97 | 98 |
return true; |
98 | 99 |
} else { |