natas_hw
/
jidt
mirror of https://github.com/jlizier/jidt
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating javaMatrixToOctave to handle new conversion routine in octave (and be backwards compatible to old)

This commit is contained in:
Joseph Lizier 2019-03-21 09:35:41 +11:00
parent 9aed0d4590
commit 1d2c7c42b9
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/octave/javaMatrixToOctave.m Executable file → Normal file
View File

@ -47,7 +47,12 @@ function octaveMatrix = javaMatrixToOctave(javaMatrix, startRow, startCol, numRo
% Convert whole matrix first:
tmp = javaObject('org.octave.Matrix', javaMatrix);
% Make sure tmp.ident() is converted to native octave:
oldFlag = java_convert_matrix (1);
if (exist('java_matrix_autoconversion') > 0)
oldFlag = java_matrix_autoconversion (1);
else
% Must be old octave version:
oldFlag = java_convert_matrix (1);
end
converted = false;
unwind_protect
octaveMatrix = tmp.ident(tmp);
@ -55,7 +60,12 @@ function octaveMatrix = javaMatrixToOctave(javaMatrix, startRow, startCol, numRo
unwind_protect_cleanup
% restore to non-default conversion, otherwise we get
% bad errors on other calls
java_convert_matrix(oldFlag);
if (exist('java_matrix_autoconversion') > 0)
java_matrix_autoconversion(oldFlag);
else
% Must be old octave version:
java_convert_matrix(oldFlag);
end
end_unwind_protect
if (converted)
if (nargin >= 2)