Changeset 114 for trunk/test

Timestamp:

Oct 20, 2005 8:47:25 PM (19 years ago)

Author:

dkearney

Message:

updates to RpUnits to reduce memory leaks
created copy constructors, destructors, and copy assignment operators
for Units classes. removed conv as a data member and removed several
constructors. removed prev & next pointers from conversion class.
this removes linked list feature from conversion class which was not
being used. this update does not fix python's problem with performing
conversion between RpUnits objects or the allow for the recognition of
/cm3 as an object related to cm3.

also removed some outdated files rappture_interface.h, rappture_interface.c.
RpDict?.cc has been moved into RpDict?.h in previous checkins to reduce
dependencies on include files.

File:

• trunk/test/src/RpUnits_test.cc (modified) (3 diffs)

trunk/test/src/RpUnits_test.cc

@@ -258 +258 @@
     const RpUnits* eV  = RpUnits::define("eV", NULL);
     const RpUnits* joules  = RpUnits::define("J", NULL);
-    
+
     RpUnits::define(eV, joules, electronVolt2joule, joule2electronVolt);
-    
+
     value = joules->convert(eV,1,&result);
     std::cout << "1 joule = " << value << " electronVolts" << std::endl;
-    
+
     value = eV->convert(joules,1,&result);
     std::cout << "1 electronVolt = " << value << " joules" << std::endl;
-    
+
     strValue = RpUnits::convert("10eV","J",1);
     std::cout << "strValue convert(10eV,J,1) = " << strValue << std::endl;
@@ -272 +272 @@
     strValue = RpUnits::convert("1eV","J",0);
     std::cout << "strValue convert(1eV,J,0) = " << strValue << std::endl;
-    
+
     strValue = RpUnits::convert("10J","eV",1);
     std::cout << "strValue convert(10J,eV,1) = " << strValue << std::endl;
@@ -278 +278 @@
     strValue = RpUnits::convert("1J","eV",0);
     std::cout << "strValue convert(1J,eV,0) = " << strValue << std::endl;
-    
+
+
+
+
+
+
+    std::cout << "TESTING COPY CONSTRUCTOR" << std::endl;
+
+    RpUnits *origRpUnits = RpUnits::define("obj2", NULL);
+    RpUnits copyRpUnits = *origRpUnits;
+
+    std::cout << "origRpUnits = " << origRpUnits->getUnitsName() << std::endl;
+    std::cout << "copyRpUnits = " << copyRpUnits.getUnitsName() << std::endl;
+    std::cout << "modifying origRpUnits" << std::endl;
+    delete origRpUnits;
+    origRpUnits = RpUnits::define("obj3",NULL);
+    std::cout << "origRpUnits = " << origRpUnits->getUnitsName() << std::endl;
+    std::cout << "copyRpUnits = " << copyRpUnits.getUnitsName() << std::endl;
+    std::cout << "deleting origRpUnits" << std::endl;
+    delete origRpUnits;
+    std::cout << "copyRpUnits = " << copyRpUnits.getUnitsName() << std::endl;
+
+    std::cout << "TESTING COPY ASSIGNMENT OPERATOR" << std::endl;
+
+    RpUnits *testRpUnits = RpUnits::define("test2", NULL);
+    copyRpUnits = *testRpUnits;
+
+    std::cout << "testRpUnits = " << testRpUnits->getUnitsName() << std::endl;
+    std::cout << "copyRpUnits = " << copyRpUnits.getUnitsName() << std::endl;
+    std::cout << "modifying testRpUnits" << std::endl;
+    delete testRpUnits;
+    testRpUnits = RpUnits::define("test3",NULL);
+    std::cout << "testRpUnits = " << testRpUnits->getUnitsName() << std::endl;
+    std::cout << "copyRpUnits = " << copyRpUnits.getUnitsName() << std::endl;
+    std::cout << "deleting testRpUnits" << std::endl;
+    delete testRpUnits;
+    std::cout << "copyRpUnits = " << copyRpUnits.getUnitsName() << std::endl;
     return 0;
 }