Cdap model - #45

Merged

fscottfoti merged 31 commits into

Apr 10, 2015

Commits on Mar 31, 2015

Test data for CDAP routines
jiffyclub
committed
e208506
Test for make_interactions function
jiffyclub
committed
6cefd3a
function for two- and three-person household interactions
jiffyclub
committed
34c6345
extra make_interactions tests
jiffyclub
committed
a2505f2
thinking about how to calculate individual cdap utilities.
jiffyclub
committed
1b3d746
make interactions as dataframes, not series
jiffyclub
committed
7daf843
function for applying "final rules" to individual cdap utilities
jiffyclub
committed
b58c7dd
update "final rules" alternative name to match specs
jiffyclub
committed
23c37e1
function and tests for calculating individual cdap utilities
jiffyclub
committed
345f282
rethinking some of the test data
jiffyclub
committed
24bf71c
Remove final rules from individual utilities calc
jiffyclub
committed
c702e4b
update individual utilities result
jiffyclub
committed
b77292c
function for combining individual utilities into household utilities
jiffyclub
committed
09ca289
move household utils to a test fixture
jiffyclub
committed
36ac525
function that applies "final rules" to household alternatives
jiffyclub
committed
1d6dfdc
new apply_all_people function
jiffyclub
committed
dc444fb
adding example cdap configs back
jiffyclub
committed
11bc301
slight efficiency improvement in apply_all_people
jiffyclub
committed
10d3af3
add cy/toolz + zbox to dependencies
jiffyclub
committed
9cfd9c2
function for making pattern choices for households
jiffyclub
committed
18d0fe3
update required version of zbox
jiffyclub
committed
f74c288
function for going from household choices to people
jiffyclub
committed
8333372
function that brings together cdap
jiffyclub
committed
79e4c7c

Commits on Apr 1, 2015

basic frame for cdap modeling
fscottfoti
committed
08379f1

Commits on Apr 2, 2015

successfully running 1 and 2 person utilities in cdap
fscottfoti
committed
ed06ecb
3 way interactions are live in the cdap model
fscottfoti
committed
8b4d398
has all people, a few edits, and seems to be running
fscottfoti
committed
7cc5367

Commits on Apr 3, 2015

M is not available for retired or non-working
fscottfoti
committed
aeb3a36
add final rules file too
fscottfoti
committed
6851315
actually write the cdap model output to the right place
fscottfoti
committed
903938d

Commits on Apr 6, 2015

Merge branch 'master' into cdap-model
fscottfoti
committed
6c531e3