Merge pull request #1333 from JohannesPfeifer/octave_unit_test

Two fixes related to Octave unit test

matlab/distributions/lpdfgweibull.m

@@ -206,7 +206,7 @@ end
 %$ 
 %$ try
 %$    if isoctave
-%$        s = quadv(density, .0000000001, 100000);
+%$        s = quadv(density, .0000000001, 100000,1e-10);
 %$    else
 %$        s = integral(density, 0, 100000);
 %$    end
@@ -229,7 +229,7 @@ end
 %$ 
 %$ try
 %$    if isoctave
-%$        s = quadv(density, .0000000001, 100000);
+%$        s = quadv(density, .0000000001, 100000,1e-10);
 %$    else
 %$        s = integral(density, 0, 100000);
 %$    end
@@ -252,7 +252,7 @@ end
 %$ 
 %$ try
 %$    if isoctave
-%$        s = quadv(density, .0000000001, 100000);
+%$        s = quadv(density, .0000000001, 100000,1e-10)
 %$    else
 %$        s = integral(density, 0, 100000);
 %$    end
@@ -275,7 +275,7 @@ end
 %$ 
 %$ try
 %$    if isoctave
-%$        s = quadv(xdens, .0000000001, 100000);
+%$        s = quadv(xdens, .0000000001, 100000,1e-10)
 %$    else
 %$        s = integral(xdens, 0, 100000);
 %$    end
@@ -298,7 +298,7 @@ end
 %$ 
 %$ try
 %$    if isoctave
-%$        s = quadv(xdens, .0000000001, 100000);
+%$        s = quadv(xdens, .0000000001, 100000,1e-10)
 %$    else
 %$        s = integral(xdens, 0, 100000);
 %$    end
@@ -321,7 +321,7 @@ end
 %$ 
 %$ try
 %$    if isoctave
-%$        s = quadv(xdens, .0000000001, 100000);
+%$        s = quadv(xdens, .0000000001, 100000,1e-10)
 %$    else
 %$        s = integral(xdens, 0, 100000);
 %$    end
@@ -347,7 +347,7 @@ end
 %$    s = NaN(n, 1);
 %$    for i=1:n
 %$        if isoctave()
-%$            s(i) = quadv(density, .0000000001, .1*i);
+%$            s(i) = quadv(density, .0000000001, .1*i,1e-10)
 %$        else
 %$            s(i) = integral(density, 0, .1*i);
 %$        end
@@ -378,7 +378,7 @@ end
 %$    s = NaN(n, 1);
 %$    for i=1:n
 %$        if isoctave()
-%$            s(i) = quadv(density, .0000000001, .1*i);
+%$            s(i) = quadv(density, .0000000001, .1*i,1e-10)
 %$        else
 %$            s(i) = integral(density, 0, .1*i);
 %$        end
@@ -409,7 +409,7 @@ end
 %$    s = NaN(n, 1);
 %$    for i=1:n
 %$        if isoctave()
-%$            s(i) = quadv(density, .0000000001, .1*i);
+%$            s(i) = quadv(density, .0000000001, .1*i,1e-10)
 %$        else
 %$            s(i) = integral(density, 0, .1*i);
 %$        end

matlab/dynare_solve.m

@@ -40,13 +40,19 @@ jacobian_flag = options.jacobian_flag;
 
 % Set tolerance parameter depending the the caller function.
 stack = dbstack;
-if strcmp(stack(2).file,'simulation_core.m') || strcmp(stack(2).file,'solve_stacked_problem.m')
+if isoctave
+    [pathstr,name,ext]=fileparts(stack(2).file);
+    caller_file_name=[name,ext];
+else
+    caller_file_name=stack(2).file;
+end
+if strcmp(caller_file_name,'simulation_core.m') || strcmp(caller_file_name,'solve_stacked_problem.m')
     tolf = options.dynatol.f;
 else
     tolf = options.solve_tolf;
 end
 
-if strcmp(stack(2).file,'dyn_ramsey_static.m')
+if strcmp(caller_file_name,'dyn_ramsey_static.m')
     maxit = options.ramsey.maxit;
 else
     maxit = options.steady.maxit;

matlab/missing/stats/wblinv.m

@@ -148,7 +148,7 @@ t = exp(log(scale)+log(-log(1-proba))/shape);
 %$               [shape, scale, x(k-1)]
 %$           end
 %$           if isoctave
-%$               s = quadv(density, 0, x(k-1));
+%$               s = quadv(density, 0, x(k-1),1e-10);
 %$           else
 %$               s = integral(density, 0, x(k-1));
 %$           end