Commit Graph

306 Commits (74ed99c6cac1df5456f197cea88ca054353c59f1)

Author SHA1 Message Date
Houtan Bastani ad81129a9b preprocessor: write auxiliary variable definitions to matlab function 2015-11-30 15:36:17 +01:00
Michel Juillard df793cebe5 fixed bug in col_id computation 2015-09-19 15:51:32 +02:00
Houtan Bastani ae8d5774b7 preprocessor: fix scoping problem with temporary variables 2015-09-04 15:28:06 +02:00
Houtan Bastani 5bd51d65e8 replace cend with end and cbegin with begin 2015-09-03 16:06:37 +02:00
Houtan Bastani dc441b41b8 preprocessor: rework temporary terms 2015-09-03 15:25:36 +02:00
Houtan Bastani 0fdf76dcf7 preprocessor: fix bug introduced in eb2890d1f5 2015-09-02 15:30:33 +02:00
Houtan Bastani 2846a7023d 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 eb2890d1f5)
2015-09-02 15:30:25 +02:00
Houtan Bastani 9b525713d9 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 eb2890d1f5.
2015-09-02 15:29:52 +02:00
Houtan Bastani eb2890d1f5 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 11eaf27453 Merge branch 'julia' 2015-09-01 11:35:16 +02:00
Michel Juillard c9f771973d expand extended preprocessor + first implementation of Petsc interface 2015-08-27 10:00:51 +02:00
Michel Juillard 3ed1d01ba9 adding writeResidualsC() for external files 2015-08-24 14:53:27 +02:00
Houtan Bastani 1d17f6b770 remove fill!(residual, 0.0) statements as all elements of residual are assigned to 2015-08-21 17:13:38 +02:00
Houtan Bastani d2c3debeb8 add @inbounds to model equations, temporary vars, and model vars 2015-08-21 17:13:38 +02:00
Houtan Bastani 2a9761ff33 clean up printing 2015-08-21 17:13:32 +02:00
Houtan Bastani 5666e12e8f add assertions at beginning of function call 2015-08-21 12:05:38 +02:00
Houtan Bastani 59122a1e73 fix comments in generated files 2015-08-21 12:00:47 +02:00
Houtan Bastani 73a0ad51d6 update static & dynamic function comments 2015-08-20 15:28:32 +02:00
Houtan Bastani a686a47ce7 check function output argument sizes 2015-08-20 15:26:10 +02:00
Houtan Bastani b00ed9f0a4 write third derivatives of static and dynamic functions more efficiently 2015-08-20 14:41:15 +02:00
Houtan Bastani 129c8d9e46 fix typo in 357afaab47 2015-08-20 14:02:22 +02:00
Houtan Bastani 357afaab47 update comments in static & dynamic funcitons 2015-08-20 12:27:43 +02:00
Houtan Bastani c4d3eb5b3c write Hessians of static and dynamic functions more efficiently 2015-08-20 12:18:19 +02:00
Houtan Bastani a244754a15 replace zeros with fill! and remove spzeros in static and dynamic functions 2015-08-20 11:33:19 +02:00
Houtan Bastani 6572b6f14f replace empty sparse calls with spzeros 2015-08-19 17:12:06 +02:00
Houtan Bastani 0f76765bd8 add types to dynamic, static, and steady_state function calls 2015-08-19 12:11:08 +02:00
Houtan Bastani d65e9306cb remove unnecessary get*Function functions 2015-08-19 11:28:25 +02:00
Houtan Bastani 6ac346606b adding using Utils to dynamic & static files 2015-08-18 15:45:23 +02:00
Houtan Bastani 252688cf4a update dynamic model to use multiple dispatch 2015-08-18 15:32:30 +02:00
Houtan Bastani cf3cdf0d59 remove unnecessary braces 2015-08-17 11:17:26 +02:00
Stéphane Adjemian (Charybdis) 9556d37fd6 Removed deprecated syntaxes. 2015-08-12 19:03:29 +02:00
Houtan Bastani c88c17728e preprocessor: issue warning when param used with lead/lag. closes #976 2015-07-30 14:40:03 +02:00
Houtan Bastani 8f92b975e4 write dynamic model output
Conflicts:
	preprocessor/DynamicModel.cc
2015-07-29 14:59:09 +02:00
Houtan Bastani 114b446bff Merge branch 'master' into julia 2015-07-29 14:53:35 +02:00
Houtan Bastani f26551509c preprocessor: simplify writing of NNZDerivatives 2015-07-29 14:52:15 +02:00
Houtan Bastani 2b7fc247f7 bug fix in writing of dynamic params derivs file 2015-07-29 10:40:30 +02:00
Houtan Bastani bc49d06e61 simplify modules created by preprocessor 2015-07-28 18:00:00 +02:00
Houtan Bastani b5be9b7437 wrie dynamic params deriv file 2015-07-28 14:59:55 +02:00
Houtan Bastani 25ae46e204 write dynamic file 2015-07-27 17:02:51 +02:00
Houtan Bastani c604d9da38 move external file write functions to class definitions 2015-07-21 17:35:06 +02:00
Houtan Bastani 7740fdaca0 preprocessor: split creation of latex model files. closes #966 2015-07-15 08:58:15 +02:00
Houtan Bastani 383a852c9c Revert "Merge branch 'rmExtraExo'"
This reverts commit 28ffa9c56f, reversing
changes made to 60b3577a09.

Conflicts:
	preprocessor/Shocks.cc
	preprocessor/SymbolTable.cc
2015-06-09 16:42:51 +02:00
Houtan Bastani 61ffed3eff preprocessor: fix function call in reindexStaticOnlyEquations 2015-05-20 12:28:49 +02:00
Houtan Bastani eb5f56703f preprocessor: move all dynamic model reindexing to DynamicModel 2015-05-20 12:27:56 +02:00
Houtan Bastani e389ab90bf Merge branch 'master' into rmExtraExo 2015-05-18 17:16:55 +02:00
Michel Juillard 2fe7a4156d changing code for making directory baseline in order to comply with mingw 2015-05-13 17:11:56 +02:00
Michel Juillard 3171e87448 fixing logic in creation of checksum file. Improving documentation. 2015-05-11 08:57:24 +02:00
Michel Juillard a5a5490a12 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 6702d5b8ca preprocessor: remove commented code 2015-04-21 16:49:37 +02:00
Houtan Bastani 2435961c68 preprocessor: reindex equations marked as [static] 2015-04-15 17:00:17 +02:00
Houtan Bastani 425d947859 preprocessor: remove resetDataTree method 2015-04-15 16:16:26 +02:00
Houtan Bastani 018ba39ff0 preprocessor: remove clearing of num_const_node_map 2015-04-15 14:21:05 +02:00
Houtan Bastani f4a4fb9d4c preprocessor: move reindexing functions from DynamicModel to ModelTree 2015-04-07 15:58:18 +02:00
Houtan Bastani 3ca0fcfb31 Merge branch 'master' into rmExtraExo 2015-04-01 15:22:10 +02:00
Michel Juillard 4f1725455a fixing bug in treatment of temporary terms for blocks with *.m files 2015-03-31 15:50:35 +02:00
Houtan Bastani eb23adfb76 remove extra exo’s for shocks statement, nonstationary, and trend vars; fix bugs 2015-03-10 17:57:30 +01:00
Houtan Bastani 6c937b1554 preprocessor: remove extraneous varexo, update model and statements, #841 2015-03-06 16:44:17 +01:00
Stéphane Adjemian (Charybdis) d19592f761 Fixed homotopy for perfect foresight models with block option, cosmetic changes. 2015-02-20 14:48:25 +01:00
Stéphane Adjemian (Charybdis) 1c8e1ab913 Merge branch 'remove-globals-from-blocks' 2015-02-17 13:01:17 +01:00
Stéphane Adjemian (Charybdis) a894357655 Removed options_ and oo_ globals from *all* generated dynamic model
routines (with block option) and adapted some routines to reflect this change.
2015-02-17 12:57:30 +01:00
Stéphane Adjemian (Charybdis) d3275db830 Removed options_ and oo_ globals from generated dynamic model
routines (with block option).
2015-02-16 16:56:17 +01:00
Houtan Bastani dcabcb6b01 preprocessor: new command write_latex_original_model. closes #657 2015-02-16 08:31:30 +01:00
ferhat 6529fe60b0 Bug correction in splitting the jacobian into blocks: the vector variable_2_block is valid only for endogenous variables. 2015-01-21 13:33:29 +01:00
Houtan Bastani 707702a447 Revert "preprocessor: replace oo_.exo_steady_state with steady_state_x, #825"
This reverts commit 2bb97a90d6.
2015-01-14 15:14:57 +01:00
Houtan Bastani 2bb97a90d6 preprocessor: replace oo_.exo_steady_state with steady_state_x, #825 2015-01-14 15:13:48 +01:00
Houtan Bastani 1b869b26a7 fix dates for changes in 86c3c0fb1b and a40323d2fb 2015-01-08 18:39:04 +01:00
ferhat a40323d2fb Bug correction on the way to collect information about the other endogenous variables in a block 2015-01-06 12:45:34 +01:00
Houtan Bastani 12d6113d8a preprocessor: remove unused variables 2014-12-30 21:55:43 +01:00
ferhat 24b2993f50 Solves issues in deterministic simulation:
- replaces maximum_endo_(lead|lag) by maximum_(lead|lag) to determine the maximum number of lead and lag in deterministic simulation
- allows to use bytecode in solve_perfect_foresight_model.m
- Adds model information in bytecode
2014-12-17 09:37:43 +01:00
ferhat eecf154cc1 Correction of a bug when "block" option is used without "bytecode" option in the "model" statement: for consecutive blocks that are evaluated, only the first one is in fact evaluated but not the following ones 2014-10-04 12:19:52 +02:00
Houtan Bastani f4e40dcf83 more explicit warning when dividing by zero in conversion to static model and when reading model #730 2014-10-03 17:04:07 +02:00
Johannes Pfeifer 7ead968240 Add info to dynamic and static file headers that auxiliary equations may be present 2014-07-17 20:39:59 +02:00
Johannes Pfeifer 54d353e255 Fix typo in header of DynamicModel.cc 2014-06-02 13:58:29 +02:00
Michel Juillard 15b44eda25 Merge branch 'master' into ep 2014-05-09 10:02:05 +02:00
Michel Juillard 75291659ec putting functions related to extended preprocessor in ExternalFiles.cc 2014-04-24 20:54:38 +02:00
Michel Juillard ad42818606 fixing extended-preprocessor C++ API and test case 2014-04-24 14:33:04 +02:00
Sébastien Villemot 184b810b65 Fix compilation error introduced in 0983ca78. 2014-04-07 14:21:28 +02:00
Michel Juillard 0983ca78f7 extended-preprocessor: starting a C interface (not finished) 2014-04-05 15:46:35 +02:00
Sébastien Villemot 9c556f709b Merge pull request #636 from JohannesPfeifer/preprocessor
Fix comments in header of dynamic and static files
2014-03-17 15:10:31 +01:00
Michel Juillard fd323a8217 extended-preprocessor: starting a C interface (not finished) 2014-03-16 18:49:54 +01:00
Johannes Pfeifer 370df16cfc Fix comments in header of dynamic and static files
Columns and rows were confused
2014-03-14 10:21:42 +01:00
Sébastien Villemot b4c3d004ad Introduce a new abstract class for external function nodes.
This fixes the following bugs:

- 1st and 2nd ext fcn deriv nodes were incorrectly added to
  DataTree::external_function_node_map, because of the chaining of
  constructors.

- the following methods of FirstDerivExternalFunctionNode were not overloaded:
  toStatic(), buildSimilarExternalFunctionNode()

- the following methods of SecondDerivExternalFunctionNode were not overloaded:
  toStatic(), buildSimilarExternalFunctionNode(), compile(),
  compileExternalFunctionOutput()
2014-03-13 12:12:17 +01:00
Michel Juillard 96ac2c0fd6 extended-preprocessor: update test example1 2014-02-24 13:33:48 +01:00
Michel Juillard f20f2f610a extended-preprocessor: adding back writing of model local variables (#) 2014-02-24 13:33:48 +01:00
Michel Juillard c4846430d9 returning sparse matrix in compressed format 2014-02-24 13:33:48 +01:00
Michel Juillard 49b34d4c94 write C++ version of model functions without temporary terms 2014-02-24 13:33:48 +01:00
Houtan Bastani 0750bc707b ms-dsge: change types of output for better packaging 2014-02-24 12:41:02 +01:00
Houtan Bastani b426f7236c ms-dsge: create C driver file without statements
Conflicts:
	preprocessor/DynareMain2.cc
	preprocessor/ModFile.cc
	preprocessor/ModFile.hh
	preprocessor/Statement.hh
2014-02-24 12:41:02 +01:00
Sébastien Villemot 37742463bc Add line numbers of equations in preprocessor error messages.
Closes #584
2014-01-27 16:41:43 +01:00
Sébastien Villemot 839ae22b1f Add a warning when some exogenous are not used in the model 2013-11-29 16:03:45 +01:00
Sébastien Villemot ed2f6d62c1 Refactor code for collecting variables appearing in expressions
- rename ExprNode::collectVariables in ExprNode::collectDynamicVariables
- new ExprNode::collectVariables: same as above, but without lag information
- remove ExprNode::findUnusedEndogenous: essentially redundant with the above)
- remove ExprNode::collectModelLocalVariables: idem
2013-11-29 15:37:11 +01:00
Houtan Bastani f1a122a654 fix bug introduced by ee812f3881 2013-11-19 13:05:08 +01:00
Houtan Bastani 7abcd5bcb1 preprocessor: bug fix: return oo 2013-11-19 11:56:39 +01:00
Houtan Bastani aa0af5e556 proprocessor: block code bug fix: M and oo not being passed to solve_two_boundaries 2013-11-19 11:54:00 +01:00
Houtan Bastani ee812f3881 clang compilation: replace ostringstream array with vector of strings 2013-11-18 12:16:37 +01:00
Houtan Bastani 5dec309bbd preprocessor: simplify if statement 2013-11-18 12:16:37 +01:00
Houtan Bastani 13bc928b0c revert change that breaks gcc build 2013-11-05 18:21:12 +01:00
Houtan Bastani 5352fb4d16 preprocessor and matlab mex fixes for clang compilation 2013-11-05 18:04:57 +01:00
Sébastien Villemot 27f525e1e4 Always initialize M_.maximum_{endo,exo}_{lead,lag} and M_.params
Closes #515
2013-11-04 16:02:28 +01:00
Houtan Bastani 2d4a42c01f missing semicolon 2013-10-29 12:38:28 +01:00