Changeset cd032d for src/unittests/AtomDescriptorTest.cpp

Timestamp:

Mar 11, 2010, 2:46:41 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, Candidate_v1.7.0, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

68d781

Parents:

a77c96 (diff), ed58ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into QT4Refactoring

Conflicts:

molecuilder/src/builder.cpp
molecuilder/src/defs.hpp

File:

• src/unittests/AtomDescriptorTest.cpp (modified) (10 diffs)

src/unittests/AtomDescriptorTest.cpp

@@ -29 +29 @@
 // set up and tear down
 void AtomDescriptorTest::setUp(){
-  World::get();
+  World::getInstance();
   for(int i=0;i<ATOM_COUNT;++i){
-    atoms[i]= World::get()->createAtom();
+    atoms[i]= World::getInstance().createAtom();
     atomIds[i]= atoms[i]->getId();
   }
@@ -37 +37 @@
 
 void AtomDescriptorTest::tearDown(){
-  World::destroy();
+  World::purgeInstance();
 }
 
@@ -73 +73 @@
 
 void AtomDescriptorTest::AtomBaseSetsTest(){
-  std::vector<atom*> allAtoms = World::get()->getAllAtoms(AllAtoms());
+  std::vector<atom*> allAtoms = World::getInstance().getAllAtoms(AllAtoms());
   CPPUNIT_ASSERT_EQUAL( true , hasAllAtoms(allAtoms,atomIds));
   CPPUNIT_ASSERT_EQUAL( true , hasNoDuplicateAtoms(allAtoms));
 
-  std::vector<atom*> noAtoms = World::get()->getAllAtoms(NoAtoms());
+  std::vector<atom*> noAtoms = World::getInstance().getAllAtoms(NoAtoms());
   CPPUNIT_ASSERT_EQUAL( true , noAtoms.empty());
 }
@@ -83 +83 @@
   // test Atoms from boundaries and middle of the set
   atom* testAtom;
-  testAtom = World::get()->getAtom(AtomById(atomIds[0]));
+  testAtom = World::getInstance().getAtom(AtomById(atomIds[0]));
   CPPUNIT_ASSERT(testAtom);
   CPPUNIT_ASSERT_EQUAL( atomIds[0], testAtom->getId());
-  testAtom = World::get()->getAtom(AtomById(atomIds[ATOM_COUNT/2]));
+  testAtom = World::getInstance().getAtom(AtomById(atomIds[ATOM_COUNT/2]));
   CPPUNIT_ASSERT(testAtom);
   CPPUNIT_ASSERT_EQUAL( atomIds[ATOM_COUNT/2], testAtom->getId());
-  testAtom = World::get()->getAtom(AtomById(atomIds[ATOM_COUNT-1]));
+  testAtom = World::getInstance().getAtom(AtomById(atomIds[ATOM_COUNT-1]));
   CPPUNIT_ASSERT(testAtom);
   CPPUNIT_ASSERT_EQUAL( atomIds[ATOM_COUNT-1], testAtom->getId());
@@ -103 +103 @@
   }
   // test from outside of set
-  testAtom = World::get()->getAtom(AtomById(outsideId));
+  testAtom = World::getInstance().getAtom(AtomById(outsideId));
   CPPUNIT_ASSERT(!testAtom);
 }
@@ -109 +109 @@
   // test some elementary set operations
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(AllAtoms()||NoAtoms());
+    std::vector<atom*> testAtoms = World::getInstance().getAllAtoms(AllAtoms()||NoAtoms());
     CPPUNIT_ASSERT_EQUAL( true , hasAllAtoms(testAtoms,atomIds));
     CPPUNIT_ASSERT_EQUAL( true , hasNoDuplicateAtoms(testAtoms));
@@ -115 +115 @@
 
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(NoAtoms()||AllAtoms());
+    std::vector<atom*> testAtoms = World::getInstance().getAllAtoms(NoAtoms()||AllAtoms());
     CPPUNIT_ASSERT_EQUAL( true , hasAllAtoms(testAtoms,atomIds));
     CPPUNIT_ASSERT_EQUAL( true , hasNoDuplicateAtoms(testAtoms));
@@ -121 +121 @@
 
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(NoAtoms()&&AllAtoms());
+    std::vector<atom*> testAtoms = World::getInstance().getAllAtoms(NoAtoms()&&AllAtoms());
     CPPUNIT_ASSERT_EQUAL( true , testAtoms.empty());
   }
 
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(AllAtoms()&&NoAtoms());
+    std::vector<atom*> testAtoms = World::getInstance().getAllAtoms(AllAtoms()&&NoAtoms());
     CPPUNIT_ASSERT_EQUAL( true , testAtoms.empty());
   }
 
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(!AllAtoms());
+    std::vector<atom*> testAtoms = World::getInstance().getAllAtoms(!AllAtoms());
     CPPUNIT_ASSERT_EQUAL( true , testAtoms.empty());
   }
 
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(!NoAtoms());
+    std::vector<atom*> testAtoms = World::getInstance().getAllAtoms(!NoAtoms());
     CPPUNIT_ASSERT_EQUAL( true , hasAllAtoms(testAtoms,atomIds));
     CPPUNIT_ASSERT_EQUAL( true , hasNoDuplicateAtoms(testAtoms));
@@ -143 +143 @@
   // exclude and include some atoms
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(AllAtoms()&&(!AtomById(atomIds[ATOM_COUNT/2])));
+    std::vector<atom*> testAtoms = World::getInstance().getAllAtoms(AllAtoms()&&(!AtomById(atomIds[ATOM_COUNT/2])));
     std::set<atomId_t> excluded;
     excluded.insert(atomIds[ATOM_COUNT/2]);
@@ -152 +152 @@
 
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(NoAtoms()||(AtomById(atomIds[ATOM_COUNT/2])));
+    std::vector<atom*> testAtoms = World::getInstance().getAllAtoms(NoAtoms()||(AtomById(atomIds[ATOM_COUNT/2])));
     CPPUNIT_ASSERT_EQUAL( (size_t)1, testAtoms.size());
     CPPUNIT_ASSERT_EQUAL( atomIds[ATOM_COUNT/2], testAtoms[0]->getId());