Bytecode: remove useless FBEGINBLOCK_::endo_nbr data member
parent
faa1291055
commit
34edd4e143
|
@ -90,7 +90,6 @@ operator<<(BytecodeWriter &code_file, const FBEGINBLOCK_ &instr)
|
||||||
|| instr.type == BlockSimulationType::solveForwardComplete)
|
|| instr.type == BlockSimulationType::solveForwardComplete)
|
||||||
{
|
{
|
||||||
write_member(instr.is_linear);
|
write_member(instr.is_linear);
|
||||||
write_member(instr.endo_nbr);
|
|
||||||
write_member(instr.u_count_int);
|
write_member(instr.u_count_int);
|
||||||
}
|
}
|
||||||
write_member(instr.nb_col_jacob);
|
write_member(instr.nb_col_jacob);
|
||||||
|
|
|
@ -893,7 +893,6 @@ private:
|
||||||
vector<int> det_exogenous;
|
vector<int> det_exogenous;
|
||||||
bool is_linear{false};
|
bool is_linear{false};
|
||||||
vector<Block_contain_type> Block_Contain_;
|
vector<Block_contain_type> Block_Contain_;
|
||||||
int endo_nbr{0};
|
|
||||||
int u_count_int{0};
|
int u_count_int{0};
|
||||||
int nb_col_jacob{0};
|
int nb_col_jacob{0};
|
||||||
int det_exo_size, exo_size;
|
int det_exo_size, exo_size;
|
||||||
|
@ -903,7 +902,7 @@ public:
|
||||||
derivatives w.r.t. endogenous not belonging to the block) */
|
derivatives w.r.t. endogenous not belonging to the block) */
|
||||||
FBEGINBLOCK_(int size_arg, BlockSimulationType type_arg, int first_element, int block_size,
|
FBEGINBLOCK_(int size_arg, BlockSimulationType type_arg, int first_element, int block_size,
|
||||||
const vector<int> &variable_arg, const vector<int> &equation_arg,
|
const vector<int> &variable_arg, const vector<int> &equation_arg,
|
||||||
bool is_linear_arg, int endo_nbr_arg, int u_count_int_arg, int nb_col_jacob_arg,
|
bool is_linear_arg, int u_count_int_arg, int nb_col_jacob_arg,
|
||||||
int det_exo_size_arg, int exo_size_arg,
|
int det_exo_size_arg, int exo_size_arg,
|
||||||
vector<int> det_exogenous_arg, vector<int> exogenous_arg) :
|
vector<int> det_exogenous_arg, vector<int> exogenous_arg) :
|
||||||
BytecodeInstruction{Tags::FBEGINBLOCK},
|
BytecodeInstruction{Tags::FBEGINBLOCK},
|
||||||
|
@ -914,7 +913,6 @@ public:
|
||||||
exogenous{move(exogenous_arg)},
|
exogenous{move(exogenous_arg)},
|
||||||
det_exogenous{move(det_exogenous_arg)},
|
det_exogenous{move(det_exogenous_arg)},
|
||||||
is_linear{is_linear_arg},
|
is_linear{is_linear_arg},
|
||||||
endo_nbr{endo_nbr_arg},
|
|
||||||
u_count_int{u_count_int_arg},
|
u_count_int{u_count_int_arg},
|
||||||
nb_col_jacob{nb_col_jacob_arg},
|
nb_col_jacob{nb_col_jacob_arg},
|
||||||
det_exo_size{det_exo_size_arg},
|
det_exo_size{det_exo_size_arg},
|
||||||
|
@ -924,14 +922,13 @@ public:
|
||||||
// Constructor when derivatives w.r.t. exogenous are absent
|
// Constructor when derivatives w.r.t. exogenous are absent
|
||||||
FBEGINBLOCK_(int size_arg, BlockSimulationType type_arg, int first_element, int block_size,
|
FBEGINBLOCK_(int size_arg, BlockSimulationType type_arg, int first_element, int block_size,
|
||||||
const vector<int> &variable_arg, const vector<int> &equation_arg,
|
const vector<int> &variable_arg, const vector<int> &equation_arg,
|
||||||
bool is_linear_arg, int endo_nbr_arg, int u_count_int_arg, int nb_col_jacob_arg) :
|
bool is_linear_arg, int u_count_int_arg, int nb_col_jacob_arg) :
|
||||||
BytecodeInstruction{Tags::FBEGINBLOCK},
|
BytecodeInstruction{Tags::FBEGINBLOCK},
|
||||||
size{size_arg},
|
size{size_arg},
|
||||||
type{type_arg},
|
type{type_arg},
|
||||||
variable{variable_arg.begin()+first_element, variable_arg.begin()+(first_element+block_size)},
|
variable{variable_arg.begin()+first_element, variable_arg.begin()+(first_element+block_size)},
|
||||||
equation{equation_arg.begin()+first_element, equation_arg.begin()+(first_element+block_size)},
|
equation{equation_arg.begin()+first_element, equation_arg.begin()+(first_element+block_size)},
|
||||||
is_linear{is_linear_arg},
|
is_linear{is_linear_arg},
|
||||||
endo_nbr{endo_nbr_arg},
|
|
||||||
u_count_int{u_count_int_arg},
|
u_count_int{u_count_int_arg},
|
||||||
nb_col_jacob{nb_col_jacob_arg},
|
nb_col_jacob{nb_col_jacob_arg},
|
||||||
det_exo_size{0},
|
det_exo_size{0},
|
||||||
|
@ -966,7 +963,6 @@ public:
|
||||||
|| type == BlockSimulationType::solveForwardComplete)
|
|| type == BlockSimulationType::solveForwardComplete)
|
||||||
{
|
{
|
||||||
read_member(is_linear);
|
read_member(is_linear);
|
||||||
read_member(endo_nbr);
|
|
||||||
read_member(u_count_int);
|
read_member(u_count_int);
|
||||||
}
|
}
|
||||||
read_member(nb_col_jacob);
|
read_member(nb_col_jacob);
|
||||||
|
@ -1003,11 +999,6 @@ public:
|
||||||
return is_linear;
|
return is_linear;
|
||||||
};
|
};
|
||||||
int
|
int
|
||||||
get_endo_nbr()
|
|
||||||
{
|
|
||||||
return endo_nbr;
|
|
||||||
};
|
|
||||||
int
|
|
||||||
get_u_count_int()
|
get_u_count_int()
|
||||||
{
|
{
|
||||||
return u_count_int;
|
return u_count_int;
|
||||||
|
|
|
@ -183,7 +183,6 @@ DynamicModel::writeDynamicBytecode(const string &basename) const
|
||||||
endo_idx,
|
endo_idx,
|
||||||
eq_idx,
|
eq_idx,
|
||||||
false,
|
false,
|
||||||
symbol_table.endo_nbr(),
|
|
||||||
u_count_int,
|
u_count_int,
|
||||||
jacobian_ncols_endo,
|
jacobian_ncols_endo,
|
||||||
symbol_table.exo_det_nbr(),
|
symbol_table.exo_det_nbr(),
|
||||||
|
@ -229,7 +228,6 @@ DynamicModel::writeDynamicBlockBytecode(const string &basename) const
|
||||||
endo_idx_block2orig,
|
endo_idx_block2orig,
|
||||||
eq_idx_block2orig,
|
eq_idx_block2orig,
|
||||||
blocks[block].linear,
|
blocks[block].linear,
|
||||||
symbol_table.endo_nbr(),
|
|
||||||
u_count,
|
u_count,
|
||||||
static_cast<int>(blocks_jacob_cols_endo[block].size())};
|
static_cast<int>(blocks_jacob_cols_endo[block].size())};
|
||||||
|
|
||||||
|
|
|
@ -121,7 +121,6 @@ StaticModel::writeStaticBytecode(const string &basename) const
|
||||||
endo_idx,
|
endo_idx,
|
||||||
eq_idx,
|
eq_idx,
|
||||||
false,
|
false,
|
||||||
symbol_table.endo_nbr(),
|
|
||||||
u_count_int,
|
u_count_int,
|
||||||
symbol_table.endo_nbr()};
|
symbol_table.endo_nbr()};
|
||||||
|
|
||||||
|
@ -161,7 +160,6 @@ StaticModel::writeStaticBlockBytecode(const string &basename) const
|
||||||
endo_idx_block2orig,
|
endo_idx_block2orig,
|
||||||
eq_idx_block2orig,
|
eq_idx_block2orig,
|
||||||
blocks[block].linear,
|
blocks[block].linear,
|
||||||
symbol_table.endo_nbr(),
|
|
||||||
u_count,
|
u_count,
|
||||||
block_size};
|
block_size};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue