Changeset 104 for trunk/test/src

Timestamp:

Oct 14, 2005 9:43:27 AM (17 years ago)

Author:

dkearney

Message:

This update brings us one step closer to being const correct in the RpUnits
class. Added a few more comments. All other files touched were made to
comply with the new const correct RpUnits.[h,cc]

Location:

trunk/test/src

Files:

• RpNumber_test.cc (modified) (1 diff)
• RpUnitsC_test.c (modified) (1 diff)
• RpUnits_test.cc (modified) (6 diffs)

trunk/test/src/RpNumber_test.cc

@@ -84 +84 @@
 void define_some_units()
 {
-    RpUnits * meters = RpUnits::define("m", NULL);
+    const RpUnits * meters = RpUnits::define("m", NULL);
     RpUnits::makeMetric(meters);
     RpUnits::define("V", NULL);
     RpUnits::define("s", NULL);
     RpUnits::define("cm2/Vs", NULL);
-    RpUnits* angstrom = RpUnits::define("A", NULL);
+    const RpUnits* angstrom = RpUnits::define("A", NULL);
     RpUnits::define(angstrom, meters, angstrom2meter, meter2angstrom);
-    RpUnits* fahrenheit = RpUnits::define("F", NULL);
-    RpUnits* celcius = RpUnits::define("C", NULL);
-    RpUnits* kelvin = RpUnits::define("K", NULL);
+    const RpUnits* fahrenheit = RpUnits::define("F", NULL);
+    const RpUnits* celcius = RpUnits::define("C", NULL);
+    const RpUnits* kelvin = RpUnits::define("K", NULL);
     RpUnits::define(fahrenheit, celcius, fahrenheit2centigrade, centigrade2fahrenheit);
     RpUnits::define(celcius, kelvin, centigrade2kelvin, kelvin2centigrade);

trunk/test/src/RpUnitsC_test.c

@@ -51 +51 @@
 {
 
-    RpUnits* meters = rpDefineUnit("m",NULL);
+    const RpUnits* meters = rpDefineUnit("m",NULL);
 
-    RpUnits* centimeters = NULL;
-    RpUnits* nanometers = NULL;
-    RpUnits* cm_basis = NULL;
+    const RpUnits* centimeters = NULL;
+    const RpUnits* nanometers = NULL;
+    const RpUnits* cm_basis = NULL;
 
-    RpUnits* angstrom = rpDefineUnit("A",NULL);
-    RpUnits* fahrenheit = rpDefineUnit("F",NULL);
-    RpUnits* celcius = rpDefineUnit("C",NULL);
-    RpUnits* kelvin = rpDefineUnit("K",NULL);
+    const RpUnits* angstrom = rpDefineUnit("A",NULL);
+    const RpUnits* fahrenheit = rpDefineUnit("F",NULL);
+    const RpUnits* celcius = rpDefineUnit("C",NULL);
+    const RpUnits* kelvin = rpDefineUnit("K",NULL);
 
     rpDefineConv(angstrom, meters, angstrom2meter, meter2angstrom);

trunk/test/src/RpUnits_test.cc

@@ -33 +33 @@
     //
     printf ("=============== TEST 1 ===============\n");
-    RpUnits * meters = RpUnits::define("m", NULL);
+    const RpUnits * meters = RpUnits::define("m", NULL);
     // (meters) ? success() : fail();
     // RpUnits * centimeter = RpUnits::define("cm", NULL);
@@ -54 +54 @@
 */
     
-    RpUnits* mobility = RpUnits::define("cm2/Vs", NULL);
+    const RpUnits* mobility = RpUnits::defineCmplx("cm2/Vs", NULL);
     std::cout << "mobility = :" << mobility->getUnitsName() <<":"<< std::endl;
 
-    RpUnits* mobility2 = RpUnits::find("cm2V-1s-1");
+    const RpUnits* mobility2 = RpUnits::find("cm2V-1s-1");
     if (mobility2) { 
         std::cout << "mobility2 exists" << std::endl;
@@ -67 +67 @@
     }
 
-    RpUnits* cmeters = RpUnits::find("cm");
-    RpUnits* angstrom = RpUnits::define("A", NULL);
+    const RpUnits* cmeters = RpUnits::find("cm");
+    const RpUnits* angstrom = RpUnits::define("A", NULL);
     RpUnits::define(angstrom, meters, angstrom2meter, meter2angstrom);
 
@@ -79 +79 @@
 
 
-    RpUnits* fahrenheit  = RpUnits::define("F", NULL);
-    RpUnits* celcius  = RpUnits::define("C", NULL);
-    RpUnits* kelvin  = RpUnits::define("K", NULL);
+    const RpUnits* fahrenheit  = RpUnits::define("F", NULL);
+    const RpUnits* celcius  = RpUnits::define("C", NULL);
+    const RpUnits* kelvin  = RpUnits::define("K", NULL);
     
     RpUnits::define(fahrenheit, celcius, fahrenheit2centigrade, centigrade2fahrenheit);
@@ -155 +155 @@
     printf ("=============== TEST 4.4 ===============\n");
 
-    RpUnits * millimeter = RpUnits::find("mm");
-    RpUnits * micrometer = RpUnits::find("um");
-    RpUnits * nanometer  = RpUnits::find("nm");
-    RpUnits * picometer  = RpUnits::find("pm");
-    RpUnits * femtometer = RpUnits::find("fm");
-    RpUnits * attometer  = RpUnits::find("am");
-    RpUnits * kilometer  = RpUnits::find("km");
-    RpUnits * megameter  = RpUnits::find("Mm");
-    RpUnits * gigameter  = RpUnits::find("Gm");
-    RpUnits * terameter  = RpUnits::find("Tm");
-    RpUnits * petameter  = RpUnits::find("Pm");
+    const RpUnits * millimeter = RpUnits::find("mm");
+    const RpUnits * micrometer = RpUnits::find("um");
+    const RpUnits * nanometer  = RpUnits::find("nm");
+    const RpUnits * picometer  = RpUnits::find("pm");
+    const RpUnits * femtometer = RpUnits::find("fm");
+    const RpUnits * attometer  = RpUnits::find("am");
+    const RpUnits * kilometer  = RpUnits::find("km");
+    const RpUnits * megameter  = RpUnits::find("Mm");
+    const RpUnits * gigameter  = RpUnits::find("Gm");
+    const RpUnits * terameter  = RpUnits::find("Tm");
+    const RpUnits * petameter  = RpUnits::find("Pm");
 
     value = 1.0e+3;
@@ -256 +256 @@
 
 
-    RpUnits* eV  = RpUnits::define("eV", NULL);
-    RpUnits* joules  = RpUnits::define("J", NULL);
+    const RpUnits* eV  = RpUnits::define("eV", NULL);
+    const RpUnits* joules  = RpUnits::define("J", NULL);
     
     RpUnits::define(eV, joules, electronVolt2joule, joule2electronVolt);