diff --git a/tests/estimation/method_of_moments/AFVRR/AFVRR_M0.mod b/tests/estimation/method_of_moments/AFVRR/AFVRR_M0.mod index 8e51ac51368237c54d02210941407fdfd3a8db08..cd19168cc962c612acd082a692646cf118fec7f8 100644 --- a/tests/estimation/method_of_moments/AFVRR/AFVRR_M0.mod +++ b/tests/estimation/method_of_moments/AFVRR/AFVRR_M0.mod @@ -256,11 +256,13 @@ dev_Q = AndreasenEtAl.Q@{orderApp} - oo_.mom.Q; dev_datamoments = str2double(AndreasenEtAl.moments@{orderApp}(:,5)) - oo_.mom.data_moments; dev_modelmoments = str2double(AndreasenEtAl.moments@{orderApp}(:,6)) - oo_.mom.model_moments; +if ~isoctave %there is no table command in Octave table([AndreasenEtAl.Q@{orderApp} ; str2double(AndreasenEtAl.moments@{orderApp}(:,5)) ; str2double(AndreasenEtAl.moments@{orderApp}(:,6))],... [oo_.mom.Q ; oo_.mom.data_moments ; oo_.mom.model_moments ],... [dev_Q ; dev_datamoments ; dev_modelmoments ],... 'VariableNames', {'Andreasen et al', 'Dynare', 'dev'},... 'RowNames', ['Q'; strcat('Data_', M_.matched_moments(:,4)); strcat('Model_', M_.matched_moments(:,4))]) +end if norm(dev_modelmoments)> 1e-4 error('Something wrong in the computation of moments at order @{orderApp}') diff --git a/tests/estimation/method_of_moments/AFVRR/AFVRR_MFB.mod b/tests/estimation/method_of_moments/AFVRR/AFVRR_MFB.mod index 450739ad3bd153855806d8bcbab513d554eb33b7..535dc847016bd2b7c753e8b8c3e067b5b9b8eefc 100644 --- a/tests/estimation/method_of_moments/AFVRR/AFVRR_MFB.mod +++ b/tests/estimation/method_of_moments/AFVRR/AFVRR_MFB.mod @@ -257,11 +257,13 @@ dev_Q = AndreasenEtAl.Q@{orderApp} - oo_.mom.Q; dev_datamoments = str2double(AndreasenEtAl.moments@{orderApp}(:,5)) - oo_.mom.data_moments; dev_modelmoments = str2double(AndreasenEtAl.moments@{orderApp}(:,6)) - oo_.mom.model_moments; +if ~isoctave %there is no table command in Octave table([AndreasenEtAl.Q@{orderApp} ; str2double(AndreasenEtAl.moments@{orderApp}(:,5)) ; str2double(AndreasenEtAl.moments@{orderApp}(:,6))],... [oo_.mom.Q ; oo_.mom.data_moments ; oo_.mom.model_moments ],... [dev_Q ; dev_datamoments ; dev_modelmoments ],... 'VariableNames', {'Andreasen et al', 'Dynare', 'dev'},... 'RowNames', ['Q'; strcat('Data_', M_.matched_moments(:,4)); strcat('Model_', M_.matched_moments(:,4))]) +end if norm(dev_modelmoments)> 1e-4 warning('Something wrong in the computation of moments at order @{orderApp}') diff --git a/tests/estimation/method_of_moments/AFVRR/AFVRR_MFB_RRA.mod b/tests/estimation/method_of_moments/AFVRR/AFVRR_MFB_RRA.mod index 9c069d3a3dff9dfb87ce7e40f2678f27ce1364aa..d86c7b35374de54866af804af4f4bfaa3a10e32f 100644 --- a/tests/estimation/method_of_moments/AFVRR/AFVRR_MFB_RRA.mod +++ b/tests/estimation/method_of_moments/AFVRR/AFVRR_MFB_RRA.mod @@ -256,11 +256,13 @@ dev_Q = AndreasenEtAl.Q@{orderApp} - oo_.mom.Q; dev_datamoments = str2double(AndreasenEtAl.moments@{orderApp}(:,5)) - oo_.mom.data_moments; dev_modelmoments = str2double(AndreasenEtAl.moments@{orderApp}(:,6)) - oo_.mom.model_moments; +if ~isoctave %there is no table command in Octave table([AndreasenEtAl.Q@{orderApp} ; str2double(AndreasenEtAl.moments@{orderApp}(:,5)) ; str2double(AndreasenEtAl.moments@{orderApp}(:,6))],... [oo_.mom.Q ; oo_.mom.data_moments ; oo_.mom.model_moments ],... [dev_Q ; dev_datamoments ; dev_modelmoments ],... 'VariableNames', {'Andreasen et al', 'Dynare', 'dev'},... 'RowNames', ['Q'; strcat('Data_', M_.matched_moments(:,4)); strcat('Model_', M_.matched_moments(:,4))]) +end if norm(dev_modelmoments)> 1e-4 warning('Something wrong in the computation of moments at order @{orderApp}') diff --git a/tests/estimation/method_of_moments/RBC/RBC_MoM_GMM_gradient_optim.mod b/tests/estimation/method_of_moments/RBC/RBC_MoM_GMM_gradient_optim.mod index a0c86593b6f3b21f982dd6a00329205c4fd65905..39a58b6740efad0b5c656ddff9051d3a1ceea316 100644 --- a/tests/estimation/method_of_moments/RBC/RBC_MoM_GMM_gradient_optim.mod +++ b/tests/estimation/method_of_moments/RBC/RBC_MoM_GMM_gradient_optim.mod @@ -88,8 +88,13 @@ end; estimated_params_init(use_calibration); end; - %1 3 13 - @#for optimizer in [1,3, 13] + + @#for optimizer in [1, 3, 13] + @#if estimParams == 2 && optimizer == 13 + %skip due to buggy behavior in Octave + if ~isoctave + @#endif + method_of_moments( mom_method = GMM % method of moments method; possible values: GMM|SMM , datafile = 'RBC_Andreasen_Data_2.mat' % name of filename with data @@ -110,6 +115,11 @@ end; , silent_optimizer % run minimization of moments distance silently without displaying results or saving files in between , analytic_jacobian ); - @#endfor + + @#if estimParams == 2 && optimizer == 13 + %skip due to buggy behavior in Octave + end + @#endif + @#endfor @#endfor \ No newline at end of file diff --git a/tests/estimation/method_of_moments/RBC/RBC_MoM_optimizer.mod b/tests/estimation/method_of_moments/RBC/RBC_MoM_optimizer.mod index 08b1ed882fabf4ec1bea83047d394e736400ca63..b9d9dc96c612671f4735c677e62be67453fcacd3 100644 --- a/tests/estimation/method_of_moments/RBC/RBC_MoM_optimizer.mod +++ b/tests/estimation/method_of_moments/RBC/RBC_MoM_optimizer.mod @@ -118,6 +118,12 @@ options_.solveopt.TolXConstraint=1e-3; end; @#for optimizer in OPTIMIZERS + + @#if estimParams == 2 && optimizer == 13 + %skip due to buggy behavior in Octave + if ~isoctave + @#endif + method_of_moments( mom_method = GMM % method of moments method; possible values: GMM|SMM , datafile = 'RBC_Andreasen_Data_2.mat' % name of filename with data @@ -139,6 +145,11 @@ options_.solveopt.TolXConstraint=1e-3; @#endif %, silent_optimizer % run minimization of moments distance silently without displaying results or saving files in between ); + + @#if estimParams == 2 && optimizer == 13 + %skip due to buggy behavior in Octave + end + @#endif @#endfor @#endfor