halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patch to switch matlab CATCH syntax

Browse Source
This commit is contained in:
Marcel Kronfeld 2009-03-11 13:05:30 +00:00
parent 521a67705f
commit a347e220ff
1 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
resources/MatlabInterface/@JEInterface/patch-catch.diff Normal file
View File

@ -0,0 +1,65 @@
diff -uN ./runEvalLoopJE.m /home/mkron/workspace/JE2Base/resources/MatlabInterface/@JEInterface/runEvalLoopJE.m
--- ./runEvalLoopJE.m 2009-03-10 10:11:34.000000000 +0100
+++ /home/mkron/workspace/JE2Base/resources/MatlabInterface/@JEInterface/runEvalLoopJE.m 2009-03-10 09:52:22.000000000 +0100
@@ -98,9 +98,9 @@
end
% disp(sprintf('res is %d',res));
%res
- catch
+ catch ME
disp('function evaluation failed:');
- disp(lasterror);
+ disp(ME.message);
stopOptimization=1;
end
int.mediator.setAnswer(res);
@@ -114,9 +114,9 @@
end
end
clear global JEMediator;
-catch
+catch ME
disp('Error in evaluate!');
- disp(lasterror);
+ disp(ME.message);
%int.mediator.quit; % just in case
%int.mediator='';
diff -uN ./setOptions.m /home/mkron/workspace/JE2Base/resources/MatlabInterface/@JEInterface/setOptions.m
--- ./setOptions.m 2009-03-10 10:11:54.000000000 +0100
+++ /home/mkron/workspace/JE2Base/resources/MatlabInterface/@JEInterface/setOptions.m 2009-03-10 09:52:22.000000000 +0100
@@ -17,9 +17,9 @@
makeOptions(int, char(fn(i)), usrOpts.(char(fn(i))));
options.(char(fn(i))) = usrOpts.(char(fn(i)));
end
-catch
+catch ME
error('invalid option "%s"... check makeOptions to learn about available options', char(fn(i)));
end
-int.opts = options;
+int.opts = options;
\ No newline at end of file
diff -uN ./testEvalFunc.m /home/mkron/workspace/JE2Base/resources/MatlabInterface/@JEInterface/testEvalFunc.m
--- ./testEvalFunc.m 2009-03-10 10:12:16.000000000 +0100
+++ /home/mkron/workspace/JE2Base/resources/MatlabInterface/@JEInterface/testEvalFunc.m 2009-03-10 09:52:22.000000000 +0100
@@ -30,9 +30,9 @@
else
res = feval(int.f, x, int.args);
end
-catch
+catch ME
disp('Function evaluation failed:');
- disp(lasterror);
+ disp(ME.message);
error('Test failed!');
end
@@ -53,4 +53,4 @@
end;
end
-
+
\ No newline at end of file