Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
38da076
add capital adj cost functions
jdebacker Apr 18, 2019
14f738e
add adj costs parameters to default params
jdebacker Apr 18, 2019
5765070
move assignement of mu to parameters.py
jdebacker Apr 22, 2019
51405d9
make stationarized versions of adjustment cost functions
jdebacker Apr 22, 2019
95b25d1
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker May 1, 2019
d1e3dee
add test of adj cost function
jdebacker May 2, 2019
9455cca
make adj cost derivatives more clear
jdebacker May 2, 2019
3a46039
add tests for adj cost deriv functions
jdebacker May 2, 2019
e9d2339
fix typo in adj cost deriv
jdebacker May 2, 2019
960e392
add second test of adjust cost functions
jdebacker May 2, 2019
839ed74
test adj cost funcs over time path
jdebacker May 3, 2019
3048d5c
add MPK and MPL functions
jdebacker May 10, 2019
08ecd3a
get_r func
jdebacker May 10, 2019
a1e3656
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker May 13, 2019
3be9d45
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Jul 26, 2019
48c83d1
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Aug 4, 2019
44941c2
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Sep 4, 2019
81bd2c6
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Sep 12, 2019
aa49a8b
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Oct 16, 2019
0a0f4f1
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Nov 6, 2019
680efc2
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Nov 13, 2019
81f34ce
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Dec 10, 2019
68e1222
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Dec 27, 2019
680eb8a
merge in master
jdebacker Apr 4, 2020
320931e
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Apr 10, 2020
2104f2c
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker May 6, 2020
e9f8f8d
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker May 13, 2020
69eec46
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Jun 17, 2020
eef0785
add function to compute NPV of depr deductions
jdebacker Jun 18, 2020
2b671fd
test of SS NPV calc
jdebacker Jun 18, 2020
fe98ec4
follow updated param schema
jdebacker Jun 18, 2020
1594a5c
update param values, expected NPV
jdebacker Jun 18, 2020
4034c60
add function to compute law of motion of tax basis for capital stock,…
jdebacker Jun 18, 2020
2baab53
add functions to solve for firm capital demand
jdebacker Jun 18, 2020
999d9af
add function to compute dep val on old capital and test
jdebacker Jun 18, 2020
47ad616
add function to compute q and test it
jdebacker Jun 18, 2020
a9c005a
change notation
jdebacker Jun 19, 2020
ac4202a
test of firm.FOC_I, real exp string
jdebacker Jun 21, 2020
10f7f42
remove unused imports
jdebacker Jun 22, 2020
d39c540
update get_r to include dynamic version
jdebacker Jun 22, 2020
9c412a1
update NPV of depr function and test
jdebacker Jun 22, 2020
6e1a56a
test NPV depr function for constant params
jdebacker Jun 23, 2020
a0ee40a
update npv depr function for non-constant tax params, test it
jdebacker Jun 26, 2020
2cc5926
fix get_I calcs
jdebacker Jul 2, 2020
4c9a490
separate gross and net investment functions
jdebacker Jul 3, 2020
d16606b
use new invest funcs when called
jdebacker Jul 3, 2020
a3184a8
update firm.get_r tests and function for dyn firms
jdebacker Jul 3, 2020
3d69a43
add test for get Y from K
jdebacker Jul 3, 2020
f1d908f
add tests for get_K_demand
jdebacker Jul 4, 2020
e2729c6
update eqn for K_tau law of motion for stationarization
jdebacker Jul 7, 2020
b4d8a96
save at in progress of testing/stationarizing
jdebacker Jul 7, 2020
8f34b05
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Jul 26, 2020
01c1e0d
update tests of get_K_demand for all cases
jdebacker Jul 27, 2020
961c22d
begin refactoring SS algo
jdebacker Jul 27, 2020
6338f5f
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Jul 31, 2020
f345df8
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Aug 6, 2020
8be70ee
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Aug 16, 2020
31ae7dc
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Aug 19, 2020
d5a0a69
temp commit
jdebacker Aug 19, 2020
20bf853
temp commit
jdebacker Aug 19, 2020
854f14e
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Aug 20, 2020
08d934e
temp commit
jdebacker Aug 20, 2020
aba4ccd
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Aug 20, 2020
ae8787e
passing inner loop test
jdebacker Aug 20, 2020
49f60c5
clean up test
jdebacker Aug 21, 2020
bc89388
update SS_solver to pass tests for closed econ with delta tau =0
jdebacker Aug 25, 2020
cd68c61
del keys not in new dict
jdebacker Aug 25, 2020
a706d41
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Oct 5, 2020
7e4df8f
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Oct 16, 2020
986fa38
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Oct 29, 2020
6855b25
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Nov 4, 2020
2686ba7
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Nov 23, 2020
88cf03d
save more vars to output dict
jdebacker Nov 24, 2020
43771ee
begin update tpi for dyn firm
jdebacker Nov 24, 2020
71c2894
fix indexes
jdebacker Nov 25, 2020
3e5a763
more fixes to try to get Tpi working
jdebacker Nov 26, 2020
1af1cfe
temp commits
jdebacker Dec 3, 2020
5d7fce3
Merge remote-tracking branch 'upstream/master' into dyn_firm
jdebacker Dec 17, 2020
d8c38b9
temp commit
jdebacker Dec 20, 2020
769932d
make delta_tau=0 closed econ test
jdebacker Dec 20, 2020
9cbb7e6
merge in master and fix conflict
jdebacker Jan 31, 2021
09bf7ac
placeholder
jdebacker Feb 4, 2021
16d6a4c
update delta tau=0 test to use closed economy
jdebacker Feb 5, 2021
f91d455
Merge branch 'new_test_delta0' into dyn_firm
jdebacker Feb 5, 2021
0386723
sync with master
jdebacker Mar 25, 2021
c19283f
save more objects for testing
jdebacker Mar 26, 2021
9c8dfe5
merge in upstream/master
jdebacker Jul 20, 2021
6b2eaf9
fix conflicts
jdebacker Aug 13, 2021
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
Prev Previous commit
Next Next commit
add function to compute q and test it
  • Loading branch information
jdebacker committed Jun 18, 2020
commit 47ad6164936b080ce6bd4443762d755347877abf
24 changes: 24 additions & 0 deletions ogusa/firm.py
Original file line number Diff line number Diff line change
Expand Up @@ -540,3 +540,27 @@ def get_X(Z, K_tau):
X = Z * K_tau

return X


def get_q(K, V, X):
r'''
Computes Tobin's q, the marginal increase in firm value for an
additional unit of capital. Derived from Hayashi's (1982) proof
that marginal q = average q under quadratic adjustment costs.

..math::
q_{t} = \frac{V_{t} - X_{t}}{K_{t}}

Args:
K (array_like): firm capital stock
V (array_like): firm value
X (array_like): value of future depreciation deductions on
existing capital

Returns:
q (array_like): Tobin's q

'''
q = (V - X) / K

return q
14 changes: 14 additions & 0 deletions ogusa/tests/test_firm.py
Original file line number Diff line number Diff line change
Expand Up @@ -568,3 +568,17 @@ def test_get_X():
test_val = firm.get_X(Z, K_tau)

assert np.allclose(test_val, expected_val)


def test_get_q():
'''
Test of firm.get_q()
'''
expected_val = 1.3
K = 1.0
V = 2.0
X = 0.7

test_val = firm.get_q(K, V, X)

assert np.allclose(test_val, expected_val)