- Extends the error messages in bytecode
- Implements the print option in bytecode - Minor modifications to manage the global temporary termstime-shift
parent
313f64e153
commit
20f414e0d2
File diff suppressed because it is too large
Load Diff
|
@ -47,17 +47,20 @@ class Interpreter : public SparseMatrix
|
|||
private:
|
||||
unsigned int EQN_dvar1, EQN_dvar2, EQN_dvar3;
|
||||
int EQN_lag1, EQN_lag2, EQN_lag3;
|
||||
mxArray* GlobalTemporaryTerms;
|
||||
protected:
|
||||
double pow1(double a, double b);
|
||||
double divide(double a, double b);
|
||||
double log1(double a);
|
||||
double log10_1(double a);
|
||||
void compute_block_time(int Per_u_, bool evaluate, int block_num, int size, bool steady_state);
|
||||
string print_expression(it_code_type it_code, bool evaluate, int size, int block_num, bool steady_state);
|
||||
void evaluate_a_block(const int size, const int type, string bin_basename, bool steady_state, int block_num,
|
||||
const bool is_linear = false, const int symbol_table_endo_nbr = 0, const int Block_List_Max_Lag = 0, const int Block_List_Max_Lead = 0, const int u_count_int = 0, int block = -1);
|
||||
int simulate_a_block(const int size, const int type, string file_name, string bin_basename, bool Gaussian_Elimination, bool steady_state, int block_num,
|
||||
const bool is_linear = false, const int symbol_table_endo_nbr = 0, const int Block_List_Max_Lag = 0, const int Block_List_Max_Lead = 0, const int u_count_int = 0);
|
||||
void print_a_block(const int size, const int type, string bin_basename, bool steady_state, int block_num,
|
||||
const bool is_linear, const int symbol_table_endo_nbr, const int Block_List_Max_Lag,
|
||||
const int Block_List_Max_Lead, const int u_count_int, int block);
|
||||
vector<Block_contain_type> Block_Contain;
|
||||
code_liste_type code_liste;
|
||||
it_code_type it_code;
|
||||
|
@ -70,12 +73,15 @@ private:
|
|||
string filename;
|
||||
int minimal_solving_periods;
|
||||
int stack_solve_algo, solve_algo;
|
||||
bool global_temporary_terms;
|
||||
bool print;
|
||||
public:
|
||||
~Interpreter();
|
||||
Interpreter(double *params_arg, double *y_arg, double *ya_arg, double *x_arg, double *steady_y_arg, double *steady_x_arg,
|
||||
double *direction_arg, int y_size_arg, int nb_row_x_arg,
|
||||
int nb_row_xd_arg, int periods_arg, int y_kmin_arg, int y_kmax_arg, int maxit_arg_, double solve_tolf_arg, int size_o_direction_arg,
|
||||
double slowc_arg, int y_decal_arg, double markowitz_c_arg, string &filename_arg, int minimal_solving_periods_arg, int stack_solve_algo_arg, int solve_algo_arg);
|
||||
double slowc_arg, int y_decal_arg, double markowitz_c_arg, string &filename_arg, int minimal_solving_periods_arg, int stack_solve_algo_arg, int solve_algo_arg,
|
||||
bool global_temporary_terms_arg, bool print_arg);
|
||||
bool compute_blocks(string file_name, string bin_basename, bool steady_state, bool evaluate, int block, int &nb_blocks);
|
||||
inline mxArray* get_jacob(int block_num) {return jacobian_block[block_num];};
|
||||
inline mxArray* get_jacob_exo(int block_num) {return jacobian_exo_block[block_num];};
|
||||
|
|
|
@ -66,7 +66,8 @@ Get_Arguments_and_global_variables(int nrhs,
|
|||
mxArray *block_structur[],
|
||||
#endif
|
||||
bool &steady_state, bool &evaluate, int &block,
|
||||
mxArray *M_[], mxArray *oo_[], mxArray *options_[])
|
||||
mxArray *M_[], mxArray *oo_[], mxArray *options_[], bool &global_temporary_terms,
|
||||
bool &print)
|
||||
{
|
||||
#ifdef DEBUG_EX
|
||||
for (int i = 2; i < nrhs; i++)
|
||||
|
@ -112,6 +113,10 @@ Get_Arguments_and_global_variables(int nrhs,
|
|||
steady_state = false;
|
||||
else if (Get_Argument(prhs[i]) == "evaluate")
|
||||
evaluate = true;
|
||||
else if (Get_Argument(prhs[i]) == "global_temporary_terms")
|
||||
global_temporary_terms = true;
|
||||
else if (Get_Argument(prhs[i]) == "print")
|
||||
print = true;
|
||||
else
|
||||
{
|
||||
int pos = Get_Argument(prhs[i]).find("block");
|
||||
|
@ -196,6 +201,8 @@ mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
|
|||
double *params = NULL;
|
||||
double *yd = NULL, *xd = NULL;
|
||||
int count_array_argument = 0;
|
||||
bool global_temporary_terms = false;
|
||||
bool print = false;
|
||||
|
||||
try
|
||||
{
|
||||
|
@ -207,7 +214,8 @@ mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
|
|||
&block_structur,
|
||||
#endif
|
||||
steady_state, evaluate, block,
|
||||
&M_, &oo_, &options_);
|
||||
&M_, &oo_, &options_, global_temporary_terms,
|
||||
print);
|
||||
}
|
||||
catch (GeneralExceptionHandling &feh)
|
||||
{
|
||||
|
@ -294,6 +302,7 @@ mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
|
|||
double *ya = (double *) mxMalloc(size_of_direction);
|
||||
direction = (double *) mxMalloc(size_of_direction);
|
||||
memset(direction, 0, size_of_direction);
|
||||
|
||||
double *x = (double *) mxMalloc(col_x*row_x*sizeof(double));
|
||||
for (i = 0; i < row_x*col_x; i++)
|
||||
x[i] = double (xd[i]);
|
||||
|
@ -306,7 +315,7 @@ mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
|
|||
int nb_row_x = row_x;
|
||||
clock_t t0 = clock();
|
||||
|
||||
Interpreter interprete(params, y, ya, x, steady_yd, steady_xd, direction, y_size, nb_row_x, nb_row_xd, periods, y_kmin, y_kmax, maxit_, solve_tolf, size_of_direction, slowc, y_decal, markowitz_c, file_name, minimal_solving_periods, stack_solve_algo, solve_algo);
|
||||
Interpreter interprete(params, y, ya, x, steady_yd, steady_xd, direction, y_size, nb_row_x, nb_row_xd, periods, y_kmin, y_kmax, maxit_, solve_tolf, size_of_direction, slowc, y_decal, markowitz_c, file_name, minimal_solving_periods, stack_solve_algo, solve_algo, global_temporary_terms, print);
|
||||
|
||||
string f(fname);
|
||||
mxFree(fname);
|
||||
|
|
Loading…
Reference in New Issue