stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Correction in the memory allocation (new - delete used with object) 

git-svn-id: https://www.dynare.org/svn/dynare/trunk@3076 ac1d8469-bf42-47a9-8791-bf33cf982152
issue#70
ferhat 2009-10-23 11:26:29 +00:00
parent a8bc077ede
commit 57c3ef7934
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CodeInterpreter.hh
View File

@ -24,6 +24,7 @@
#include <cstdio> #include <cstdio>
#include <fstream> #include <fstream>
#include <cstring> #include <cstring>
#include <vector>
#ifdef LINBCG #ifdef LINBCG
# include "linbcg.hh" # include "linbcg.hh"
#endif #endif
@ -466,17 +467,18 @@ private:
int *equation; int *equation;
int *own_derivatives; int *own_derivatives;
bool is_linear; bool is_linear;
vector<Block_contain_type> Block_Contain; vector<Block_contain_type> Block_Contain_;
int endo_nbr; int endo_nbr;
int Max_Lag; int Max_Lag;
int Max_Lead; int Max_Lead;
int u_count_int; int u_count_int;
public: public:
inline FBEGINBLOCK_(){ op_code = FBEGINBLOCK; }; inline FBEGINBLOCK_(){ op_code = FBEGINBLOCK; size = 0; type = UNKNOWN; variable = NULL; equation = NULL; own_derivatives = NULL;
is_linear = false; endo_nbr = 0; Max_Lag = 0; Max_Lead = 0; u_count_int = 0;};
inline FBEGINBLOCK_(const int size_arg, const BlockSimulationType type_arg, int *variable_arg, int *equation_arg, int *own_derivatives_arg, inline FBEGINBLOCK_(const int size_arg, const BlockSimulationType type_arg, int *variable_arg, int *equation_arg, int *own_derivatives_arg,
bool is_linear_arg, int endo_nbr_arg, int Max_Lag_arg, int Max_Lead_arg, int u_count_int_arg) bool is_linear_arg, int endo_nbr_arg, int Max_Lag_arg, int Max_Lead_arg, int u_count_int_arg)
{ op_code = FBEGINBLOCK; size = size_arg; type = type_arg; variable = variable_arg; equation = equation_arg; own_derivatives = own_derivatives_arg; { op_code = FBEGINBLOCK; size = size_arg; type = type_arg; variable = variable_arg; equation = equation_arg; own_derivatives = own_derivatives_arg;
is_linear = is_linear_arg; endo_nbr = endo_nbr_arg; Max_Lag = Max_Lag_arg; Max_Lead = Max_Lead_arg; u_count_int = u_count_int_arg;}; is_linear = is_linear_arg; endo_nbr = endo_nbr_arg; Max_Lag = Max_Lag_arg; Max_Lead = Max_Lead_arg; u_count_int = u_count_int_arg;/*Block_Contain.clear();*/};
inline unsigned int get_size() { return size;}; inline unsigned int get_size() { return size;};
inline uint8_t get_type() { return type;}; inline uint8_t get_type() { return type;};
inline bool get_is_linear() { return is_linear;}; inline bool get_is_linear() { return is_linear;};
@ -484,7 +486,7 @@ public:
inline int get_Max_Lag() { return Max_Lag;}; inline int get_Max_Lag() { return Max_Lag;};
inline int get_Max_Lead() { return Max_Lead;}; inline int get_Max_Lead() { return Max_Lead;};
inline int get_u_count_int() { return u_count_int;}; inline int get_u_count_int() { return u_count_int;};
inline vector<Block_contain_type> get_Block_Contain() {return Block_Contain;}; inline vector<Block_contain_type> get_Block_Contain() {return Block_Contain_;};
inline void write(ostream &CompileCode) inline void write(ostream &CompileCode)
{ {
CompileCode.write(reinterpret_cast<char *>(&op_code), sizeof(op_code)); CompileCode.write(reinterpret_cast<char *>(&op_code), sizeof(op_code));
@ -519,7 +521,7 @@ public:
memcpy(&bc.Variable, code, sizeof(bc.Variable)); code += sizeof(bc.Variable); memcpy(&bc.Variable, code, sizeof(bc.Variable)); code += sizeof(bc.Variable);
memcpy(&bc.Equation, code, sizeof(bc.Equation)); code += sizeof(bc.Equation); memcpy(&bc.Equation, code, sizeof(bc.Equation)); code += sizeof(bc.Equation);
memcpy(&bc.Own_Derivative, code, sizeof(bc.Own_Derivative)); code += sizeof(bc.Own_Derivative); memcpy(&bc.Own_Derivative, code, sizeof(bc.Own_Derivative)); code += sizeof(bc.Own_Derivative);
Block_Contain.push_back(bc); Block_Contain_.push_back(bc);
} }
if (type==SOLVE_TWO_BOUNDARIES_SIMPLE || type==SOLVE_TWO_BOUNDARIES_COMPLETE || if (type==SOLVE_TWO_BOUNDARIES_SIMPLE || type==SOLVE_TWO_BOUNDARIES_COMPLETE ||
type==SOLVE_BACKWARD_COMPLETE || type==SOLVE_FORWARD_COMPLETE) type==SOLVE_BACKWARD_COMPLETE || type==SOLVE_FORWARD_COMPLETE)
@ -763,8 +765,10 @@ public:
#endif #endif
{ {
FBEGINBLOCK_ *fbegin_block = new FBEGINBLOCK_; FBEGINBLOCK_ *fbegin_block = new FBEGINBLOCK_;
code = fbegin_block->load(code); code = fbegin_block->load(code);
tags_liste.push_back(make_pair(FBEGINBLOCK,fbegin_block));
tags_liste.push_back(make_pair(FBEGINBLOCK, fbegin_block));
} }
break; break;
default: default: