Do not run integration tests for NLS with Octave.

Also moved some integration tests.

tests/Makefile.am

@@ -81,9 +81,9 @@ MODFILES = \
 	estimation/method_of_moments/AFVRR/AFVRR_MFB_RRA.mod \
 	estimation/system_prior_restriction/Gali_2015.mod \
 	estimation/no_init_estimation_check_first_obs/fs2000_init_check.mod \
-	estimation/example_nls.mod \
 	estimation/univariate/nls/staticmodel.mod \
-	estimation/univariate/nls/dynamicmodel.mod \
+	estimation/univariate/nls/dynamicmodel1.mod \
+	estimation/univariate/nls/dynamicmodel2.mod \
 	moments/example1_var_decomp.mod \
 	moments/example1_bp_test.mod \
 	moments/test_AR1_spectral_density.mod \

tests/estimation/univariate/nls/dynamicmodel1.mod

@@ -45,4 +45,10 @@ eparams.gamma = 0.6;
 eparams.rho = 0.3;
 
 // Call estimation routine.
-estimate.nls('eqy', eparams, simulations, 1001Y:5000Y, 'annealing')
+if ~isoctave
+    % Under Octave, estimate.nls (provided by matlab/+estimate/nls.m) is not
+    % accessible because there is a function which has the same name as the
+    % +estimate package, namely matlab/cli/estimate.m. This is a known Octave
+    % bug (https://savannah.gnu.org/bugs/?func=detailitem&item_id=46889).
+    estimate.nls('eqy', eparams, simulations, 1001Y:5000Y, 'annealing')
+end

tests/estimation/univariate/nls/staticmodel.mod

@@ -43,4 +43,10 @@ clear('eparams')
 eparams.gamma = 0.6;
 
 // Call estimation routine.
-estimate.nls('eqy', eparams, simulations, 1001Y:5000Y, 'annealing')
+if ~isoctave
+    % Under Octave, estimate.nls (provided by matlab/+estimate/nls.m) is not
+    % accessible because there is a function which has the same name as the
+    % +estimate package, namely matlab/cli/estimate.m. This is a known Octave
+    % bug (https://savannah.gnu.org/bugs/?func=detailitem&item_id=46889).
+    estimate.nls('eqy', eparams, simulations, 1001Y:5000Y, 'annealing')
+end