Changeset 155 for trunk

Timestamp:

Jan 12, 2006 12:46:50 PM (18 years ago)

Author:

dkearney

Message:

1) few minor changes to the matlab bindings,
2) removal of put_*_id tests from matlab and octave bindings test script
i'll be removing the actual functions soon.

Location:

trunk

Files:

• src/matlab/rpLibChildren.cc (modified) (1 diff)
• src/octave/rpLibResult.cc (modified) (2 diffs)
• test/src/RpMatlab_test.m (modified) (1 diff)
• test/src/RpOctave_test.m (modified) (1 diff)

trunk/src/matlab/rpLibChildren.cc

@@ -54 +54 @@
 
     /* Call the C subroutine. */
-    if ( (libIndex > 0) && (path) ) {
+    if ( (libIndex > 0)     &&
+         (path)             &&
+         (childIndex >= 0)      ) {
         lib = getObject_Lib(libIndex);
 

trunk/src/octave/rpLibResult.cc

@@ -19 +19 @@
 /** 
  * Usually the last call of the program, this function signals to the gui
- * telling it that processing has completed and the output is ready to be
+ * that processing has completed and the output is ready to be
  * displayed
  */
@@ -28 +28 @@
 \n\
 Usually the last call of the program, this function signals to the gui\n\
-telling it that processing has completed and the output is ready to be\n\
+that processing has completed and the output is ready to be\n\
 displayed\n\
 Error Codes: @var{err} = 0 is success, anything else is failure.")

trunk/test/src/RpMatlab_test.m

@@ -53 +53 @@
 err = test_node_type(lib,'input.number(min)');
 err = test_put(lib,'output.curve(result).xy(f12)','12 13',' ',1);
-% gotta check out why this next one doesnt work, might be in the c++ code
-err = test_put(lib,'output.curve(result).xy','22 23','f13',1);
-err = test_put_dbl(lib,'output.curve(result).xy(f14)',22,1);
-err = test_put_dbl(lib,'output.curve(result).xy(f15)',0,1);
-err = test_put_dbl_id(lib,'output.curve(result).xy(f16)',44,' ',1);
-% gotta check out why this next one doesnt work, might be in the c++ code
-err = test_put_dbl_id(lib,'output.curve(result).xy',55,'f17',1);
-err = test_put_str_id(lib,'output.curve(result).xy(f18)','72 83',' ',1);
-% gotta check out why this next one doesnt work, might be in the c++ code
-err = test_put_str_id(lib,'output.curve(result).xy','92 103','f19',1);
-err = test_put_str(lib,'output.curve(result).xy(f20)','110 111',1);
+err = test_put_dbl(lib,'output.curve(result).xy(f13)',22,1);
+err = test_put_dbl(lib,'output.curve(result).xy(f14)',0,1);
+err = test_put_str(lib,'output.curve(result).xy(f15)','110 111',1);
 err = test_xml(lib);
 err = test_result(lib);

trunk/test/src/RpOctave_test.m

@@ -46 +46 @@
 err = test_node_type(lib,'input.number(min)');
 err = test_put(lib,'output.curve(result).xy(f12)','12 13','',1);
-% gotta check out why this next one doesnt work, might be in the c++ code
-err = test_put(lib,'output.curve(result).xy','22 23','f13',1);
-err = test_put_dbl(lib,'output.curve(result).xy(f14)',22,1);
-err = test_put_dbl(lib,'output.curve(result).xy(f15)',0,1);
-err = test_put_dbl_id(lib,'output.curve(result).xy(f16)',44,'',1);
-% gotta check out why this next one doesnt work, might be in the c++ code
-err = test_put_dbl_id(lib,'output.curve(result).xy',55,'f17',1);
-err = test_put_str_id(lib,'output.curve(result).xy(f18)','72 83','',1);
-% gotta check out why this next one doesnt work, might be in the c++ code
-err = test_put_str_id(lib,'output.curve(result).xy','92 103','f19',1);
-err = test_put_str(lib,'output.curve(result).xy(f20)','110 111',1);
+err = test_put_dbl(lib,'output.curve(result).xy(f13)',22,1);
+err = test_put_dbl(lib,'output.curve(result).xy(f14)',0,1);
+err = test_put_str(lib,'output.curve(result).xy(f15)','110 111',1);
 err = test_xml(lib);
 err = test_result(lib);