[Jmatlink-commitlog] jmatlink/src/jmatlink CoreJMatLink.java,1.15,1.16
Brought to you by:
st_mueller
Menu
▾
▴
[Jmatlink-commitlog] jmatlink/src/jmatlink CoreJMatLink.java,1.15,1.16
|
From: Stefan M. <st_...@us...> - 2005-11-04 19:20:23
|
Update of /cvsroot/jmatlink/jmatlink/src/jmatlink In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29958/src/jmatlink Modified Files: CoreJMatLink.java Log Message: removed lots of comments from the code Index: CoreJMatLink.java =================================================================== RCS file: /cvsroot/jmatlink/jmatlink/src/jmatlink/CoreJMatLink.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CoreJMatLink.java 2 Nov 2005 19:01:46 -0000 1.15 --- CoreJMatLink.java 4 Nov 2005 19:20:15 -0000 1.16 *************** *** 120,124 **** private native double engGetScalarNATIVE (long epL, String nameS ); private native double[][] engGetVariableNATIVE (long epL, String nameS ); - //private native String[] engGetCharArrayNATIVE (long epL, String nameS ); private native void engPutVariableNATIVE (long epL, String matrixS, double[][] valuesDD); --- 120,123 ---- *************** *** 173,179 **** public CoreJMatLink() { if (debugB) System.out.println("JMatLink constructor"); ! //runner = new Thread(this); ! //runner.start(); ! } /** this restarts the engine thread --- 172,176 ---- public CoreJMatLink() { if (debugB) System.out.println("JMatLink constructor"); ! } /** this restarts the engine thread *************** *** 551,556 **** /** Get an array from MATLAB's workspace. ! * ! */ public synchronized double[][] engGetVariable(String arrayS ) { --- 548,554 ---- /** Get an array from MATLAB's workspace. ! * ! * @param ! */ public synchronized double[][] engGetVariable(String arrayS ) { *************** *** 559,562 **** --- 557,562 ---- /** Get an array from a specified instance/workspace of MATLAB. + * @param + * @param */ public synchronized double[][] engGetVariable(long epL, String arrayS ) *************** *** 579,606 **** return engGetVariableD; } ! ! /** Get an 'char' array (string) from MATLAB's workspace. ! */ ! // public synchronized String[] engGetCharArray(String arrayS) ! //{ ! // // convert to double array ! // engEvalString( "engGetCharArrayD=double(" + arrayS +")" ); ! // ! // // get double array ! // double[][] arrayD = engGetVariable("engGetCharArrayD"); ! // ! // // delete temporary double array ! // engEvalString("clear engGetCharArrayD"); ! // ! // // If array "engGetCharArrayD" does not exist in MATLAB's workspace ! // // immediately return null ! // if (arrayD == null) return null; ! // ! // // convert double back to char ! // return double2String( arrayD ); ! //} ! /** Put an array (2 dimensional) into MATLAB's workspace. */ public synchronized void engPutVariable( String arrayS, double[][] valuesDD ) --- 579,587 ---- return engGetVariableD; } ! /** Put an array (2 dimensional) into MATLAB's workspace. + * @param + * @param */ public synchronized void engPutVariable( String arrayS, double[][] valuesDD ) *************** *** 611,617 **** /** Put an array (2 dimensional) into a specified instance/workspace of ! * MATLAB. ! * ! */ public synchronized void engPutVariable(long epL, String arrayS, double[][] valuesDD) { --- 592,601 ---- /** Put an array (2 dimensional) into a specified instance/workspace of ! * MATLAB. ! * ! * @param ! * @param ! * @param ! */ public synchronized void engPutVariable(long epL, String arrayS, double[][] valuesDD) { *************** *** 636,641 **** /** Return the outputs of previous commands from MATLAB's workspace. ! * ! */ public synchronized int engOutputBuffer( ) { --- 620,626 ---- /** Return the outputs of previous commands from MATLAB's workspace. ! * ! * @return ! */ public synchronized int engOutputBuffer( ) { *************** *** 647,653 **** /** Return the ouputs of previous commands in MATLAB's workspace. ! * ! * ! */ public synchronized int engOutputBuffer( long epL, int buflenI ) { --- 632,641 ---- /** Return the ouputs of previous commands in MATLAB's workspace. ! * ! * ! * @param ! * @param ! * @return ! */ public synchronized int engOutputBuffer( long epL, int buflenI ) { *************** *** 682,685 **** --- 670,675 ---- * * Right now the parameter <i>buflen</i> is not supported. + * @param + * @return */ public synchronized String engGetOutputBuffer( long epL ) *************** *** 777,784 **** break; - //case engGetCharArrayI: engGetCharArrayS = engGetCharArrayNATIVE(epL, arrayS ); - // releaseWaitForValue(); - // break; - case engPutVariableI: engPutVariableNATIVE( epL, arrayS, engPutVariable2dD ); releaseWaitForValue(); --- 767,770 ---- *************** *** 871,875 **** } //System.out.println("WaitForValue released"); ! } // end waitForValue private synchronized void releaseWaitForValue(){ --- 857,861 ---- } //System.out.println("WaitForValue released"); ! } private synchronized void releaseWaitForValue(){ *************** *** 878,911 **** } - - //////////////////////////////////////////////////////////////////////////////// - //// Utility methods //// - - - // Convert an n*n double array to n*1 String vector - // private String[] double2String(double[][] d) - //{ - // - // // Check if array is not empty - // if (d == null) - // { - // // double[][] array is NULL - // return null; - // } - // - // String encodeS[]=new String[d.length]; // String vector - // - // // for all rows - // for (int n=0; n<d.length; n++){ - // byte b[] = new byte[d[n].length]; - // // convert row from double to byte - // for (int i=0; i<d[n].length ;i++) b[i]=(byte)d[n][i]; - // - // // convert byte to String - // try { encodeS[n] = new String(b, "UTF8");} - // catch (UnsupportedEncodingException e) {} - // } - // return encodeS; - //} // end double2String - } // end class JMatLink --- 864,866 ---- |
