stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate outputs with commas.

covariance-quadratic-approximation
Stéphane Adjemian (Guts) 2023-12-15 16:55:24 +01:00
parent 47af0cde16
commit 44119077db
Signed by: stepan
GPG Key ID: 295C1FE89E17EB3C
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matlab/optimization/cmaes.m
View File

@ -2256,7 +2256,7 @@ ax(2) = max(minxend, ax(2));
axis(ax);
% add some annotation lines
[ignore idx] = sort(d.x(end,6:end));
[ignore, idx] = sort(d.x(end,6:end));
% choose no more than 25 indices
idxs = round(linspace(1, size(d.x,2)-5, min(size(d.x,2)-5, 25)));
yy = repmat(NaN, 2, size(d.x,2)-5);

16
matlab/parallel/AnalyseComputationalEnvironment.m
View File

@ -175,12 +175,12 @@ for Node=1:length(DataInput) % To obtain a recursive function remove the 'for'
if Environment
if OScallerWindows
[si1 de1]=system(['ping ', DataInput(Node).ComputerName]);
[si1, de1]=system(['ping ', DataInput(Node).ComputerName]);
else
[si1 de1]=system(['ping ', DataInput(Node).ComputerName, ' -c 4']);
[si1, de1]=system(['ping ', DataInput(Node).ComputerName, ' -c 4']);
end
else
[si1 de1]=system(['ping ', DataInput(Node).ComputerName]);
[si1, de1]=system(['ping ', DataInput(Node).ComputerName]);
end
if (si1)
@ -387,15 +387,15 @@ for Node=1:length(DataInput) % To obtain a recursive function remove the 'for'
else
if ~strcmp(DataInput(Node).ComputerName,MasterName) % run on remote machine
if strfind([DataInput(Node).MatlabOctavePath], 'octave') % Hybrid computing Matlab(Master)->Octave(Slaves) and Vice Versa!
[NonServeS NenServeD]=system(['start /B psexec \\',DataInput(Node).ComputerName,' -e -u ',DataInput(Node).UserName,' -p ',DataInput(Node).Password,' -W ',DataInput(Node).RemoteDrive,':\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder ' -low ',DataInput(Node).MatlabOctavePath,' Tracing.m']);
[NonServeS, NenServeD]=system(['start /B psexec \\',DataInput(Node).ComputerName,' -e -u ',DataInput(Node).UserName,' -p ',DataInput(Node).Password,' -W ',DataInput(Node).RemoteDrive,':\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder ' -low ',DataInput(Node).MatlabOctavePath,' Tracing.m']);
else
[NonServeS NenServeD]=system(['start /B psexec \\',DataInput(Node).ComputerName,' -e -u ',DataInput(Node).UserName,' -p ',DataInput(Node).Password,' -W ',DataInput(Node).RemoteDrive,':\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder ' -low ',DataInput(Node).MatlabOctavePath,' -nosplash -nodesktop -minimize -r Tracing']);
[NonServeS, NenServeD]=system(['start /B psexec \\',DataInput(Node).ComputerName,' -e -u ',DataInput(Node).UserName,' -p ',DataInput(Node).Password,' -W ',DataInput(Node).RemoteDrive,':\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder ' -low ',DataInput(Node).MatlabOctavePath,' -nosplash -nodesktop -minimize -r Tracing']);
end
else % run on local machine via the network: user and passwd cannot be used!
if strfind([DataInput(Node).MatlabOctavePath], 'octave') % Hybrid computing Matlab(Master)->Octave(Slaves) and Vice Versa!
[NonServeS NenServeD]=system(['start /B psexec \\',DataInput(Node).ComputerName,' -e ',' -W ',DataInput(Node).RemoteDrive,':\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder ' -low ',DataInput(Node).MatlabOctavePath,' Tracing.m']);
[NonServeS, NenServeD]=system(['start /B psexec \\',DataInput(Node).ComputerName,' -e ',' -W ',DataInput(Node).RemoteDrive,':\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder ' -low ',DataInput(Node).MatlabOctavePath,' Tracing.m']);
else
[NonServeS NenServeD]=system(['start /B psexec \\',DataInput(Node).ComputerName,' -e ',' -W ',DataInput(Node).RemoteDrive,':\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder ' -low ',DataInput(Node).MatlabOctavePath,' -nosplash -nodesktop -minimize -r Tracing']);
[NonServeS, NenServeD]=system(['start /B psexec \\',DataInput(Node).ComputerName,' -e ',' -W ',DataInput(Node).RemoteDrive,':\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder ' -low ',DataInput(Node).MatlabOctavePath,' -nosplash -nodesktop -minimize -r Tracing']);
end
end
@ -570,7 +570,7 @@ for Node=1:length(DataInput) % To obtain a recursive function remove the 'for'
% Questo controllo penso che si possa MIGLIORARE!!!!!
if isempty (RealCPUnbr) && Environment1==0
[si0 de0]=system(['psinfo \\',DataInput(Node).ComputerName]);
[si0, de0]=system(['psinfo \\',DataInput(Node).ComputerName]);
end
RealCPUnbr=GiveCPUnumber(de0,Environment1);

2
matlab/parallel/distributeJobs.m
View File

@ -129,7 +129,7 @@ if SumOfJobs~=NumbersOfJobs
% Many choices are possible:
% - ... (see above).
[NonServe VeryFast]= min(CPUWeight);
[NonServe, VeryFast]= min(CPUWeight);
while SumOfJobs<NumbersOfJobs
JobsForNode(VeryFast)=JobsForNode(VeryFast)+1;

2
matlab/parallel/dynareParallelDir.m
View File

@ -59,7 +59,7 @@ for indPC=1:length(Parallel)
if isoctave % Patch for peculiar behaviour of ls under Linux.
% It is necessary to capture the ls warning message and properly manage the jolly char '*'!
[check ax]=system(['ls ' ,filename, ' 2> OctaveStandardOutputMessage.txt']);
[check, ax]=system(['ls ' ,filename, ' 2> OctaveStandardOutputMessage.txt']);
if check ~= 0 || ~isempty(strfind(ax,'No such file or directory'))
ax=[];

8
matlab/parallel/dynareParallelGetFiles.m
View File

@ -61,13 +61,13 @@ for indPC=1:length(Parallel)
if isempty (FindAst)
[NonServeL NonServeR]= system(['scp ',scp_token,' ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,':',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',NamFileInput{jfil,1},NamFileInput{jfil,2},' ',NamFileInput{jfil,1}]);
[NonServeL, NonServeR]= system(['scp ',scp_token,' ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,':',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',NamFileInput{jfil,1},NamFileInput{jfil,2},' ',NamFileInput{jfil,1}]);
else
filenameTemp=NamFileInput{jfil,2};
[NotUsed FlI]=system(['ssh ',ssh_token,' ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,' ls ',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',filenameTemp, ' 2> OctaveStandardOutputMessage.txt']);
[NotUsed, FlI]=system(['ssh ',ssh_token,' ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,' ls ',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',filenameTemp, ' 2> OctaveStandardOutputMessage.txt']);
if isempty (FlI)
return
@ -81,13 +81,13 @@ for indPC=1:length(Parallel)
for i=1: NumFileToCopy
Ni=num2str(i);
filenameTemp(1,AstPos)=Ni;
[NonServeL NonServeR]= system(['scp ',scp_token,' ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,':',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',NamFileInput{jfil,1},filenameTemp,' ',NamFileInput{jfil,1}]);
[NonServeL, NonServeR]= system(['scp ',scp_token,' ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,':',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',NamFileInput{jfil,1},filenameTemp,' ',NamFileInput{jfil,1}]);
end
end
else
[NonServeL NonServeR]= system(['scp ',scp_token,' ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,':',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',NamFileInput{jfil,1},NamFileInput{jfil,2},' ',NamFileInput{jfil,1}]);
[NonServeL, NonServeR]= system(['scp ',scp_token,' ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,':',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',NamFileInput{jfil,1},NamFileInput{jfil,2},' ',NamFileInput{jfil,1}]);
end
end

4
matlab/parallel/masterParallel.m
View File

@ -893,7 +893,7 @@ switch Strategy
end
if isempty(dir('dynareParallelLogFiles'))
[A B C]=rmdir('dynareParallelLogFiles');
[A, B, C]=rmdir('dynareParallelLogFiles');
mkdir('dynareParallelLogFiles');
end
try
@ -911,7 +911,7 @@ switch Strategy
delete(['temp_input.mat'])
if newInstance
if isempty(dir('dynareParallelLogFiles'))
[A B C]=rmdir('dynareParallelLogFiles');
[A, B, C]=rmdir('dynareParallelLogFiles');
mkdir('dynareParallelLogFiles');
end
end

8
matlab/partial_information/PI_gensys.m
View File

@ -76,7 +76,7 @@ try
warning('off','MATLAB:nearlySingularMatrix');
warning('off','MATLAB:singularMatrix');
UAVinv=inv(C2); % i.e. inv(U02'*a1*V02)
[LastWarningTxt LastWarningID]=lastwarn;
[LastWarningTxt, LastWarningID]=lastwarn;
if any(any(isinf(UAVinv)))==1
singular=1;
end
@ -178,9 +178,9 @@ G0pi=eye(n+FL_RANK+NX);
try
if isoctave && octave_ver_less_than('9')
% Need to force QZ complex on Octave ⩽ 8 (otherwise it returns the real one)
[a b q z]=qz(complex(G0pi),complex(G1pi));
[a, b, q, z]=qz(complex(G0pi),complex(G1pi));
else
[a b q z]=qz(G0pi,G1pi);
[a, b, q, z]=qz(G0pi,G1pi);
end
catch
try
@ -239,7 +239,7 @@ for i=1:nn
end
div ;
if ~zxz
[a b q z]=qzdiv(div,a,b,q,z);
[a, b, q, z]=qzdiv(div,a,b,q,z);
end
gev=[diag(a) diag(b)];

2
matlab/partial_information/PI_gensys_singularC.m
View File

@ -71,7 +71,7 @@ try
singular=1;
else
UAVinv=inv(C2);
[LastWarningTxt LastWarningID]=lastwarn;
[LastWarningTxt, LastWarningID]=lastwarn;
if any(any(isinf(UAVinv)))==1
singular=1;
end