changeset 13:f0e00c212071 jabuilder_int

Retain separate file stem

--- a/simulateBinauralSignals.m	Fri Feb 28 13:41:31 2014 +0000
+++ b/simulateBinauralSignals.m	Fri Feb 28 14:10:17 2014 +0000
@@ -365,10 +365,10 @@
 %
 
 %% 1
-temp_filename=[outdir filesep 'a' num2str(now*1e12,'%-24.0f')];
+temp_filename=['a' num2str(now*1e12,'%-24.0f')];
 cad_filename=[temp_filename '.cad']
 
-fid=fopen(cad_filename,'w');
+fid=fopen([outdir filesep cad_filename],'w');
 % TODO add onCleanup to fclose this file
 fprintf(fid,'%%CORNERS\n\n');
 fprintf(fid,'%.0f %9.6f %9.6f %9.6f\n',...
@@ -392,7 +392,7 @@
 
 setup_filename = [temp_filename '_setup.m']
 
-fid=fopen(setup_filename,'wt');
+fid=fopen([outdir filesep setup_filename],'wt');
 % TODO add onCleanup to fclose this file
 fprintf(fid,'\n global FSAMP CAIR RHOAIR SHOWTEXT');
 fprintf(fid,['\n FSAMP = ' num2str(geom.Fs) ';']);
@@ -400,10 +400,10 @@
 fprintf(fid,['\n RHOAIR = ' num2str(geom.Rhoair) ';']);
 fprintf(fid,'\n SHOWTEXT = 0;');
 fprintf(fid,'\n SUPPRESSFILES = 0;');
-temp = strrep([cd filesep],'\','\\');
+temp = strrep(outdir,'\','\\');
 fprintf(fid,['\n Filepath=''''''' temp ''''''';']);
 fprintf(fid,['\n Filestem=''' temp_filename ''';']);
-fprintf(fid,['\n CADfile=''' temp temp_filename '.cad'';']);
+fprintf(fid,['\n CADfile=''' cad_filename ''';']);
 fprintf(fid,'\n open_or_closed_model = ''open'';');
 fprintf(fid,'\n int_or_ext_model = ''ext'';');
 fprintf(fid,'\n EDcalcmethod = ''n'';');
@@ -435,8 +435,8 @@
 
 [~, ir_matrix]=myver_edtb(setup_filename);
 
-delete([cad_filename]);
-delete([setup_filename]);
+delete([outdir filesep cad_filename]);
+delete([outdir filesep setup_filename]);
 
 function [ir,varargout]=myver_edtb(EDsetupfile)
 % implements the computation of EDToolbox (by Peter Svensson) with a front-end