Commit Graph

347 Commits (cb411e5642ecd6978c86d4ad3dfca15fa840c913)

Author SHA1 Message Date
Houtan Bastani 6e9e2eac40 preprocessor: write JSON output for cross refs #1387 2017-03-10 17:28:25 +01:00
Houtan Bastani bab5d9bea1 Merge branch 'master' into json 2017-03-10 17:20:15 +01:00
Houtan Bastani cde54d7ad4 Revert "preprocessor: write equation cross references in JSON. #1387"
This reverts commit 0ccc82300c3046d159554c24027ded09a93b687e.
2017-03-10 17:18:41 +01:00
Houtan Bastani b4ac9aac8d preprocessor: add lag info to equation cross references. closes #1398 2017-03-10 16:59:52 +01:00
Houtan Bastani 2a3ef9d168 preprocessor: write equation cross references in JSON. #1387 2017-03-06 16:34:08 +01:00
Houtan Bastani 746f88eb6e preprocessor: create two different static and dynamic files with the option jsonprintderivdetail. #1387 2017-03-03 14:42:37 +01:00
Houtan Bastani 1b3cccb602 Merge branch 'master' into json 2017-03-03 14:42:25 +01:00
Houtan Bastani 5fbadbadd3 preprocessor: make JSON output start counting at 1 instead of 0. #1387 2017-03-02 17:34:34 +01:00
Houtan Bastani fc48bf26b9 preprocessor: write error messages to cerr instead of cout, replace \n with endl 2017-03-01 12:44:31 +01:00
Houtan Bastani 301c9691d9 preprocessor: JSON output aesthetic fixes, support planner objective. #1387 2017-02-27 15:40:34 +01:00
Houtan Bastani 915bea91a1 preprocessor: output JSON after different steps, write static, dynamic, params derivs files in JSON. #1387 2017-02-24 17:43:22 +01:00
Houtan Bastani ad84914118 preprocessor: for consistency, use equations.size() instead of equation_number() in classes that have equations as a field 2017-02-24 11:20:54 +01:00
Houtan Bastani 5e1d20c8d9 preprocessor: replace exit(1) with exit(EXIT_FAILURE) 2017-02-09 12:46:37 +01:00
Houtan Bastani 64642d928c preprocessor: write JSON output. #1387 2017-02-06 17:41:18 +01:00
Houtan Bastani a8cb5d7e61 fix nested parens for params derivatives. closes #1201 2017-01-05 18:19:37 +01:00
Houtan Bastani a14fdd204f when >32 nested parens encountered in matlab, print error message once per file in which such a situation occurred. #1201 2017-01-05 15:19:13 +01:00
Houtan Bastani eac97a8f49 first iteration of fix for nested parenthesis in matlab. #1201 2016-12-30 18:14:08 +01:00
Houtan Bastani 486891e75f bug fix: end preprocessing with error when more than 32 nested parenthesis are encountered. closes #1201 2016-12-28 14:02:50 +01:00
Houtan Bastani 453b753021 block: fix bug introduced in e410043c244d251164638f9a0b3646e23e3d125d. #1245 2016-11-29 16:45:50 +01:00
Houtan Bastani 67c4bd0126 block: add default argument for _dynamic functions: `varargout{1} = NaN;` #1245 2016-11-29 15:18:59 +01:00
Houtan Bastani b2963ae558 preprocessor: define var for normcdf + msvc. #1259 2016-10-17 14:59:07 +02:00
Houtan Bastani 61b2be2a2c preprocessor: add normcdf for MSVC. closes #1259 2016-10-14 16:11:44 +02:00
Houtan Bastani 2385b7b5c1 preprocessor: clean up writePowerDeriv code. it only writes C code, so no need for use_dll argument 2016-10-14 14:30:14 +02:00
Johannes Pfeifer 3fada757d6 Correct comment in _dynamic files that misstated columns of derivative matrices 2016-08-22 19:24:35 +02:00
Houtan Bastani e4745e040a preprocessor: Return equation numbers/tags in error message when linear model contains nonzero hessian entries. #419 2016-07-27 15:01:54 -04:00
Houtan Bastani c4ef3575f2 preprocessor: always write M_.state_var #637 2016-07-20 17:09:46 -04:00
Stéphane Adjemian (Hermes) 35da55ab03 Fixed dynamic model (julia output)
The number of columns in the Jacobian matrix is the number of endogenous
variables appearing at time t-1, t and t+1 plus the number of exogenous
variables.
2016-06-14 11:21:23 +02:00
Houtan Bastani 77c8a41514 preprocessor: fix bug in writing of temporary terms. closes #1201 2016-06-01 15:29:10 +02:00
Stéphane Adjemian (Hermes) 0751b50a86 Bug fix in assert (Julia output).
See PR #1102 by spencerlyon2.

size always returns a tuple, and we were comparing to an int. Dispatch restricts these arguments to all be vectors so length works here.
2016-05-23 13:48:19 +02:00
Stéphane Adjemian (Hermes) 59740f6804 Fixed type issues.
params, exo_steady_state and steady_state are vectors not matrices!
2016-05-23 13:48:19 +02:00
Stéphane Adjemian (Hermes) 0d8e583daa Cosmetic changes.
+ Renamed model as model_
+ Renamed options as options_
+ Renamed output as oo_
+ Also export oo_ and options_
+ Fixed typos in comments.
2016-05-23 13:48:19 +02:00
Houtan Bastani 323fe8d41a preprocessor: replace no_2nd_order_params_derivs with params_deriv_order. #1187 2016-05-18 12:26:19 +02:00
Houtan Bastani 48928c61ce Revert "preprocessor: add params_derivs_order to identification and sensitivity. #1187"
This reverts commit 6192a6a7765e7bde388f4a6feac4362d1e9fd284.
2016-05-18 10:33:45 +02:00
Houtan Bastani b898bfea6e preprocessor: add params_derivs_order to identification and sensitivity. #1187 2016-05-17 17:18:16 +02:00
Houtan Bastani 0b922739a6 preprocessor: only compute first order derivatives w.r.t. parameters with identification. closes #1187 2016-05-12 12:02:34 +02:00
Johannes Pfeifer 62eb7e7443 Add headers for param_derivs-files 2016-03-29 15:57:49 +02:00
Stéphane Adjemian (Hermes) 0f794948ff Merge branch 'temporary_terms'
Do not evaluate unnecessary temporary variables (for instance those
used in the evaluation of the jacobian matrix when we only compute the
residuals of the dynamic equations).
2016-03-09 17:53:58 +01:00
Houtan Bastani 50a4d50821 preprocessor: introduce new option compute_xrefs, #1125 2016-02-23 13:57:55 +01:00
Houtan Bastani de0ce35ee3 preprocessor: add equation cross references 2015-12-18 15:17:32 +01:00
Houtan Bastani 5884c04287 preprocessor: fix divergence of equations and aux_equations. closes #1110 2015-12-01 12:34:43 +01:00
Houtan Bastani 45919774ab Revert "preprocessor: write auxiliary variable definitions to matlab function"
This reverts commit ad81129a9b90dab50799bd4589b635420918cf1f.
2015-12-01 11:41:55 +01:00
Houtan Bastani fd1e0ee1e2 preprocessor: write auxiliary variable definitions to matlab function 2015-11-30 15:36:17 +01:00
Michel Juillard 74647e2872 fixed bug in col_id computation 2015-09-19 15:51:32 +02:00
Houtan Bastani 3117bf79f2 preprocessor: fix scoping problem with temporary variables 2015-09-04 15:28:06 +02:00
Houtan Bastani 0f75ddbd64 replace cend with end and cbegin with begin 2015-09-03 16:06:37 +02:00
Houtan Bastani 13be25314e preprocessor: rework temporary terms 2015-09-03 15:25:36 +02:00
Houtan Bastani 62249da603 preprocessor: fix bug introduced in eb2890d1f58f2285306821c85fa631b865fb80b6 2015-09-02 15:30:33 +02:00
Houtan Bastani 2618211859 preprocessor: julia: print only those temporary vars needed for the computation of (residuals, g1, g2, g3) in the respective dynamic! and static! functions
(cherry picked from commit eb2890d1f58f2285306821c85fa631b865fb80b6)
2015-09-02 15:30:25 +02:00
Houtan Bastani 7c28c672a4 Revert "preprocessor: julia: print only those temporary vars needed for the computation of (residuals, g1, g2, g3) in the respective dynamic! and static! functions"
This reverts commit eb2890d1f58f2285306821c85fa631b865fb80b6.
2015-09-02 15:29:52 +02:00
Houtan Bastani 7f014b94df preprocessor: julia: print only those temporary vars needed for the computation of (residuals, g1, g2, g3) in the respective dynamic! and static! functions 2015-09-01 18:29:10 +02:00
Houtan Bastani 7cc90013cd Merge branch 'julia' 2015-09-01 11:35:16 +02:00
Michel Juillard a538e29f1e expand extended preprocessor + first implementation of Petsc interface 2015-08-27 10:00:51 +02:00
Michel Juillard 50097bc054 adding writeResidualsC() for external files 2015-08-24 14:53:27 +02:00
Houtan Bastani c35938929f remove fill!(residual, 0.0) statements as all elements of residual are assigned to 2015-08-21 17:13:38 +02:00
Houtan Bastani 5c0c9efd6f add @inbounds to model equations, temporary vars, and model vars 2015-08-21 17:13:38 +02:00
Houtan Bastani 4a4a4c1d54 clean up printing 2015-08-21 17:13:32 +02:00
Houtan Bastani 34e649afc7 add assertions at beginning of function call 2015-08-21 12:05:38 +02:00
Houtan Bastani fb51517ac7 fix comments in generated files 2015-08-21 12:00:47 +02:00
Houtan Bastani c1d3b521ed update static & dynamic function comments 2015-08-20 15:28:32 +02:00
Houtan Bastani 5789d1f33b check function output argument sizes 2015-08-20 15:26:10 +02:00
Houtan Bastani 87ddbce87b write third derivatives of static and dynamic functions more efficiently 2015-08-20 14:41:15 +02:00
Houtan Bastani 3419772879 fix typo in 357afaab47ebe52cecdffb8a7f8b12c754f22470 2015-08-20 14:02:22 +02:00
Houtan Bastani cb0b8c9ba3 update comments in static & dynamic funcitons 2015-08-20 12:27:43 +02:00
Houtan Bastani 046bc44e8a write Hessians of static and dynamic functions more efficiently 2015-08-20 12:18:19 +02:00
Houtan Bastani 4808c8a1ce replace zeros with fill! and remove spzeros in static and dynamic functions 2015-08-20 11:33:19 +02:00
Houtan Bastani a10efd7c4b replace empty sparse calls with spzeros 2015-08-19 17:12:06 +02:00
Houtan Bastani 1b0d63abe9 add types to dynamic, static, and steady_state function calls 2015-08-19 12:11:08 +02:00
Houtan Bastani cbe1027428 remove unnecessary get*Function functions 2015-08-19 11:28:25 +02:00
Houtan Bastani 73a25ed90c adding using Utils to dynamic & static files 2015-08-18 15:45:23 +02:00
Houtan Bastani dae79ecafb update dynamic model to use multiple dispatch 2015-08-18 15:32:30 +02:00
Houtan Bastani 88a87a911b remove unnecessary braces 2015-08-17 11:17:26 +02:00
Stéphane Adjemian (Charybdis) 756ff179ff Removed deprecated syntaxes. 2015-08-12 19:03:29 +02:00
Houtan Bastani ce7a172c21 preprocessor: issue warning when param used with lead/lag. closes #976 2015-07-30 14:40:03 +02:00
Houtan Bastani 6330fa0374 write dynamic model output
Conflicts:
	preprocessor/DynamicModel.cc
2015-07-29 14:59:09 +02:00
Houtan Bastani 54874efa72 Merge branch 'master' into julia 2015-07-29 14:53:35 +02:00
Houtan Bastani 22ac2f4f92 preprocessor: simplify writing of NNZDerivatives 2015-07-29 14:52:15 +02:00
Houtan Bastani 0a3a5a0a03 bug fix in writing of dynamic params derivs file 2015-07-29 10:40:30 +02:00
Houtan Bastani 389bb89a55 simplify modules created by preprocessor 2015-07-28 18:00:00 +02:00
Houtan Bastani d49e6e4156 wrie dynamic params deriv file 2015-07-28 14:59:55 +02:00
Houtan Bastani 2bb2682b50 write dynamic file 2015-07-27 17:02:51 +02:00
Houtan Bastani db3f2b3c06 move external file write functions to class definitions 2015-07-21 17:35:06 +02:00
Houtan Bastani 947ca38440 preprocessor: split creation of latex model files. closes #966 2015-07-15 08:58:15 +02:00
Houtan Bastani 4102e0cc56 Revert "Merge branch 'rmExtraExo'"
This reverts commit 28ffa9c56fd021cc75415aeafc13d3810d1b3132, reversing
changes made to 60b3577a09f3eb9cf3cc590241343b1f0fee8706.

Conflicts:
	preprocessor/Shocks.cc
	preprocessor/SymbolTable.cc
2015-06-09 16:42:51 +02:00
Houtan Bastani f6fb8bbf47 preprocessor: fix function call in reindexStaticOnlyEquations 2015-05-20 12:28:49 +02:00
Houtan Bastani a361980437 preprocessor: move all dynamic model reindexing to DynamicModel 2015-05-20 12:27:56 +02:00
Houtan Bastani 6a37dc9e21 Merge branch 'master' into rmExtraExo 2015-05-18 17:16:55 +02:00
Michel Juillard 39978f905f changing code for making directory baseline in order to comply with mingw 2015-05-13 17:11:56 +02:00
Michel Juillard a757579213 fixing logic in creation of checksum file. Improving documentation. 2015-05-11 08:57:24 +02:00
Michel Juillard 5b42483e81 adding feature to recompile MEX files only if the model has
changed (not activated yet)
detail of compilation code moved from preprocessor (ModFile.cc) to
./matlab/utilities/general/dyn_mex.m
2015-05-10 18:16:53 +02:00
Houtan Bastani 3783f05c71 preprocessor: remove commented code 2015-04-21 16:49:37 +02:00
Houtan Bastani b27a60d06c preprocessor: reindex equations marked as [static] 2015-04-15 17:00:17 +02:00
Houtan Bastani e045d42c12 preprocessor: remove resetDataTree method 2015-04-15 16:16:26 +02:00
Houtan Bastani cb1fb288f4 preprocessor: remove clearing of num_const_node_map 2015-04-15 14:21:05 +02:00
Houtan Bastani ef640070c2 preprocessor: move reindexing functions from DynamicModel to ModelTree 2015-04-07 15:58:18 +02:00
Houtan Bastani e3ef0b12c4 Merge branch 'master' into rmExtraExo 2015-04-01 15:22:10 +02:00
Michel Juillard 909cc995bd fixing bug in treatment of temporary terms for blocks with *.m files 2015-03-31 15:50:35 +02:00
Houtan Bastani 81a2a2ee0d remove extra exo’s for shocks statement, nonstationary, and trend vars; fix bugs 2015-03-10 17:57:30 +01:00
Houtan Bastani 96a5949d9e preprocessor: remove extraneous varexo, update model and statements, #841 2015-03-06 16:44:17 +01:00
Stéphane Adjemian (Charybdis) 431e9e596a Fixed homotopy for perfect foresight models with block option, cosmetic changes. 2015-02-20 14:48:25 +01:00
Stéphane Adjemian (Charybdis) 1349b448b0 Merge branch 'remove-globals-from-blocks' 2015-02-17 13:01:17 +01:00