Fix of .mat extension with save for octave.
parent
c5c99a80f6
commit
f83d7db907
|
@ -375,19 +375,19 @@ if options_gsa.glue,
|
||||||
% Info.order_var=dr_.order_var;
|
% Info.order_var=dr_.order_var;
|
||||||
% Out=Out1;
|
% Out=Out1;
|
||||||
Info.TypeofSample='post';
|
Info.TypeofSample='post';
|
||||||
save([OutputDirectoryName,'/',fname_,'_glue_post'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem','Info', 'Exo')
|
save([OutputDirectoryName,'/',fname_,'_glue_post.mat'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem','Info', 'Exo')
|
||||||
%save([fname_,'_post_glue_smooth'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem','Info')
|
%save([fname_,'_post_glue_smooth'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem','Info')
|
||||||
|
|
||||||
else
|
else
|
||||||
if options_gsa.pprior
|
if options_gsa.pprior
|
||||||
Info.TypeofSample='prior';
|
Info.TypeofSample='prior';
|
||||||
save([OutputDirectoryName,'/',fname_,'_glue_prior'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem','Info', 'Exo')
|
save([OutputDirectoryName,'/',fname_,'_glue_prior.mat'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem','Info', 'Exo')
|
||||||
% save([OutputDirectoryName,'/',fname_,'_prior_glue'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem')
|
% save([OutputDirectoryName,'/',fname_,'_prior_glue'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem')
|
||||||
% Out=Out1;
|
% Out=Out1;
|
||||||
% save([OutputDirectoryName,'/',fname_,'_prior_glue_smooth'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem')
|
% save([OutputDirectoryName,'/',fname_,'_prior_glue_smooth'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem')
|
||||||
else
|
else
|
||||||
Info.TypeofSample='mc';
|
Info.TypeofSample='mc';
|
||||||
save([OutputDirectoryName,'/',fname_,'_glue_mc'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem','Info', 'Exo')
|
save([OutputDirectoryName,'/',fname_,'_glue_mc.mat'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem','Info', 'Exo')
|
||||||
% save([OutputDirectoryName,'/',fname_,'_mc_glue'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem')
|
% save([OutputDirectoryName,'/',fname_,'_mc_glue'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem')
|
||||||
% Out=Out1;
|
% Out=Out1;
|
||||||
% save([OutputDirectoryName,'/',fname_,'_mc_glue_smooth'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem')
|
% save([OutputDirectoryName,'/',fname_,'_mc_glue_smooth'], 'Out', 'Sam', 'Lik', 'Obs', 'Rem')
|
||||||
|
|
|
@ -144,10 +144,10 @@ while i<n,
|
||||||
end
|
end
|
||||||
xh1=x;
|
xh1=x;
|
||||||
end
|
end
|
||||||
save gstep
|
save gstep.mat
|
||||||
end
|
end
|
||||||
|
|
||||||
save gstep
|
save gstep.mat
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -202,7 +202,7 @@ while i<n,
|
||||||
h1(i)=h10;
|
h1(i)=h10;
|
||||||
i=0;
|
i=0;
|
||||||
end
|
end
|
||||||
save hess
|
save hess.mat
|
||||||
end
|
end
|
||||||
|
|
||||||
h_1=h1;
|
h_1=h1;
|
||||||
|
@ -261,7 +261,7 @@ if hflag==2,
|
||||||
xh_1(i)=x(i);
|
xh_1(i)=x(i);
|
||||||
xh_1(j)=x(j);
|
xh_1(j)=x(j);
|
||||||
j=j+1;
|
j=j+1;
|
||||||
save hess
|
save hess.mat
|
||||||
end
|
end
|
||||||
i=i+1;
|
i=i+1;
|
||||||
end
|
end
|
||||||
|
@ -323,7 +323,7 @@ if any(isnan(hessian_mat)),
|
||||||
end
|
end
|
||||||
hh1=h1;
|
hh1=h1;
|
||||||
htol1=htol;
|
htol1=htol;
|
||||||
save hess
|
save hess.mat
|
||||||
% 11/25/03 SA Created from Hessian_sparse (removed sparse)
|
% 11/25/03 SA Created from Hessian_sparse (removed sparse)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,7 @@ disp(['Maximum Hessian eigenvalue ',num2str(max(ee))])
|
||||||
g=gg;
|
g=gg;
|
||||||
check=0;
|
check=0;
|
||||||
if max(eig(hh))<0, disp('Negative definite Hessian! Local maximum!'), pause, end,
|
if max(eig(hh))<0, disp('Negative definite Hessian! Local maximum!'), pause, end,
|
||||||
save m1 x hh g hhg igg fval0
|
save m1.mat x hh g hhg igg fval0
|
||||||
|
|
||||||
igrad=1;
|
igrad=1;
|
||||||
igibbs=1;
|
igibbs=1;
|
||||||
|
@ -202,9 +202,9 @@ while norm(gg)>gtol & check==0 & jit<nit,
|
||||||
|
|
||||||
if norm(x(:,icount)-xparam1)>1.e-12,
|
if norm(x(:,icount)-xparam1)>1.e-12,
|
||||||
try
|
try
|
||||||
save m1 x fval0 nig -append
|
save m1.mat x fval0 nig -append
|
||||||
catch
|
catch
|
||||||
save m1 x fval0 nig
|
save m1.mat x fval0 nig
|
||||||
end
|
end
|
||||||
[dum, gg, htol0, igg, hhg]=mr_hessian(0,xparam1,func_hh,flagit,htol,varargin{:});
|
[dum, gg, htol0, igg, hhg]=mr_hessian(0,xparam1,func_hh,flagit,htol,varargin{:});
|
||||||
if htol0>htol, %ftol,
|
if htol0>htol, %ftol,
|
||||||
|
@ -237,11 +237,11 @@ while norm(gg)>gtol & check==0 & jit<nit,
|
||||||
disp(['Elapsed time for iteration ',num2str(t),' s.'])
|
disp(['Elapsed time for iteration ',num2str(t),' s.'])
|
||||||
|
|
||||||
g(:,icount+1)=gg;
|
g(:,icount+1)=gg;
|
||||||
save m1 x hh g hhg igg fval0 nig
|
save m1.mat x hh g hhg igg fval0 nig
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
save m1 x hh g hhg igg fval0 nig
|
save m1.mat x hh g hhg igg fval0 nig
|
||||||
if ftol>ftol0,
|
if ftol>ftol0,
|
||||||
disp(' ')
|
disp(' ')
|
||||||
disp('Numerical noise in the likelihood')
|
disp('Numerical noise in the likelihood')
|
||||||
|
|
Loading…
Reference in New Issue