Changeset 560 for trunk

Timestamp:

Dec 14, 2006, 9:10:14 AM (18 years ago)

Author:

dkearney

Message:

updated the tcl units.tcl test file to reflect changes in the core units code

Location:

trunk/src/tcl

Files:

• src/RpUnitsTclInterface.cc (modified) (6 diffs)
• tests/units.test (modified) (4 diffs)

trunk/src/tcl/src/RpUnitsTclInterface.cc

@@ -53 +53 @@
 
 
-static int list2str (std::list<std::string>& inList, std::string& outString);
 
 
@@ -113 +112 @@
 {
     std::string inValue       = ""; // value provided by the user
+    std::string origUnitsName = "";
     std::string fromUnitsName = ""; // name of the units for user's value
     std::string toUnitsName   = ""; // name of the units to convert to
@@ -158 +158 @@
                     fromUnitsName = std::string(argv[nextarg]);
                     err = 0;
+                    origUnitsName = fromUnitsName;
                     err = RpUnits::validate(fromUnitsName,type,&compatList);
                     if ( err != 0) {
                         Tcl_AppendResult(interp,
-                            "bad value \"", fromUnitsName.c_str(), 
+                            "bad value \"", origUnitsName.c_str(), 
                             "\": should be a recognized unit for Rappture",
                             (char*)NULL);
@@ -178 +179 @@
                     toUnitsName = std::string(argv[nextarg]);
                     err = 0;
+                    origUnitsName = toUnitsName;
                     err = RpUnits::validate(toUnitsName,type);
                     if (err != 0) {
                         Tcl_AppendResult(interp,
-                            "bad value \"", toUnitsName.c_str(), 
+                            "bad value \"", origUnitsName.c_str(), 
                             "\": should be a recognized unit for Rappture",
                             (char*)NULL);
@@ -317 +319 @@
     // const RpUnits* unitsObj   = NULL;
     std::list<std::string> compatList;
-    std::list<std::string>::iterator compatListIter;
 
     int nextarg               = 1; // start parsing using the '2'th argument
@@ -536 +537 @@
     return TCL_OK;
 }
-
-/**********************************************************************/
-// FUNCTION: list2str()
-/// Convert a std::list<std::string> into a comma delimited std::string
-/**
- * Iterates through a std::list<std::string> and returns a comma 
- * delimited std::string containing the elements of the inputted std::list.
- *
- * Returns 0 on success, anything else is error
- */
-
-int
-list2str (std::list<std::string>& inList, std::string& outString)
-{
-    int retVal = 1;  // return Value 0 is success, everything else is failure
-    unsigned int counter = 0; // check if we hit all elements of inList
-    std::list<std::string>::iterator inListIter; // list interator
-
-    inListIter = inList.begin();
-
-    while (inListIter != inList.end()) {
-        if ( outString.empty() ) {
-            outString = *inListIter;
-        }
-        else {
-            outString =  outString + "," + *inListIter;
-        }
-
-        // increment the iterator and loop counter
-        inListIter++;
-        counter++;
-    }
-
-    if (counter == inList.size()) {
-        retVal = 0;
-    }
-
-    return retVal;
-}

trunk/src/tcl/tests/units.test

@@ -168 +168 @@
 test convert-1.8.0 {Rappture::Units::convert, convert undefined unit} {
     list [catch {Rappture::Units::convert 33Q -to nm } msg] $msg
-} {1 {unrecognized units: "Q"}}
+} {1 {Unrecognized units: "Q".
+Should be units of type length (A,in,m,nm)}}
 
 #----------------------------------------------------------
@@ -465 +466 @@
 test convert_units-5.4.4.2 {Rappture::Units::convert, cm2nZ/Vs->m2/us} {
     list [catch {Rappture::Units::convert 2cm2nZ/Vs -to m2/us} msg] $msg
-} {1 {unrecognized units: "cm2nZ/Vs"}}
+} {1 {Unrecognized units: "cm2nZ/Vs".
+Should be units of type length/time (/s,/us,A2,in2,m2)}}
 
 test convert_units-5.4.4.3 {Rappture::Units::convert, cm2/s->m2/kVus} {
     list [catch {Rappture::Units::convert 2cm2/s -to m2/kVus} msg] $msg
-} {1 {unmatched units in conversion: (kV-1)}}
+} {1 {unmatched units in conversion: (kV-1)
+Please enter units of type length/electric_potential*time (/V,/kV,/s,/us,A2,in2,m2)}}
 
 test convert_units-5.4.4.4 {Rappture::Units::convert, cm2/s->m2/uskV} {
     list [catch {Rappture::Units::convert 2cm2/s -to m2/uskV} msg] $msg
-} {1 {unmatched units in conversion: (kV-1)}}
+} {1 {unmatched units in conversion: (kV-1)
+Please enter units of type length/time*electric_potential (/V,/kV,/s,/us,A2,in2,m2)}}
 
 test convert_units-5.4.4.5 {Rappture::Units::convert, cm2V/s->m2/us} {
     list [catch {Rappture::Units::convert 2cm2V/s -to m2/us} msg] $msg
-} {1 {unmatched units in conversion: (V1)}}
+} {1 {unmatched units in conversion: (V)
+Please enter units of type length/time (/s,/us,A2,in2,m2)}}
 
 test convert_units-5.4.4.6 {Rappture::Units::convert, cm2V/s->m2/us} {
     list [catch {Rappture::Units::convert 2cm2V/s -to m2/us} msg] $msg
-} {1 {unmatched units in conversion: (V1)}}
+} {1 {unmatched units in conversion: (V)
+Please enter units of type length/time (/s,/us,A2,in2,m2)}}
 
 test convert_units-5.4.4.7 {Rappture::Units::convert, cm2V->m2} {
     list [catch {Rappture::Units::convert 2cm2V -to m2} msg] $msg
-} {1 {unmatched units in conversion: (V1)}}
+} {1 {unmatched units in conversion: (V)
+Please enter units of type length (A2,in2,m2)}}
 
 test convert_units-5.4.4.8 {Rappture::Units::convert, Vcm2->m2} {
     list [catch {Rappture::Units::convert 2Vcm2 -to m2} msg] $msg
-} {1 {unmatched units in conversion: (V1)}}
+} {1 {unmatched units in conversion: (V)
+Please enter units of type length (A2,in2,m2)}}
 
 test convert_units-5.4.4.9 {Rappture::Units::convert, cm2->Vm2} {
     list [catch {Rappture::Units::convert 2cm2 -to Vm2} msg] $msg
-} {1 {unmatched units in conversion: (V1)}}
+} {1 {unmatched units in conversion: (V)
+Please enter units of type electric_potential*length (A2,V,in2,m2)}}
 
 test convert_units-5.4.4.10 {Rappture::Units::convert, cm2->m2V} {
     list [catch {Rappture::Units::convert 2cm2 -to m2V} msg] $msg
-} {1 {unmatched units in conversion: (V1)}}
+} {1 {unmatched units in conversion: (V)
+Please enter units of type length*electric_potential (A2,V,in2,m2)}}
 
 test convert_units-5.4.4.11 {Rappture::Units::convert, cm2A->Vm2} {
     list [catch {Rappture::Units::convert 2cm2A -to Vm2} msg] $msg
-} {1 {unmatched units in conversion: (A1) -> (V1)}}
+} {1 {unmatched units in conversion: (A) -> (V)
+Please enter units of type electric_potential*length (A2,V,in2,m2)}}
 
 test convert_units-5.4.4.12 {Rappture::Units::convert, cm2A->m2V} {
     list [catch {Rappture::Units::convert 2cm2A -to m2V} msg] $msg
-} {1 {conversion unavailable: (A1) -> (V1)}}
+} {1 {Conversion unavailable: (A) -> (V)
+Please enter units of type length*electric_potential (A2,V,in2,m2)}}
 
 test convert_units-5.4.4.13 {Rappture::Units::convert, Acm2->Vm2} {
     list [catch {Rappture::Units::convert 2Acm2 -to Vm2} msg] $msg
-} {1 {unmatched units in conversion: (A1) -> (V1)}}
+} {1 {unmatched units in conversion: (A) -> (V)
+Please enter units of type electric_potential*length (A2,V,in2,m2)}}
 
 test convert_units-5.4.4.14 {Rappture::Units::convert, Acm2->m2V} {
     list [catch {Rappture::Units::convert 2Acm2 -to m2V} msg] $msg
-} {1 {conversion unavailable: (A1) -> (V1)}}
+} {1 {Conversion unavailable: (A) -> (V)
+Please enter units of type length*electric_potential (A2,V,in2,m2)}}
 
 #--------------------------------------------------------------------
@@ -525 +539 @@
 test convert_units-5.4.5.1 {Rappture::Units::convert, cm2->/m2} {
     list [catch {Rappture::Units::convert 1cm -to /m2} msg] $msg
-} {1 {conversion unavailable: (cm1) -> (m-2)}}
+} {1 {Conversion unavailable: (cm) -> (m-2)
+Please enter units of type /length (/A2,/in2,/m2)}}
 
 #--------------------------------------------------------------------
@@ -785 +800 @@
 test convert_units-5.4.10.1 {Rappture::Units::convert, torr->mmhg} {
     list [catch {Rappture::Units::convert 5torr -to mmhg} msg] $msg
-} {0 5mmhg}
+} {0 5mmHg}
 
 test convert_units-5.4.10.2 {Rappture::Units::convert, ToRr->mmhg} {
     list [catch {Rappture::Units::convert 5ToRr -to mmhg} msg] $msg
-} {0 5mmhg}
+} {0 5mmHg}
 
 test convert_units-5.4.10.3 {Rappture::Units::convert, kpa->PSI} {
     list [catch {Rappture::Units::convert 5kpa -to PSI} msg] $msg
-} {0 0.7252PSI}
+} {0 0.7252psi}
 
 test convert_units-5.4.10.4 {Rappture::Units::convert, KPA->PsI} {
     list [catch {Rappture::Units::convert 5KPA -to PsI} msg] $msg
-} {0 0.7252PsI}
+} {0 0.7252psi}
 
 test convert_units-5.4.10.5 {Rappture::Units::convert, Cm2/vS->M2/KVUS} {
     list [catch {Rappture::Units::convert 2Cm2/vS -to M2/KVUS} msg] $msg
-} {0 2e-07M2/KVUS}
+} {0 2e-07m2/kVus}
 
 #--------------------------------------------------------------------