version 0.4.1

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: DEploid
 Type: Package
 Title: Deconvolute Mixed Genomes with Unknown Proportions
-Version: 0.3.2
+Version: 0.4.1
 Authors@R: c(
     person("Joe", "Zhu", role=c("aut", "cre", "cph"), email="joe.zhu@well.ox.ac.uk")
     )
@@ -19,16 +19,16 @@ URL: https://github.com/mcveanlab/DEploid-r
 BugReports: https://github.com/mcveanlab/DEploid-r/issues
 License: GPL (>= 3)
 Depends: R (>= 3.1.0)
-Imports: Rcpp (>= 0.11.2)
+Imports: Rcpp (>= 0.11.2), scales (>= 0.4.0)
 Suggests: knitr, rmarkdown, testthat (>= 0.9.0)
 SystemRequirements: C++11
 VignetteBuilder: knitr
 LinkingTo: Rcpp
-RoxygenNote: 5.0.1
-Date: 2016-11-25
+RoxygenNote: 6.0.1
+Date: 2017-07-19
 NeedsCompilation: yes
-Packaged: 2016-11-25 13:28:06 UTC; joezhu
+Packaged: 2017-07-24 16:21:48 UTC; joezhu
 Author: Joe Zhu [aut, cre, cph]
 Maintainer: Joe Zhu <joe.zhu@well.ox.ac.uk>
 Repository: CRAN
-Date/Publication: 2016-11-25 19:47:49
+Date/Publication: 2017-07-24 19:21:48 UTC

MD5

@@ -1,30 +1,33 @@
-1e14106b957a6975e2b438506c170822 *DESCRIPTION
-f643e6d6541fd81cef4166a1970f93f7 *NAMESPACE
-ea972cef59e5a1b25ec9dbd34b78818a *R/DEploidR.R
-d542c5667378ada940dc02c70062956a *R/RcppExports.R
-ca35c56c0c379f292f8fab68b3a19f61 *R/dEploid.R
-958f510a754711eee90a6d9191e0c0cc *README.md
-511342e040b64d8b5fe29c78b0bec323 *build/vignette.rds
+cc8e6aec2ca89ce31f719bfde471c346 *DESCRIPTION
+1ba662e694b86ea699f55f066f681735 *NAMESPACE
+4acd1e022c0caae521fe3c4218cbf773 *R/DEploidR.R
+7efdf7afe8931c93c9c3cdf32a85fb6b *R/RcppExports.R
+67a4e5e9ee6ab0c36ecfe5f14be380bb *R/dEploid.R
+db8dd67bf1ee95720e0b4deeefe17540 *README.md
+4b8735c3042553d77ef67496617e1a7a *build/vignette.rds
+461e2dc267742100128d50cd74e757e2 *inst/CITATION
 01c90976b229646ca9b46399709688e3 *inst/doc/dEploid-Arguments.R
-4c6f85b3125573a004b0239c9f93c584 *inst/doc/dEploid-Arguments.Rmd
-6c8f5055c88e0dfca4a9cb2c101632cd *inst/doc/dEploid-Arguments.html
+2cbf6a6a60e07984981e6a2329578f8e *inst/doc/dEploid-Arguments.Rmd
+c4b96180536068d62ef9c8dd56cf0aad *inst/doc/dEploid-Arguments.html
 2cad08193815864d8a26f8ac768ef199 *inst/extdata/PG0390-C.test.alt
 07eccfaeb952de9e0460bcc12d457b22 *inst/extdata/PG0390-C.test.ref
 cdc601c1d8d4eec2bc80512eb8ee6b6b *inst/extdata/PG0390-C.test.vcf.gz
+a18778772a21e2614f37800bf1e3d22c *inst/extdata/deploid.png
 d5122a085c423ba8bdeff856b6a6f768 *inst/extdata/labStrains.test.PLAF.txt
 a865c12e4c27f049106f134b695a0b82 *inst/extdata/labStrains.test.exclude.txt
 58b29caf285f90a0900f2b04443ec465 *inst/extdata/labStrains.test.panel.txt
-e6c5709ab766a591f9dd389abd448c23 *man/computeObsWSAF.Rd
-b783355f1b37775d87a274458f56cdbb *man/dEploid.Rd
-807e385b1ba36c42fb5cbc18d90f0b51 *man/extractCoverageFromTxt.Rd
-3c3609c7307fbe810161ed70670a5466 *man/extractCoverageFromVcf.Rd
-7a3de475e2658423804fd93ade8fdd0d *man/extractPLAF.Rd
-56a9a867e99b7339a9a09acb3d66cf0a *man/haplotypePainter.Rd
-1889e8f463e1d0eaf44f32269681526d *man/histWSAF.Rd
-82301c5903d666cedb9d5724ff0b99ae *man/plotAltVsRef.Rd
-1d437716d00c55a2bedaf1cdc6daceb0 *man/plotObsExpWSAF.Rd
-7ac118ef617a938addf0ef56791146be *man/plotProportions.Rd
-5ea7673f44a4cf8945e12103d521fa89 *man/plotWSAFvsPLAF.Rd
+c66bad00fd74ef0edfd9ac95321a21e3 *man/DEploid-package.Rd
+969a205711721273225e45309feea2e2 *man/computeObsWSAF.Rd
+a7dec0cf819f7b734569760e93f0a0df *man/dEploid.Rd
+afe33866068d67205df832bd203a6b95 *man/extractCoverageFromTxt.Rd
+75abaa56837fbc43fcc6c7bc0812ad89 *man/extractCoverageFromVcf.Rd
+6128a5a436c07ae388d76b0d32355675 *man/extractPLAF.Rd
+4e2cc4e21565e24ff8aa8fcd99b5b771 *man/haplotypePainter.Rd
+3019ec173a0c2412efb0e20ba77160e0 *man/histWSAF.Rd
+723f9fa584d22a4195ccaf58df51f749 *man/plotAltVsRef.Rd
+49377844b1fe892b932481d52322c142 *man/plotObsExpWSAF.Rd
+78028e6531b85eda078b50ae6782ed78 *man/plotProportions.Rd
+533baf0658e56da3a00a011d536a55dd *man/plotWSAFvsPLAF.Rd
 c3adb6d6823db1b19840143fa58ba349 *src/DEploid/codeCogs/asympt_expn.h
 9c4cc52f7742819084a453fef38e0288 *src/DEploid/codeCogs/errorfn.h
 09168cd629e28c9591a8b7a276acc1e4 *src/DEploid/codeCogs/errorfnc.h
@@ -42,14 +45,15 @@ ccec2bc4b1d1436416711e52b16ef3e0 *src/DEploid/codeCogs/mersenne.hpp
 785e0971c65e88f066c599e4ba8f9324 *src/DEploid/codeCogs/randomSample.hpp
 94c33b48dee38eb7bdc87638e718e09e *src/DEploid/codeCogs/stirling.h
 a3585d8d0b267c7076cc835be837bf5f *src/DEploid/codeCogs/xsub_ln_add1.h
-190f59db22ceebe71824ba699096550e *src/DEploid/dEploid.cpp
-62c6f8dc7d1d6a25816b2e67e6672363 *src/DEploid/dEploidIO.cpp
-533ae534b972687ea0c2dc6050d3bd40 *src/DEploid/dEploidIO.hpp
-c3db9bab3d4aed6482946fe119956fe1 *src/DEploid/debug/mcmcDebug.cpp
-9f0f4f93ca4114daaeda462ebd671c23 *src/DEploid/debug/vcfReaderDebug.cpp
-6abafdcdd259ddf357bd87061384c422 *src/DEploid/exceptions.hpp
-d1509c05ecd07ea6444c34add6cb40a9 *src/DEploid/export/dEploidIOExport.cpp
-1597a3c9c4ba78dbdc46f69f7cd19e64 *src/DEploid/export/dEploidIOExportPosteriorProb.cpp
+ccf0d382ab75490ff2169f016cf93b3e *src/DEploid/dEploid.cpp
+3a466176ccc4aaed26325bd05190926e *src/DEploid/dEploidIO.cpp
+19bf6527a2e09276b55f6ead8559b4a4 *src/DEploid/dEploidIO.hpp
+ee6cc55608c5471dc7c16aa58087f35b *src/DEploid/debug/mcmcDebug.cpp
+18baed6c81141bf971540f6eeaaffd6b *src/DEploid/debug/vcfReaderDebug.cpp
+7e6d21967aeeb18294f9325b05fecbe7 *src/DEploid/exceptions.hpp
+32c3153abb61241132535cb70e6f11ef *src/DEploid/export/dEploidIOExport.cpp
+d89a3ce3499ae6ad9d49b8212636322b *src/DEploid/export/dEploidIOExportPosteriorProb.cpp
+1175c0426828f9f27d61eff150f2b0a9 *src/DEploid/export/writeMcmcRelated.cpp
 5d8d873e67678af9b2c4cd95f10c6493 *src/DEploid/global.h
 7fbc338309ac38fefcd64b04bb903e34 *src/DEploid/gzstream/COPYING.LIB
 d632447d46c9b1d6ab0103de7a665034 *src/DEploid/gzstream/README
@@ -60,34 +64,41 @@ caa5ea78d04f32a480fa6d4008817cec *src/DEploid/gzstream/index.html
 72767782fc756a7855f92361e949b499 *src/DEploid/gzstream/test_gunzip.C
 ade409024dc2511702be4b25cec98304 *src/DEploid/gzstream/test_gzip.C
 667c569a5d455053fccbd853ba195eab *src/DEploid/gzstream/version
-30483ed354175e541f99a051afba55cd *src/DEploid/mcmc.cpp
-1e5b763e4a77dfea3236d99f7a137b82 *src/DEploid/mcmc.hpp
-24f915a039f983555dec8c40c8d372cc *src/DEploid/panel.cpp
-7380500da399ec4db8462413db61c4de *src/DEploid/panel.hpp
-124a48489755400ba0f5bf2febd74d0b *src/DEploid/random/fastfunc.cpp
-e5d49c9a9395715b8698fbe6c0c31ebf *src/DEploid/random/fastfunc.hpp
-eab70c06d07d71824f14f38ff0dbfb73 *src/DEploid/random/mersenne_twister.cpp
-2546874b3cb6a99cdb852748e8a04d38 *src/DEploid/random/mersenne_twister.hpp
-c0f68155bb097f644bb8e8b297f499b7 *src/DEploid/random/random_generator.cpp
-63a824d628eff84033ab7e3d1e5e27aa *src/DEploid/random/random_generator.hpp
-50561b0c89da40b4d4bf6bb1254f3dff *src/DEploid/txtReader.cpp
-5c5fa5360dd019aca51c9a2892018650 *src/DEploid/txtReader.hpp
-d2989d04a60a4ae4d3361149cd97ae2d *src/DEploid/updateHap.cpp
-6ad4b5e207a3e8628b501e69d3fa8813 *src/DEploid/updateHap.hpp
-4eb385c37a707e9c7a8447e88d6cc743 *src/DEploid/utility.cpp
-fb31e7d3ce0a29ed9e44624ded1e5918 *src/DEploid/utility.hpp
-d78f4650b9e13090cf7acf9b24851e0d *src/DEploid/variantIndex.cpp
-5befd8a0bcc2b5fac322c9d8bdd2320e *src/DEploid/variantIndex.hpp
-5f6c3bb7530a9783575ea99e331ea3e4 *src/DEploid/vcfReader.cpp
-4a139bad79b76e7e53193497ebe848ae *src/DEploid/vcfReader.hpp
-0ede14f6c763cbc6120f9b6957a5f828 *src/Makevars
-0ede14f6c763cbc6120f9b6957a5f828 *src/Makevars.win
-ab87ea5af0ce76fb6ac3c99d2c0f2467 *src/RcppExports.cpp
-056d7eeeb1840457a321d1b18093a445 *src/dEploidr.cpp
+1fcb7a50f57a3badf4ddade692ca443a *src/DEploid/ibd.cpp
+0029702d7be9123f533a0ce26c9682ac *src/DEploid/ibd.hpp
+a9f945dcbbc9dee68835b1cd84cd884c *src/DEploid/mcmc.cpp
+ea74b841d17de058b166907135a439bf *src/DEploid/mcmc.hpp
+3a6972a6e817a2a722dc2d3ab688f68c *src/DEploid/panel.cpp
+3721743b908e1121992fa6d681becefc *src/DEploid/panel.hpp
+a6765fb4db45924b1d3b2d7ed6d5b0ae *src/DEploid/random/fastfunc.cpp
+1a598d9c9df966427a64ef6a74ce56d5 *src/DEploid/random/fastfunc.hpp
+d7ee5456f67c91bd7da907001965dd72 *src/DEploid/random/mersenne_twister.cpp
+5c40c783d72b75abcd7a5264a74d4c1a *src/DEploid/random/mersenne_twister.hpp
+9563d50543ff7687795b66906c787a9f *src/DEploid/random/random_generator.cpp
+ad21a81bdcb9369d4c7f9b2d54cb37be *src/DEploid/random/random_generator.hpp
+b5d32dc0eb4400054572939f5c403315 *src/DEploid/txtReader.cpp
+cd2210daa2a2d666b2beba31a3005574 *src/DEploid/txtReader.hpp
+2c00720dcfea641dd7931622f088d67b *src/DEploid/updateHap.cpp
+77ea3771b4393f6a04570f4a21a29059 *src/DEploid/updateHap.hpp
+8d512180b69a43f5c4a1548e50e5eb67 *src/DEploid/utility.cpp
+fb6fff78e8bee8d5095b0a249c6dbec0 *src/DEploid/utility.hpp
+6036bb12ec9dfe238f17c38b9a9e7cd0 *src/DEploid/variantIndex.cpp
+1471e97687dc414aceb0646be8a137de *src/DEploid/variantIndex.hpp
+519c03da78828af6c1ef1c7302cb8361 *src/DEploid/vcfReader.cpp
+3eabace70e4231c03910f01b6a7ba8b1 *src/DEploid/vcfReader.hpp
+4196a245e535a58793960f565f3ddfb5 *src/Makevars
+4196a245e535a58793960f565f3ddfb5 *src/Makevars.win
+2b97b24c7193853b75825b3fb76daa7e *src/RcppExports.cpp
+3452e66aaf23e25aaadf41b0f30d6c55 *src/dEploidr.cpp
+c5cc16e00e5cd1b8150a274c1fcfd3ad *src/init.c
 6e0f7d4dcd22728e243190a8fb750443 *src/r_random_generator.h
+b88e6bcc0ef1e31b4c6c9b7c925d6285 *src/registerDynamicSymbol.c
 eedb9b59a5a966b63e9e82308caf7349 *src/test_exports.cpp
 e095660d571c0f3ef91ce1211ecb7f76 *tests/testthat.R
-942fb62359240c568894a81ad8ba1ce3 *tests/testthat/test-DEploid_tools.R
+551285f1371a8916f8617cf2265031a8 *tests/testthat/pf3k-dEploid.hap
+3028bf541221a16bfa2f5278f20aba6c *tests/testthat/pf3k-dEploid.llk
+f42e2e26937dbead25dd3fd62c2a89a3 *tests/testthat/pf3k-dEploid.prop
+ebea7848b72e813128fef385670c0ebd *tests/testthat/test-DEploid_tools.R
 e6096201933e4b6042e165bca5d80db7 *tests/testthat/test-dEploid.R
 f66b335af2d854e56592824fc8df7a0a *tests/testthat/test-r_random-generator.R
-4c6f85b3125573a004b0239c9f93c584 *vignettes/dEploid-Arguments.Rmd
+2cbf6a6a60e07984981e6a2329578f8e *vignettes/dEploid-Arguments.Rmd

NAMESPACE

@@ -1,8 +1,9 @@
-importFrom("grDevices", "rainbow")
-importFrom("graphics", "abline", "barplot", "hist", "plot", "points")
+importFrom("scales", "alpha")
+importFrom("grDevices", "rainbow", "colorRampPalette")
+importFrom("graphics", "abline", "barplot", "hist", "plot", "points", "axis", "legend")
 importFrom("utils", "read.table")
 importFrom(Rcpp,evalCpp)
-useDynLib(DEploid)
+useDynLib(DEploid, .registration = TRUE)
 export(dEploid)
 export(plotProportions)
 export(extractCoverageFromVcf)