version 2.3.1

cran · Apr 15, 2014 · a32ce14 · a32ce14
1 parent 2b09ed3
commit a32ce14
Show file tree

Hide file tree

Showing 29 changed files with 646 additions and 895 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,18 +1,16 @@
 Package: Bclim
 Type: Package
 Title: Bayesian Palaeoclimate Reconstruction from Pollen
-Version: 2.2
-Date: 2013-01-23
+Version: 2.3.1
+Date: 2014-04-15
 Author: Andrew Parnell, Thinh Doan and James Sweeney
 Maintainer: Andrew Parnell <Andrew.Parnell@ucd.ie>
-Depends: mclust, hdrcde, statmod, MASS
+Depends: MASS, mclust
+Imports: hdrcde, statmod
 Suggests: Bchron, doMC, foreach
-Description: This package takes pollen/time data from lake cores and
-        produces a Bayesian posterior distribution of palaeoclimate
-        from that location after fitting a non-linear non-Gaussian
-        state-space model. This latest version fixes a bug where
-        volatilities were estimated incorrectly
+Description: This package takes pollen/time data from lake cores and produces a Bayesian posterior distribution of palaeoclimate from that location after fitting a non-linear non-Gaussian state-space model.
 License: GPL (>= 2)
-Packaged: 2013-01-23 13:15:04 UTC; aparnell
+Packaged: 2014-04-17 14:26:45 UTC; aparnell
+NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2013-01-23 16:20:13
+Date/Publication: 2014-04-18 08:39:17
diff --git a/MD5 b/MD5
@@ -1,31 +1,27 @@
-3055d527f9894b4cb6ee8d6b238ac748 *DESCRIPTION
-8e419122bd6a5b07a3a495d573138afc *NAMESPACE
-5f2912b0a548a38cd6d4eb0cf7b7e477 *R/Bclim-internal.R
+a8f48f85af68c7fb7e284f820a54aa36 *DESCRIPTION
+2f113365dfbb6c37cf8748a3a09bac07 *NAMESPACE
 c6f874826f8e6697c8eec0b90413f529 *R/Bclim.R
-f776eb835eb11d4c792b0cf2cca720e5 *R/BclimCompile.R
-4cff32608adc1207131105a1982713e9 *R/BclimInterp.R
-af57a23af5cd03c0f897ade4349cb3d2 *R/BclimLayer.R
-041a88b7f1a4e3db237178fe3c5422f8 *R/BclimMCMC.R
-c382207be84fe453dc5d4b7c35c4da95 *R/BclimMixPar.R
-89588b14f7687294d938dd3f7ca1b1cc *R/BclimMixSer.R
+276e9d9aea394b90e58fbfcf9f45253c *R/BclimCompile.R
+fa6543be87cf722c53fe6a046e918762 *R/BclimInterp.R
+0595934946efef63e52463392895e476 *R/BclimLayer.R
+5d5c2210cce82ea17fcc11839bbc97fa *R/BclimMCMC.R
+b5af690c5e7e0c3d19da9a480d23a767 *R/BclimMixPar.R
+58f1410cb5c2c35da61f24e2b5266f83 *R/BclimMixSer.R
 856245e1980b34b2eea6bb3f130c9c08 *R/BclimRun.R
-f48b41d0a322f1bfa36fac12444f3bd4 *R/NIGB.R
-3c8d4d5c7857fb8cf3a1eb8a841642f2 *R/NIGp3.R
-9b83e343f86b627f055a360f78511deb *R/plotBclim.R
-d385f12dbe1227314f75a2b58b53e2ea *R/plotBclimVol.R
-eba7fbd97a896a794b26ebcee5e784fc *man/Bclim-package.Rd
-3b3ae1db0dd7153c87186a432aeff7c6 *man/BclimCompile.Rd
+254beb9b64f7819c7ff3846767f8a44e *R/plotBclim.R
+9a1092b29526425879e14855de9144e6 *R/plotBclimVol.R
+90f8e07927a8651a6deeb9eb5a87fdea *R/zzz.R
+a68bbc80ffe7b1c1e5d50110ac6d6c06 *man/Bclim-package.Rd
+63baf8f9f1b0106d60434f345faaf428 *man/BclimCompile.Rd
 844027ba79272149b55c70e30dde004a *man/BclimInterp.Rd
-cb66a992d9bdf6fdd8f0c9449f573f4f *man/BclimLayer.Rd
-fd2b950219625b2cc6fed00790569963 *man/BclimMCMC.Rd
-bc6b60f2b815ecf01afe6d3379879482 *man/BclimMixPar.Rd
-d3e0c28f0ba477c4b69f042d18564b1f *man/BclimMixSer.Rd
-d098a650d48d745dfcd4ef089baa1cb4 *man/BclimRun.Rd
-2a5fdad1ccd8655ef2a5a9457b876578 *man/NIGB.Rd
-78acf6ecd9f34501621bb24312632701 *man/NIGp3.Rd
-f46732a1c4585ce1457b92572090dde7 *man/plotBclim.Rd
-d869628c17b2764282187b609858549e *man/plotBclimVol.Rd
-5b72d41aaa4cd831235669faa9f3e617 *src/BclimMCMC3D.c
+4132c98098e3d0e0749d6f09b99ba77e *man/BclimLayer.Rd
+80aea2ad9cdc6706ea63c9b56fae4463 *man/BclimMCMC.Rd
+bfdbdd437f2f9bf65b3021933d9bb81d *man/BclimMixPar.Rd
+afb588a381b69654837f58ecb4128afd *man/BclimMixSer.Rd
+2ab97fc9ac914c86d95970d3fd267141 *man/BclimRun.Rd
+9efb7750817a00efb8d54f706abb1ae7 *man/plotBclim.Rd
+466695715b643ea20742560c271a83d1 *man/plotBclimVol.Rd
+46000bef71469cd91818dbbd68818493 *src/BclimMCMC3D.c
 efa94aa42c370a9851dca166219f9c0f *src/PalaeoRecon3D.c
-effde32cdc7ea252698c65b8e9b48b58 *src/use.c
-1c8929a0e47b44cb06b0586a95adbbac *src/use.h
+384ae2930ede0489a28287fb2fa5eb59 *src/use.c
+6dab0cf9547153c2ecf4bc9825dd9fca *src/use.h
diff --git a/NAMESPACE b/NAMESPACE
@@ -2,4 +2,7 @@ exportPattern("^[[:alpha:]]+")
 
 useDynLib(Bclim)
 
-export(Bclim, BclimLayer, BclimMixPar, BclimMixSer, BclimMCMC, BclimCompile, BclimInterp, plotBclim, plotBclimVol)
+import(MASS)
+import(mclust)
+importFrom(statmod,rinvgauss)
+importFrom(hdrcde,hdr)
diff --git a/R/Bclim-internal.R b/R/Bclim-internal.R
diff --git a/R/BclimCompile.R b/R/BclimCompile.R
@@ -2,10 +2,7 @@ BclimCompile <-
 function(Layers,Mixtures,MCMC,Interpolations,core.name="Core") {
 
   clim.dims <- c("GDD5","MTCO","AET/PET x 1000")
-  results <- list(time.grid=Interpolations$time.grid,core.name=core.name,clim.interp=Interpolations$clim.interp,
-                  vol.interp=Interpolations$vol.interp,MDP=Layers,ScMean=Mixtures$ScMean,ScVar=Mixtures$ScVar,
-                  clim.dims=clim.dims,n=Mixtures$n,m=Mixtures$m,n.samp=Mixtures$n.samp,Chronsfile=MCMC$chron.loc,
-                  nchron=MCMC$nchron,chron.store=MCMC$chron.store)
+  results <- list(time.grid=Interpolations$time.grid,core.name=core.name,clim.interp=Interpolations$clim.interp,v.interp=Interpolations$v.interp,MDP=Layers,ScMean=Mixtures$ScMean,ScVar=Mixtures$ScVar,clim.dims=clim.dims,n=Mixtures$n,m=Mixtures$m,n.samp=Mixtures$n.samp,Chronsfile=MCMC$chron.loc,nchron=MCMC$nchron,chron.store=MCMC$chron.store)
   class(results) <- "Bclim"
   return(results)
 }