Skip to content
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.

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

WIP: Rv restructure #1

Draft
wants to merge 149 commits into
base: rv_test_functions
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
2a086f8
createConstraints() restructured, n added to stop argument in tests
RivkadeVries Nov 30, 2015
bf30ba1
stop_test() renamed and restructured
RivkadeVries Nov 30, 2015
f9a9af6
File name test_must_stop adapted
RivkadeVries Nov 30, 2015
d4f6231
prob restructured and renamed into probabilities_and_likelihoods
RivkadeVries Dec 1, 2015
fb85c16
get_ll_in_nlm_format() removed
RivkadeVries Dec 2, 2015
0da37a5
get_fisher_information restructured
RivkadeVries Dec 2, 2015
5b132e4
Some bugs fixed
RivkadeVries Dec 3, 2015
7841373
Bugs fixed
RivkadeVries Dec 3, 2015
d49b6d8
estimate_latent_trait restructured
RivkadeVries Dec 3, 2015
5d78600
test_must_stop simplified
RivkadeVries Dec 3, 2015
f942610
get_item_index_max_information restructured
RivkadeVries Dec 3, 2015
2d2317d
get_item_index_max_information_constrained(), get_item_information(),…
RivkadeVries Dec 6, 2015
1eba517
test_must_stop() simplified
RivkadeVries Dec 6, 2015
2d495f9
get_best_item(), get_next_item(), ShadowCAT(), and simulate_answer() …
RivkadeVries Dec 7, 2015
7eab1c5
Documentation ShadowCAT adapted, initial estimate and variance in tes…
RivkadeVries Dec 8, 2015
ab8dd73
Prior <- NULL removed from probabilities_and_likelihoods()
RivkadeVries Dec 8, 2015
d5c4b63
Prior, eta, guessing arguments moved to different place
RivkadeVries Dec 8, 2015
d696fd3
Documentation: prior does not need to be defined anymore when not req…
RivkadeVries Dec 8, 2015
b29d6ca
Some documentation changed, initTest() and initPerson() removed, outp…
RivkadeVries Dec 8, 2015
86e4aff
file constraints_correct_format renamed into constraints_lp_format
RivkadeVries Dec 8, 2015
e1f7a6c
subset.ShadowCAT.items removed, file names ShadowCAT in lowercase
RivkadeVries Dec 8, 2015
d19e646
simulate functions moved to testthat folder
RivkadeVries Dec 8, 2015
ce766a2
Documentation and wording improved in simulate functions
RivkadeVries Dec 8, 2015
a095656
simulate_answer() simplified
RivkadeVries Dec 8, 2015
6ee5ca0
Uppercase X into lowercase x
RivkadeVries Dec 8, 2015
f45f3a1
In test probabilities_and_likelihoods changed theta values in non zer…
RivkadeVries Dec 9, 2015
a41185f
In tests get_fisher_information changed theta values into nonzero values
RivkadeVries Dec 9, 2015
ad6089c
Unused test files removed
RivkadeVries Dec 9, 2015
1b7e922
Test functions in estimate_latend_trait() with EAP estimate un-commented
RivkadeVries Dec 9, 2015
8b8fc62
Tests with EAP uncommented for get_posterior_expected_l_information a…
RivkadeVries Dec 9, 2015
6e5ee3d
Two EAP estimates added to test shadowcat_roqua
RivkadeVries Dec 9, 2015
a04d524
First few EAP simulations. PEKL does not seem to work well yet
RivkadeVries Dec 9, 2015
ec67933
EAP example uncommented in estimate_latent_trait file
RivkadeVries Dec 10, 2015
ee2197a
Bug posterior_expected_kl_information (PEKL) solved, some simulations…
RivkadeVries Dec 10, 2015
d1a5be3
ML in test that title
RivkadeVries Dec 10, 2015
7bba862
Safe_ml now uses EAP instead of MAP. Need to run new simulations with…
RivkadeVries Dec 10, 2015
ec6a1f4
Argument estimator in sub functions estimate_latent_trait() removed
RivkadeVries Dec 10, 2015
74679bd
Safe_ml changed into safe_nlm, that is, there is now a safe option fo…
RivkadeVries Dec 10, 2015
766b2d9
Option added to simulate varying number of item steps
RivkadeVries Dec 10, 2015
ae8469d
Simulation results added for one dimension, estimators ML and MAP
RivkadeVries Dec 11, 2015
8322547
Simulation results one dimension, EAP estimate added
RivkadeVries Dec 11, 2015
3fa241b
Simulations 3 dimensions ML and MAP added
RivkadeVries Dec 14, 2015
a8b222c
Small documentation changes
RivkadeVries Dec 15, 2015
7ef3876
simulate_testbank restructured
RivkadeVries Dec 16, 2015
470c161
Bugs fixed in simulate_testbank()
RivkadeVries Dec 16, 2015
c5ebbe0
Option added for minimum number of items to be administered
RivkadeVries Dec 16, 2015
d72426c
Tests added for zero start items
RivkadeVries Dec 16, 2015
aa2b76c
Useless prior definition removed
RivkadeVries Dec 17, 2015
ed49c00
Separate code for first iteration removed in shadowcat_roqua()
RivkadeVries Dec 17, 2015
d429606
cutoff criterion added in test_must_stop()
RivkadeVries Dec 17, 2015
b54cbee
randomByDimension and nByDimension in lowercase
RivkadeVries Dec 17, 2015
0716313
Documentation added for test_shadowcat_roqua()
RivkadeVries Jan 4, 2016
f53fed6
Docker- and guard file removed
RivkadeVries Jan 6, 2016
3826428
instakk-package-dependencies fixed
RivkadeVries Jan 6, 2016
27f5974
Documentation added for simulation functions
RivkadeVries Jan 12, 2016
b471b54
constraints argument changed into constraints_and_characts
RivkadeVries Jan 12, 2016
db52454
objective changed into information summary
RivkadeVries Jan 13, 2016
fb61891
In documentation: get_item_information instead of objective
RivkadeVries Jan 13, 2016
33a7267
objective should information summary in test
RivkadeVries Jan 13, 2016
e50616f
Bug fixed in computation of Fisher information for GRM and SM model
RivkadeVries Jan 18, 2016
b6c209e
superfluous item_selection arg removed
RivkadeVries Jan 28, 2016
f359716
get_D_GRM and get_D_GPCM with sapply()
RivkadeVries Feb 1, 2016
a280ddc
Capitals removed in get_fisher_information()
RivkadeVries Feb 1, 2016
12ba9d6
name change and sm information with sapply
RivkadeVries Feb 1, 2016
1e001a7
constraints_lp_format slightly formatted
RivkadeVries Feb 1, 2016
74ff08a
Documentation improved, likelihoods should be likelihood
RivkadeVries Feb 2, 2016
0c80efa
indices changed into indeces
RivkadeVries Feb 2, 2016
55cea23
information_summary options with full names rather than abbreviations
RivkadeVries Feb 2, 2016
717e3ec
estimator options in lower case and no abbreviation
RivkadeVries Feb 2, 2016
e0642df
Small renames in probabilities_and_likelihood, some comments removed
RivkadeVries Feb 4, 2016
4199af6
probabilities_and_likelihoods() split up into three functions
RivkadeVries Feb 4, 2016
9235fd7
Default for responses in get_probs_and_likelihoods_per_item()
RivkadeVries Feb 4, 2016
347d5ef
get_probabilities() removed
RivkadeVries Feb 4, 2016
019a27a
shadowcat_roqua now returns list with next item key, estimate, and na…
RivkadeVries Feb 8, 2016
a3498b5
shadowcat_roqua restructured a bit, bug in test-get_probs_and_likelih…
RivkadeVries Feb 8, 2016
0c3d6b8
if (is.null(beta)) removed in get_guessing()
RivkadeVries Feb 8, 2016
664cfcc
Comment stringr removed
RivkadeVries Feb 9, 2016
e273cfa
Unnecessary random seeds removed, second bug in test-get_probs_and_li…
RivkadeVries Feb 9, 2016
8065124
Shadowcat returns error in case of missing or all zero item informati…
RivkadeVries Feb 11, 2016
329a496
Tests added for validate, some bugs in validate fixed
RivkadeVries Feb 11, 2016
db6d221
Small changes in documentation
RivkadeVries Feb 15, 2016
abe7e3f
exposure() removed, some comments changed or removed
RivkadeVries Feb 15, 2016
ea8fc54
get_posterior_expected_kl_information() made more efficient
RivkadeVries Feb 15, 2016
aaec541
shadowcat_roqua renamed into shadowcat
RivkadeVries Feb 15, 2016
95870ed
file names changed
RivkadeVries Feb 15, 2016
e671efa
shadowcat_roqua() removed
RivkadeVries Feb 15, 2016
6c578ad
Documentation and validate extended for constraints_lp_format()
RivkadeVries Feb 16, 2016
64aa72c
Documentation improved
RivkadeVries Feb 16, 2016
ba6e9bc
Extra tests for random by dimension sampling
RivkadeVries Feb 16, 2016
98b81be
Comments for random_by_dimension adapted
RivkadeVries Feb 16, 2016
5d0c4cc
get_fisher_informaton() without estimator argument
RivkadeVries Feb 16, 2016
58e5da9
Temporary init_quad added, which should be a correct version of the i…
RivkadeVries Feb 17, 2016
6b169b0
Faster eval_quad()
RivkadeVries Feb 18, 2016
7a2acb9
Temporarily eval_quad added
RivkadeVries Feb 18, 2016
da01fd3
In 3 dim test voor EAP: "AEP" should be expected_aposteriori; error f…
RivkadeVries Feb 18, 2016
764f291
Comment added regarding negative likelihoods
RivkadeVries Feb 18, 2016
f8a48d5
Simulations added for Jan Bebber
RivkadeVries Feb 18, 2016
ee20e5c
Comment added to simulations for Jan Bebber
RivkadeVries Feb 18, 2016
521e7e8
max_n defined outside arguments line
RivkadeVries Feb 19, 2016
5622b82
eval_quad only adds a number to f if values in f are small
RivkadeVries Feb 20, 2016
61270cd
m in eval_quad() adapted
RivkadeVries Feb 20, 2016
b981c03
Simulation results EAP, one dimension, one replication per condition
RivkadeVries Feb 20, 2016
98ef5bb
Simulations redone for "one dimension, no constraints on item selecti…
RivkadeVries Feb 20, 2016
bcd733d
Simulations for Jan Bebber adapted, eval_quad back to old version
RivkadeVries Feb 22, 2016
1b81ed1
eval.quad and init.quad used from MultiGHQuad package
RivkadeVries Feb 23, 2016
7a72da9
Option for minimum n added to simulation function
RivkadeVries Feb 23, 2016
06d94d4
Simulations added with empirical item bank of Jan Bebber
RivkadeVries Feb 23, 2016
ba33da2
Simulations with empirical item bank with true theta = 3 added
RivkadeVries Feb 23, 2016
a0950c0
Simulation results one iteration per condition added for Bayesian est…
RivkadeVries Feb 23, 2016
785399e
Simulation results one replication per condition for maximum likelihood
RivkadeVries Feb 23, 2016
85dfa6a
Comment removed
RivkadeVries Feb 23, 2016
29ee631
Simulation results added for one dimension, ML estimator
RivkadeVries Feb 24, 2016
56933f8
Remove empirical itembank from package
RivkadeVries Feb 24, 2016
e79c025
Merge branch 'rv_restructure' of github.com:roqua/ShadowCAT into rv_r…
RivkadeVries Feb 24, 2016
7fc1c01
More detailed simulation results for one dimension, ML estimator
RivkadeVries Feb 24, 2016
c05c8a0
Simulations for one dimension and maximum likelihood estimator now re…
RivkadeVries Feb 25, 2016
3f5930d
Last test line for one dimension, ML estimator
RivkadeVries Feb 25, 2016
b5cef36
Conditions for simulations MAP one dimension set
RivkadeVries Feb 25, 2016
a5fd2fd
Simulation results added for MAP estimator, one dimension
RivkadeVries Feb 26, 2016
296fc7a
Simulation results added for EAP estimator, one dimension
RivkadeVries Feb 28, 2016
81cdc10
variance as separate parameter rather than as attribute in shadowcat(…
RivkadeVries Mar 1, 2016
184624d
Simulation results added for three dimensions, EAP estimator
RivkadeVries Mar 8, 2016
e86ba01
Extra checks added
RivkadeVries Mar 17, 2016
b8ee710
continue_test element added to shadowcat output
RivkadeVries Mar 17, 2016
9d22c1b
Documentation item_information improved
RivkadeVries Mar 29, 2016
002c1b0
Name change: get_item_information changed into get_summarized_informa…
RivkadeVries Mar 29, 2016
405f892
number grid points also defined for > 5 dimensions
RivkadeVries Mar 29, 2016
d6484c7
Validate checks added
RivkadeVries Apr 5, 2016
734e552
get_eap_estimate_riemannsum() added
RivkadeVries Apr 6, 2016
1d1a85b
Shadow cat now allows choice between gauss hermite quadrature and rie…
RivkadeVries Apr 6, 2016
57d0901
get_eap_estimate_riemannsum() now allows choice between riemannsum or…
RivkadeVries Apr 7, 2016
2c3068e
Small change in documentation for get_eap_estimate_riemannsum()
RivkadeVries Apr 7, 2016
45edffa
responses changed into answers
RivkadeVries Apr 11, 2016
a45a477
In PEKL likelihood_or_post_density_theta estimator should be EAP
RivkadeVries Apr 12, 2016
6fc748d
My name added to authors
RivkadeVries Apr 12, 2016
39abc91
Bug cutoffs fixed
RivkadeVries Apr 13, 2016
dd4425d
Test for test_must_stop slightly changed
RivkadeVries Apr 13, 2016
c8ce42f
Shadow cat can now handle uniform prior, and the mean of the normal p…
RivkadeVries Apr 20, 2016
62e391a
Tests added for uniform prior and non zero prior mean, safe_maximum r…
RivkadeVries Apr 22, 2016
0687fda
MAP should be maximum a posteriori in documentation
RivkadeVries Apr 22, 2016
65ae263
Comment added in estimate_latent_trait example
RivkadeVries Apr 22, 2016
9144e2d
get_item_index_max_information() takes finished dimensions into account
RivkadeVries Apr 26, 2016
8219930
Simulations rerun for one repetition per condition
RivkadeVries Apr 26, 2016
312c317
Simulations added for uniform prior one dimension
RivkadeVries May 21, 2016
23c7df0
Safer grid point transformation with uniform prior, simulations added…
RivkadeVries May 25, 2016
79831f7
Simulations added 3 dim EAP estimator uniform prior; better definitio…
RivkadeVries May 31, 2016
2d5a067
Better tests characteristics and constraints added
RivkadeVries Jun 1, 2016
d8ce30d
Checks NA patterns beta and eta added; indeces corrected as indices
RivkadeVries Jun 1, 2016
66b901d
init.quad with forcePD
RivkadeVries Jun 1, 2016
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
11 changes: 6 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Title: Multidimensional Computer Adaptive Testing with the Shadow Testing
Procedure
Version: 0.1
Date: 2015-02-17
Author: Karel A. Kroeze
Author: Karel A. Kroeze, Rivka M. de Vries (Roqua)
Maintainer: Karel A. Kroeze <karel.kroeze@gmail.com>
Description: Allows simulation and live administration of Computer Adaptive
tests. Options include; 4 models (3PLM, GPCM, GRM, SM), 3 estimators (ML, MAP,
Expand All @@ -15,11 +15,12 @@ LazyData: true
LinkingTo: Rcpp
Imports:
Rcpp,
stats,
mvtnorm,
MultiGHQuad,
lpSolve
lpSolve,
matrixcalc,
Matrix
Suggests:
testthat (>= 0.8.1),
pbapply
RoxygenNote: 5.0.0
stringr
RoxygenNote: 5.0.1
106 changes: 0 additions & 106 deletions Guardfile

This file was deleted.

48 changes: 28 additions & 20 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,38 +1,46 @@
# Generated by roxygen2: do not edit by hand

S3method(subset,ShadowCAT.items)
export("%not_in%")
export(FI)
export(MI)
export(ShadowCAT)
export(answer)
export(best_item)
export(as.scalar2)
export(categorical_to_dummy)
export(createConstraints)
export(createExposureConstraint)
export(createTestBank)
export(estimate)
export(initItembank)
export(initPerson)
export(initTest)
export(characteristics_correct_format)
export(constraints_correct_names)
export(constraints_correct_operators)
export(constraints_correct_structure)
export(constraints_correct_targets)
export(constraints_lp_format)
export(estimate_latent_trait)
export(get_best_item)
export(get_eap_estimate_riemannsum)
export(get_fisher_information)
export(get_item_index_max_information)
export(get_next_item)
export(get_probs_and_likelihoods_per_item)
export(get_subset)
export(get_summarized_information)
export(lapply_return_array)
export(likelihood_or_post_density)
export(matrix_apply)
export(next_item)
export(move_values_to_means)
export(na_only_end_rows)
export(na_only_end_vector)
export(no_missing_information)
export(number_non_missing_cells_per_row)
export(objective)
export(prob)
export(remove_rows_outside_bounds)
export(row_cumsum)
export(row_names_are_equal)
export(row_or_vector_sums)
export(rsapply)
export(shadowcat_roqua)
export(stop_test)
export(shadowcat)
export(sum_loop_outputs)
export(transpose_if_ncol_and_nrow_larger_1)
export(test_must_stop)
export(validate_and_run)
export(validate_and_run.test)
importFrom(Matrix,nearPD)
importFrom(MultiGHQuad,eval.quad)
importFrom(MultiGHQuad,init.quad)
importFrom(Rcpp,evalCpp)
importFrom(lpSolve,lp)
importFrom(matrixcalc,is.positive.definite)
importFrom(mvtnorm,dmvnorm)
importFrom(stats,nlm)
useDynLib(ShadowCAT)
155 changes: 0 additions & 155 deletions R/ShadowCAT.R

This file was deleted.

Loading