Skip to content

Commit

Permalink
version 2.1-3
Browse files Browse the repository at this point in the history
  • Loading branch information
rolfTurner authored and cran-robot committed Nov 11, 2018
1 parent 02b4692 commit 28c7cf0
Show file tree
Hide file tree
Showing 125 changed files with 7,319 additions and 830 deletions.
704 changes: 704 additions & 0 deletions ChangeLog

Large diffs are not rendered by default.

24 changes: 14 additions & 10 deletions DESCRIPTION
@@ -1,20 +1,24 @@
Package: hmm.discnp
Version: 0.2-4
Date: 2016-04-08
Version: 2.1-3
Date: 2018-11-10
Title: Hidden Markov Models with Discrete Non-Parametric Observation
Distributions
Author: Rolf Turner
Maintainer: Rolf Turner <r.turner@auckland.ac.nz>
Depends: R (>= 0.99)
Depends: R (>= 2.10)
Imports: nnet (>= 7.3.12)
Description: Fits hidden Markov models with discrete non-parametric
observation distributions to data sets. Simulates data
from such models. Finds most probable underlying hidden
states, the most probable sequences of such states, and the
log likelihood of a collection of observations given the
parameters of the model.
observation distributions to data sets. The observations may
be univariate or bivariate. Simulates data from such models.
Finds most probable underlying hidden states, the most
probable sequences of such states, and the log likelihood
of a collection of observations given the parameters of
the model. Auxiliary predictors are accommodated in the
univariate setting.
LazyData: true
ByteCompile: true
License: GPL (>= 2)
NeedsCompilation: yes
Packaged: 2016-04-08 08:59:22 UTC; rolf
Packaged: 2018-11-10 22:07:11 UTC; rolf
Repository: CRAN
Date/Publication: 2016-04-08 11:33:08
Date/Publication: 2018-11-11 18:00:03 UTC
159 changes: 120 additions & 39 deletions MD5
@@ -1,7 +1,7 @@
0fabc5dab61b5720dc5a1fc88a6bd634 *ChangeLog
8a8a23b1fc993adf7c7c88513a7a0c4e *DESCRIPTION
11b7ebf11580b35c8bea28957a99d3ca *NAMESPACE
bb6f6344934b965a455a21347756e847 *R/First.R
bf2783a3d9c1423f3c88aa4a202a2b23 *ChangeLog
130a44c7757ef7e35ac3de2f050dfff0 *DESCRIPTION
83b64ecc58b704dce616636e54a59d67 *NAMESPACE
095b3e16a3334cdf6278ef86a8b40543 *R/First.R
33b7623305e837aa24a6407e2484ab9f *R/RCS/First.R,v
e098b69fcfd3119f2a7aa530ff33408a *R/RCS/check.yval.R,v
2b70d61397d868088e2c17a567cc5f1a *R/RCS/ffun.R,v
Expand All @@ -20,24 +20,79 @@ cb8b173f762a5c70002fa1fd88d8b8b6 *R/RCS/revise.rho.R,v
7bec57092db176335935eac4c4e81726 *R/RCS/sp.R,v
7138d81efb770e4b4d3c27538f2476e6 *R/RCS/tidyup.R,v
830058e16c6db708863ab4ebc518a58d *R/RCS/viterbi.R,v
19fc0944b302a37491bf6ffe210f91af *R/charList.R
6c8678115742b85e6ecfef77c5a7b7d8 *R/check.yval.R
ae212cc9cb39095ad627a889b3786014 *R/ffun.R
135777d19d976b4ba921d83c8b092b27 *R/fitted.hmm.discnp.R
27ea87abae512b0807c6dd8ae46a2949 *R/hmm.R
eb22d9be687321b5243b12879f272cee *R/init.all.R
927cbdf60ee88f3bab5fbc46866aead5 *R/logLikHmm.R
d9d18d44d2bea87b6e9bb428bece75bb *R/mps.R
8bccab6ebff4d659e00deab28535f46b *R/pr.R
dc97c65ddc21eacd17cacdf3b7c93993 *R/recurse.R
72e3b1e6edfcd3f9e32b9429b292a805 *R/revise.ispd.R
001df0098ec406bd45bd5f67cea8e79a *R/revise.rho.R
f180f9d05c14a25f746e32f579875ff1 *R/revise.tpm.R
e7aedc69273f68d422e8b848406ff5a3 *R/sim.hmm.R
76c005d4a086f5a735d0a4ffb92b4eca *R/sp.R
10e4606077501a01eb153b505f2fe808 *R/viterbi.R
edd536ed6ec8824fe8abfee411b640a3 *data/colifCount.rda
ddd1dbb89d36f705ee69dae474e9c072 *data/lesionCount.rda
37dd95af86a32039777a13720cfe1b25 *R/anova.hmm.discnp.R
ff21f877863c279595f65b648310aed8 *R/check.yval.R
59f6b40763570c7b0e687c57d174a4da *R/checkConstColumns.R
00e106204b6307be87aaad912de9f2f8 *R/checkyXoK.R
9ffeefec0ad1a3be441cef6616935be2 *R/cnvrtRho.R
5f538fe0d390c707270140e4ebcab7a8 *R/derivf.R
7c63ae216ce8c76ed379224541dfef4b *R/derivp.R
1e4f4753c74c51cc45a297fa7ecd0a96 *R/derivpi.R
57d353704d01ab2dc1952dbeb1ed7fd8 *R/directMaxStuff.R
6cb2c515a6515fbc9a171f82d3b6a8f4 *R/ffun.R
6f620a621a3d81ebb48ba8f0b014e0f8 *R/fitted.hmm.discnp.R
8eeea906e4111fc50590cfe6eecc112b *R/fix.tpm.R
d4203ea4eae83af910b63d38c2e4c63e *R/forgethgl.R
ee5e6ca256d872bbc034e5310e157140 *R/get.gl.R
0d2691d593e13a9d299caeea913038f7 *R/get.hgl.R
fc32983591fc09826bc9db3fa78f5147 *R/get.l.R
53083fb0d781927df165bc2c61973f9d *R/hmm.R
e1402b6b150724f51d9d3170f9f95a6b *R/hmmBD.R
f7986acc84d33ffa2ce4834f5238abaa *R/hmmBI.R
13c90e52edef075c00ecf70d8031af7c *R/hmmLM.R
8b207bfa09ba2dbb934dedc07a6eac3a *R/hmmNumOpt.R
8ee8e0545f5d3f77228e6e5bc57c6cba *R/hmmSD.R
77acf5c1b1b956e26a95ea40ff5d140d *R/hmmUV.R
8bb0b358ee7418b6166d3a6ceb080533 *R/init.all.R
3f60ae8eb2123c84919cf50955171910 *R/lmstep.R
bd48ff25f48b647d1b7e95ab59274f47 *R/logLikHmm.R
bae08c5b872237758792e9c3ed80ef4b *R/makeDat.R
74839a58d78340e5438ef45e259d1d72 *R/misstify.R
9a75f3f97975e77ada6693e87b126f6b *R/mps.R
3caecf1ccd907c55d0202dc908d6c87a *R/nafracCalc.R
4e9fb9811cf9f98e1e54bc5c922fbffa *R/orgethgl.R
7d9d148d9afe47521424064119da6299 *R/paramExtract.R
6a6bb27f0b34946adf40dc6cd0b00c30 *R/pr.R
769b6e7d6c6bbf23331c81fd0e92197f *R/predict.hmm.discnp.R
bfbbfb6426423cfc02eb963099a6f2d6 *R/recurse.R
9bb0cf6624f0cece3e8c78db06419119 *R/revise.ispd.R
5ea1b13187a29849aa1afb0f14a48f1f *R/revise.rho.R
08cd9fb369e33660c65833bb64b20536 *R/revise.tpm.R
8f1a919e948b2c5715c6c78ee4a2dba1 *R/rgethgl.R
0304937632c69428ea35c1d5168246eb *R/rhmm.R
5943e3a14ce9f12f41dd994c8baf9e19 *R/rhmm.default.R
7dfa4fdad09ad9424b4a08385728d8df *R/rhmm.hmm.discnp.R
d9d51b4c16dcaf6b4114d8488b9aa300 *R/scovmat.R
fdd782f8ace54ecc5e1ceb5fec7c7012 *R/sp.R
fcc04a6a461c3fa144ce37730a5cbb16 *R/squantCI.R
88e70a62d93b1e1b1e1066196caea75c *R/steepest.R
14a6661b5023429624ac39751618082f *R/tidyList.R
d006a911546289641553b85704e41a57 *R/type4stuff.R
fd8ba17ad5394f499ef27d6960d4ef5a *R/update.hmm.discnp.R
2d55c1b59f329c395ae3bdea6aacc912 *R/viterbi.R
b349b7374c412c9f5c56b353cac12ba3 *data/Bovine.rda
4703a9952a5231ea2bbb2b2adbafb0df *data/Cryptosporidiosis.rda
ec3b804b36b380a2b61a1c19fe9a3789 *data/Downloads.rda
1b9940162dca0728598fb6a691cc0e50 *data/EricssonB_Jul2.rda
402864730dd0b6089229e858ea2c0733 *data/FattyLiver.rda
2283079ada921a566d0f198944d9c5af *data/FattyLiver2.rda
82022c8a9d5675d92b25e2d779827fb5 *data/Hanta.rda
f8879e696ebd01ac8d2bac464592fe26 *data/IPs.rda
444b9568cf969fd5d8c8543b347baa63 *data/InfantEEGsleepstates.rda
1687bc6936b0d39f8c9052e514fd32bf *data/LegionnairesDisease.rda
3b5803382e1723be4b414c3751633462 *data/OffshoreRigcountsAlaska.rda
54ece8f331045d48c845a292d7f8e6b9 *data/PriceStability.rda
d31a108a1a81183e6a8597675869e7b0 *data/Strikes.rda
7804c9f780d0d74c167db5b0e58ee06c *data/SydColDisc.rda
461f42e0d71706ade553cf1d987a3cc9 *data/WoodPeweeSong.rda
b078f9de09a8d883c7c6766ff45535ac *data/ccprSim.rda
3530659f19b64af6617b976b4be1db61 *data/ftLiardFlows.rda
4c0b6b20588a849923d753ab8f527ada *data/goldparticle380.rda
9db8e364f684fb37dd46e5f2a0d1b138 *data/lesionCount.rda
0b813a6f1fdd54bce982791c3eb2dcca *data/linLandFlows.rda
1e082b39920bd99c5e9216f1ab6a4646 *data/portMannFlows.rda
a2931fd747e1759620afa0e743dacaf2 *data/portMannSedCon.rda
097c21740dfe0360a9442befbb79b35a *data/portMannSedLoads.rda
2656ac33803f83f5d131053efc7c4b6b *inst/READ_ME
dd41961396b612dbb4afc7fdcf73e55e *inst/Ratfor/RCS/afun.r,v
75869a842561e24d282d8ed2fc73eab8 *inst/Ratfor/RCS/bfun.r,v
Expand All @@ -47,23 +102,49 @@ f1d36db9f8e9fda32f12221e55c6dbdd *inst/Ratfor/RCS/gfun.r,v
770ae0f29b53d84c091de81fae008445 *inst/Ratfor/RCS/xfun.r,v
41f0e806077d282c98851bc544b9a5ea *inst/Ratfor/afun.r
17f9bbea01421df7e8c303a1fb5cbb95 *inst/Ratfor/bfun.r
21b74905cf48999c573fc16da65bd783 *inst/Ratfor/getgl.r
92b1f7c5860d39ea7a56c24e3b9615e8 *inst/Ratfor/gethgl.r
58fd89ffba92c2154880332f6e9c1eb2 *inst/Ratfor/getl.r
5cbc32129adddcfc60272834a794ca4a *inst/Ratfor/gfun.r
40201e8652101f856140d17279cf3f4c *inst/Ratfor/makefor
41395d57b572e9fac85b6616aa3853e0 *inst/Ratfor/recurse.r
3ff2ab745591b58c0265a9be9114ae8f *inst/Ratfor/makefor
07dbdfed3c390a6a42346a77335c690c *inst/Ratfor/recurse.r
b97264d24cd7880ce7fbad579da6953b *inst/Ratfor/xfun.r
1bdd1b4d40f5938a949e43adf2985c3b *man/colifCount.Rd
b23dea2a94cbd75103ef4bc1d520945d *man/fitted.hmm.discnp.Rd
6e717b8595df2f86e944748083d98631 *man/hmm.Rd
3018e50f3271c5c040858fb4deadf4aa *man/hmm.discnp-internal.Rd
1ed9fe8a921624273f3f9de5a9830c2f *inst/Save/derivf.R
d5b6bbef9f05af8ad60f97a3186643de *inst/Save/derivp.R
5f22b56259eda2eb0042ab2f5db7f3a0 *inst/Save/expFormCoef.R
1fb72698b50987c6f144159a983f2187 *inst/Save/makeDat.R
95151e6c1fd79f6575124187354e9896 *inst/Save/type3Stuff01.R
490f2358021f2c6dfd573c5e3b474baa *inst/Save/type3Stuff02.R
6790a2a0ad6244294e97111bde57f7fc *inst/inst.c.save
ee255deea7c174b74e9c2071ab3ddd10 *man/SydColDisc.Rd
3f39b95507c4191b458bc3f6bfc545f0 *man/anova.hmm.discnp.Rd
04d8bb786727a927c4e608b559fbd263 *man/ccprSim.Rd
2bf5e8ba9bba3b16564c3f8f0aa478f3 *man/cnvrtRho.Rd
22093346096f9ec36dcce14da8099ac6 *man/fitted.hmm.discnp.Rd
902ea7c8d62d2e3ec2ba667a5043c440 *man/hmm.Rd
a557ac1eedde058293f323e090a929b6 *man/hmm.discnp-internal.Rd
49b6e573c4c613dc2c33cecc0be74e73 *man/hydroDat.Rd
380b1a58283d1143ada76b6e97f0af93 *man/lesionCount.Rd
4f1d5aaeadf7ff2694ec6f7d95804493 *man/logLikHmm.Rd
682f82f6f6e6b471447100b76a1a8725 *man/mps.Rd
39d9594e70e5de72f65d695c1a1dc674 *man/pr.Rd
7e10e5ce42c3094a54a5ab276c3f5915 *man/sim.hmm.Rd
f5c80d7a3141d383d867f2bb6712c1d7 *man/sp.Rd
158d56698ab0e43764fc3cff7ece773c *man/viterbi.Rd
f1f57c6a20eb0a28ffd79efb0f8b1816 *src/afun.f
ee174ec13251743ea33ccbc6f9009291 *src/bfun.f
25ef80dc0168437aafd15bd0fd9974d8 *src/gfun.f
4e902426e7b897b9f3b64a295b2039e0 *src/recurse.f
dc1264652e18b677e558425ce8bd9aa2 *src/xfun.f
7667dd6c19da937c670475fe9bc1e45f *man/logLikHmm.Rd
44f9e42b5f6af0034fe5ea820bd7eba6 *man/macros/defns.Rd
84634825f9c66bd4fd8ffe77677de4dd *man/misstify.Rd
937bbc132965fdc5cdc027e4af7c1926 *man/mps.Rd
27de8c2e3c13c06e86c6c8896fbd6af6 *man/nafracCalc.Rd
96393234d56caeab3c3868f78f06b824 *man/pr.Rd
4113ebaa1ebec16106907d61c535ceea *man/predict.hmm.discnp.Rd
3f0fa3a0407013a62555b45a58d72f33 *man/rhmm.Rd
bb223cc584a241bed747f67033b7c82e *man/scovmat.Rd
229d46dbf367ccb9f54ee0fc0828594d *man/sp.Rd
a776571203b7ef733b6850a21bc33173 *man/squantCI.Rd
4eb2c6411cc04462c8f1a586a181e298 *man/update.hmm.discnp.Rd
fc662fb2e7f5b759cfdfddbd7aa1b0b7 *man/viterbi.Rd
6e879b6b61c6f953f3a2eb8e958ac4c8 *man/weissData.Rd
8fb5832d7d1bee2c0104215e131833c5 *src/afun.f
637c37b232238f0032f15fd1f9352493 *src/bfun.f
84a6def4fee734b4891d2c817d4664d3 *src/getgl.f
3be872b605c44cc58a8b26fd3a9b4c4b *src/gethgl.f
f6c9de360be0cca3742c198d853437dc *src/getl.f
d474b8baa6ca644cb43de57825558905 *src/gfun.f
1babc727ef1c63ada3ce747a57d5599c *src/init.c
db1565451c2c3188dc68c86d9e12868e *src/recurse.f
6596740e33f4d310bc041be782455fcd *src/xfun.f
17 changes: 17 additions & 0 deletions NAMESPACE
Expand Up @@ -2,4 +2,21 @@
# Export everything
exportPattern("*")
S3method(fitted,hmm.discnp)
S3method(anova,hmm.discnp)
S3method(predict,hmm.discnp)
S3method(rhmm,hmm.discnp)
S3method(update,hmm.discnp)
S3method(rhmm,default)
importFrom("stats", "runif")
importFrom("stats", "rbinom")
importFrom("stats", "xtabs")
importFrom("stats", "pchisq")
importFrom("stats", "optim")
importFrom("stats", "coef")
importFrom("stats", "rnorm")
importFrom("nnet",multinom)
importFrom("stats", "nlm")
importFrom("stats", "update")
importFrom("stats", "var")
importFrom("stats", "quantile")
importFrom("stats", "optimize")
13 changes: 8 additions & 5 deletions R/First.R
Expand Up @@ -5,10 +5,13 @@
.onAttach <- function(lib, pkg) {
ver <- read.dcf(file.path(lib, pkg, "DESCRIPTION"), "Version")
packageStartupMessage(paste(pkg, ver))
msg <- paste("\n PLEASE NOTE: The package has changed substantially",
"\n from the 0.0-x versions. New functions have been",
"\n added and both the argument lists and the returned",
"\n values from old functions have new forms. Please",
"\n read the ChangeLog and the documentation.\n")
msg <- paste("\n This package has changed SUBSTANTIALLY from its",
"\n previous release. Read the documentation",
"\n carefully. Note in particular that the meaning of",
"\n the argument \"nsim\" of the function rhmm() has",
"\n changed, and a new argument \"ylengths\" now plays",
"\n essentially the role previously played by \"nsim\".",
"\n A new fitting method \"LM\" which uses the",
"\n Levenberg-Marquardt algorithm is now available.\n")
packageStartupMessage(msg)
}
18 changes: 18 additions & 0 deletions R/anova.hmm.discnp.R
@@ -0,0 +1,18 @@
anova.hmm.discnp <- function(object,...){
obs <- c(list(object),list(...))
if(length(obs) != 2)
stop("This anova method handles only comparisons between two models.\n")
ok <- inherits(obs[[2]],"hmm.discnp")
if(!all(ok)) stop("Second argument is not of class \"hmm.discnp\".\n")
np <- sapply(obs,function(x){x$npar})
o <- order(np)
obs <- obs[o]
np <- np[o]
nu <- np[2]-np[1]
ll <- sapply(obs,function(x){x$log.like})
stat <- 2*(ll[2]-ll[1])
pv <- pchisq(stat,nu,lower.tail=FALSE)
rslt <- list(stat=stat,df=nu,pvalue=pv)
attr(rslt,"details") <- c(ll1=ll[1],ll2=ll[2],np1=np[1],np2=np[2])
rslt
}
27 changes: 0 additions & 27 deletions R/charList.R

This file was deleted.

0 comments on commit 28c7cf0

Please sign in to comment.