changeset 11:894f57cf9962 jabuilder_int

Merge

--- a/private/EDB1main.m	Fri Feb 28 11:14:01 2014 +0000
+++ b/private/EDB1main.m	Fri Feb 28 11:26:12 2014 +0000
@@ -210,22 +210,25 @@
     end
 end
 
-eval(['cd ''',EDsetupfilepath,''''])
+% need to read setup file manually --luisf.
 
-if setupfiletype == 1
-    comptype = computer;
-    if length(comptype) == 3
-        comptype = [comptype,'P'];
-    end
-    if comptype(1:4) == 'MACI', 
-        [temp1,tempfilestem,temp2] = fileparts(EDsetupfile);
-        eval([tempfilestem])
-    else    
-        eval(['run ''',EDsetupfile,''''])
-    end
-else
-    eval(['load ''',EDsetupfile,''''])
-end
+% if setupfiletype == 1
+%     comptype = computer;
+%     if length(comptype) == 3
+%         comptype = [comptype,'P'];
+%     end
+%     if comptype(1:4) == 'MACI', 
+%         [temp1,tempfilestem,temp2] = fileparts(EDsetupfile);        
+%         eval([tempfilestem])                       
+%     else    
+%         eval(['run ''',EDsetupfile,''''])
+%     end
+% else
+%     eval(['load ''',EDsetupfile,''''])
+% end
+
+eval(char(textread(EDsetupfile, '%s', 'whitespace', '')));
+% ~luisf
 
 if SHOWTEXT >= 1
 	disp(' ')

--- a/private/EDB1readsetup.m	Fri Feb 28 11:14:01 2014 +0000
+++ b/private/EDB1readsetup.m	Fri Feb 28 11:26:12 2014 +0000
@@ -40,26 +40,36 @@
 	cadgeofiletoopen = [];
 end
 
+% keeping the original filename, will use it later --luisf.
+setup_fname = EDsetupfile;
+
 [EDsetupfilepath,EDsetupfile,fileext] = fileparts(EDsetupfile);
 EDsetupfilepath = [EDsetupfilepath,filesep];
 
-eval(['cd ''',EDsetupfilepath,''''])
+% this is no longer necessary --luisf.
+% eval(['cd ''',EDsetupfilepath,''''])
 
 comptype = computer;
 if length(comptype) == 3
     comptype = [comptype,'P'];
 end
 
-if comptype(1:4) == 'MACI'
-    [temp1,tempfilestem,temp2] = fileparts(EDsetupfile);
-    eval([tempfilestem])
-else    
-    if comptype(1:3) == 'MAC',  % | comptype(1:3) == 'PCW'
-        eval([EDsetupfile])
-    else
-        eval(['run ''',EDsetupfile,''''])
-    end
-end
+% this doesn't work, need to read the file manually --luisf.
+
+% if comptype(1:4) == 'MACI'
+%     [temp1,tempfilestem,temp2] = fileparts(EDsetupfile);
+%     eval([tempfilestem])
+% else
+%     if comptype(1:3) == 'MAC',  % | comptype(1:3) == 'PCW'
+%         eval([EDsetupfile])
+%     else
+%         eval(['run ''',EDsetupfile,''''])
+%     end
+% end
+
+eval(char(textread(setup_fname, '%s', 'whitespace', '')));
+
+% ~luisf
 
 if exist('Filestem') ~= 1
 	error(['ERROR: The setup file does not specify the Filestem'])

--- a/simulateBinauralSignals.m	Fri Feb 28 11:14:01 2014 +0000
+++ b/simulateBinauralSignals.m	Fri Feb 28 11:26:12 2014 +0000
@@ -386,7 +386,9 @@
 fprintf(fid,'\n%%EOF');
 fclose(fid);
 
-fid=fopen([temp_filename '_setup.m'],'wt');
+setup_filename = [cd filesep temp_filename '_setup.m']
+
+fid=fopen(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) ';']);
@@ -427,7 +429,7 @@
 
 pause(1);
 
-[~, ir_matrix]=myver_edtb([cd filesep temp_filename '_setup.m']);
+[~, ir_matrix]=myver_edtb(setup_filename);
 
 delete([temp_filename '.cad']);
 delete([temp_filename '_setup.m']);
@@ -453,6 +455,8 @@
 dir_bef=dir;
 ir=1;
 
+disp(['Will call' EDsetupfile])
+
 %run computation
 EDB1main(EDsetupfile);