diff --git a/src/GenomeCopyNumber.cpp b/src/GenomeCopyNumber.cpp index c6a26d1..adce9d1 100644 --- a/src/GenomeCopyNumber.cpp +++ b/src/GenomeCopyNumber.cpp @@ -3390,7 +3390,7 @@ float GenomeCopyNumber::evaluateContamination () { if (chrCopyNumber_[index].isSmoothed() && WESanalysis == false) expected = chrCopyNumber_[index].getSmoothedProfileAtI(i); } - if (!(expected == 1 || expected <= 0 || expected >= 2 || observed > 3 || observed <= 0) + if (!(expected == 1 || expected <= 0 || expected >= 1+2.0/ploidy_ || observed > 3 || observed <= 0) && (((1>observed)&&(1>expected))||((1-0.5 && p<1.5) { @@ -3445,7 +3445,7 @@ float GenomeCopyNumber::evaluateContaminationwithLR () { if (chrCopyNumber_[index].isMedianCalculated()) { expected = round_by_ploidy(chrCopyNumber_[index].getMedianProfileAtI(i),ploidy_) ; } - if (expected!=NA && expected<2){ + if (expected!=NA && expected<1+2.0/ploidy_){ observed_values.push_back(observed-1); expected_values.push_back(expected-1); } diff --git a/src/freec b/src/freec index 594775b..097c42b 100644 Binary files a/src/freec and b/src/freec differ diff --git a/src/version.h b/src/version.h index b4c7f46..f3d2f98 100644 --- a/src/version.h +++ b/src/version.h @@ -3,7 +3,7 @@ #define VERSION_H const double VERSION_OFFSET = 3; -const double FREEC_VERSION = 11.2; +const double FREEC_VERSION = 11.3; const double CONTROL_FREEC_VERSION = FREEC_VERSION - VERSION_OFFSET; #endif