From ce58ed8ebb124f52461db59f48df51a4d5582c0c Mon Sep 17 00:00:00 2001 From: Houtan Bastani <houtan@dynare.org> Date: Mon, 7 Apr 2014 11:51:54 +0200 Subject: [PATCH] dmm: multinomial: remove parameters option, #568 --- preprocessor/DynareBison.yy | 2 -- tests/nile.mod | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy index 90385b2a49..347d03bd61 100644 --- a/preprocessor/DynareBison.yy +++ b/preprocessor/DynareBison.yy @@ -1588,7 +1588,6 @@ multinomial_options_list : multinomial_options_list COMMA multinomial_options multinomial_options : o_multinomial_process | o_multinomial_number_of_regimes - | o_multinomial_parameters | o_multinomial_probability ; @@ -2798,7 +2797,6 @@ o_equations : EQUATIONS EQUAL vec_int o_multinomial_process : PROCESS EQUAL INT_NUMBER { driver.option_num("multinomial.process",$3); }; o_multinomial_number_of_regimes : NUMBER_OF_REGIMES EQUAL INT_NUMBER { driver.option_num("multinomial.number_of_regimes",$3); }; -o_multinomial_parameters : PARAMETERS EQUAL '[' symbol_list ']' { driver.option_symbol_list("multinomial.parameters"); }; o_multinomial_probability : PROBABILITY EQUAL vec_value { driver.option_num("multinomial.probability",$3); } | PROBABILITY EQUAL '[' prob_symbol_list ']' diff --git a/tests/nile.mod b/tests/nile.mod index 1cab90b588..8d7962ea34 100644 --- a/tests/nile.mod +++ b/tests/nile.mod @@ -3,8 +3,8 @@ varobs y; varexo ee emu; parameters Ve, Vmu, delta, S1, S2; -multinomial( process=1, number_of_regimes=2, parameters = [S1], probability = [P1]); -multinomial( process=2, number_of_regimes=2, parameters = [S2], probability = [P2]); +multinomial( process=1, number_of_regimes=2, probability = [P1]); +multinomial( process=2, number_of_regimes=2, probability = [P2]); // probability can be a single object representing a vector with a Dirlichet prior (see below) or a vector of calibrated values //add bernoulli instruction (similar to markov-switching for independent draws) and new options to create bernoulli process // I don' know if probabilities would be a better name than probability (vector being implicit) -- GitLab