Changeset 138 for trunk/src/octave

Timestamp:

Nov 13, 2005, 10:24:25 PM (19 years ago)

Author:

dkearney

Message:

1) addition of octave/matlab test scripts, some still need work
2) the rpLibPutDoubleId and rpLibPutStringId functions are not quite working.
3) minor fixes to src/octave/rpLibPutDouble.cc and src/octave/rpUnitsGetBasis.cc

Location:

trunk/src/octave

Files:

• rpLibPutDouble.cc (modified) (1 diff)
• rpUnitsGetBasis.cc (modified) (1 diff)

trunk/src/octave/rpLibPutDouble.cc

@@ -61 +61 @@
         if ( args(0).is_real_scalar() &&
              args(1).is_string()      &&
-             args(2).is_string()      &&
+             args(2).is_real_scalar() &&
              args(3).is_real_scalar()   ) {
 

trunk/src/octave/rpUnitsGetBasis.cc

@@ -63 +63 @@
                         retHandle = 
                             storeObject_UnitsStr(myBasis->getUnitsName());
-                        // adjust error code
-                        if (retHandle >= 0) {
-                            err = 0;
-                        }
+                    }
+
+                    // adjust error code
+                    // if there is a basis retHandle will be a positive value
+                    // if storing was successful. retHandle will be zero if
+                    // storing failed. 
+                    // if there is no basis, myBasis will be null and
+                    // retHandle will not change from its original negative 
+                    // value
+                    if (retHandle != 0) {
+                        err = 0;
                     }
                 }