Skip to content

aglm and mcmc option enhancements #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GrantInnerst wants to merge 62 commits into
base: master
Choose a base branch
from
Open

aglm and mcmc option enhancements #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
7a661e7
Implementing Hit and Run algorithm in metropolis
Jun 1, 2017
5d2824b
metropolis_hypergeometric_cpp fixes
Jun 6, 2017
86ee68d
hit_and_run in metropolis_uniform_cpp and loglinear
Jun 9, 2017
52ffef7
hit_and_run cleanup and sis in algstat
Jun 28, 2017
9a313f9
non-uniform move sampling; sis fix
Jul 10, 2017
2e46158
random fix
Jul 10, 2017
746eae5
another sis fix, non_uniform to metropolis_uniform_cpp
Jul 10, 2017
6bfc885
adding include file
Jul 11, 2017
768ba09
updating sis and loglinear
Jul 13, 2017
70bfc21
updating sis again
Jul 13, 2017
66671d7
sis
Jul 13, 2017
e3140b3
poisson and logistic regression in R
Jul 27, 2017
6b23d54
various fixes to new schemes, poisson and logistic regression adds an…
Aug 17, 2017
04c5b18
hit_and_run inner MCMC addition
Aug 25, 2017
58acad5
pois_reg name fix
Aug 25, 2017
e7d8a63
poisson, metropolis fixes
Sep 22, 2017
e2d607e
pois_reg fixes
Sep 22, 2017
3a17045
Mass changes to pmat and poisson
Oct 5, 2017
f000b88
pois_reg can now have multiple covariates
Oct 11, 2017
1506478
changes to logistic and poisson regression
Nov 10, 2017
7345e16
Aglm function added, pois_reg and log_reg deleted
Nov 27, 2017
515511f
rm .DS_Store forever (hopefully)
dkahle Nov 28, 2017
2c2ca6e
cleanup and aglm namechange
Nov 28, 2017
faa1466
Merge branch 'master' of https://github.com/GrantInnerst/algstat
Nov 28, 2017
8c05b00
fixes to the syntax etc.
Dec 4, 2017
8c3166f
naming convention changes
GrantInnerst Dec 17, 2017
7bb6d5d
metropolis example added, commented code removed
GrantInnerst Dec 30, 2017
4dedfee
fix typos, change aglm example
Jan 8, 2018
caef936
merging with upstream master
Jan 11, 2018
0b17277
small fixes after merge
Jan 11, 2018
6be6b68
example fixes in metropolis.r
Jan 11, 2018
25941a8
plyr to dplyr
Mar 2, 2018
a68a445
added extra out-arg to metropolis for testing
Mar 16, 2018
f704485
rm DS_Store
Mar 18, 2018
7ae3c04
merge conflicts
GrantInnerst Mar 22, 2018
b079fe5
initial greedy algorithm and others
GrantInnerst Apr 14, 2018
57e0901
change code placement to include adaptive scheme
GrantInnerst Apr 15, 2018
9785fb0
added efficient sample size calc
GrantInnerst May 13, 2018
cd8ac1f
ESS modification
GrantInnerst May 22, 2018
294be55
change ess to make match stan function
GrantInnerst May 22, 2018
94f401f
move neff calculation to seperate function
GrantInnerst May 22, 2018
df0a67f
forgot to take out neff of metropolis
GrantInnerst May 22, 2018
9d90c0f
This is my sample commit
GrantInnerst Jun 1, 2018
e6dd221
removing comment
GrantInnerst Jun 1, 2018
06012f7
import dplyr to importFrom dplyr, algm fixes
GrantInnerst Jun 13, 2018
9edab7c
typo fix, small changes to aglm function
GrantInnerst Jul 27, 2018
a45b60f
add segre product
GrantInnerst Aug 3, 2018
8e50244
refactor metropolis acceleration options
Oct 17, 2018
82e1377
temporary changes for dissertation illustration
Jan 4, 2019
6bb87fc
reverting to proper value in non-uniform sampler
Jan 5, 2019
26b46ed
pull from upstream master, fix merge conflicts
GrantInnerst Feb 6, 2019
9ad8895
merge conflict resolution
GrantInnerst Feb 13, 2019
b70ac96
Merge branch 'master' of https://github.com/dkahle/algstat
GrantInnerst Feb 19, 2019
419a0e7
merge branch with upstream master
GrantInnerst Apr 26, 2019
9ffbcb6
Merge branch 'master' of https://github.com/dkahle/algstat
GrantInnerst Apr 26, 2019
f1feba5
updates to aglm()
GrantInnerst May 22, 2019
b319363
remove sis stuff
GrantInnerst May 22, 2019
958f7d0
fix cpp warning
GrantInnerst May 22, 2019
bd88401
add control argument and change parsing in aglm
GrantInnerst Jun 20, 2019
6e8c9c5
improving examples in aglm, remove c++ sis for now
GrantInnerst Aug 29, 2019
b6cf170
pull from upstream master
GrantInnerst Aug 30, 2019
71be736
change in reexports file
GrantInnerst Aug 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
src/*.o
src/*.so
src/*.dll
R/.DS_Store
.DS_Store
10 changes: 10 additions & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export(Mmaker)
export(Pmaker)
export(Smaker)
export(Tmaker)
export(aglm)
export(array2tab)
export(bump)
export(cellBound)
Expand All @@ -30,13 +31,15 @@ export(lpnorm)
export(mchoose)
export(metropolis)
export(plot_matrix)
export(pmat)
export(project_onto)
export(project_onto_perp)
export(rawMetropolis)
export(rfiber)
export(rmove)
export(rvnorm)
export(rvotes)
export(segre)
export(spectral)
export(subsets)
export(tab2array)
Expand All @@ -53,7 +56,9 @@ import(m2r)
import(mpoly)
importFrom(dplyr,bind_cols)
importFrom(dplyr,bind_rows)
importFrom(dplyr,group_by)
importFrom(dplyr,mutate)
importFrom(dplyr,summarise)
importFrom(ggplot2,aes)
importFrom(ggplot2,coord_equal)
importFrom(ggplot2,element_blank)
Expand Down Expand Up @@ -82,11 +87,15 @@ importFrom(purrr,cross_df)
importFrom(purrr,map)
importFrom(purrr,set_names)
importFrom(reshape2,melt)
importFrom(stats,acf)
importFrom(stats,deriv)
importFrom(stats,dmultinom)
importFrom(stats,loglin)
importFrom(stats,model.frame)
importFrom(stats,poisson)
importFrom(stats,runif)
importFrom(stats,sd)
importFrom(stats,terms)
importFrom(stringr,"str_sub<-")
importFrom(stringr,str_c)
importFrom(stringr,str_detect)
Expand All @@ -100,4 +109,5 @@ importFrom(tibble,tibble)
importFrom(tidyr,gather)
importFrom(utils,combn)
importFrom(utils,download.file)
importFrom(utils,type.convert)
useDynLib(algstat)
Loading