Changeset fbbcde for src/LinkedCell/unittests

Timestamp:

Jan 6, 2012, 2:02:04 PM (13 years ago)

Author:

Frederik Heber <heber@…>

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, 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:

c0e28c

Parents:

9fd196

git-author:

Frederik Heber <heber@…> (01/03/12 17:21:33)

git-committer:

Frederik Heber <heber@…> (01/06/12 14:02:04)

Message:

FIX: TestRunner is now compiled based on AM_CONDITIONAL set by HAVE_ECUT.

Location:

src/LinkedCell/unittests

Files:

• LinkedCellUnitTest.cpp (modified) (1 diff)
• LinkedCell_ViewUnitTest.cpp (modified) (2 diffs)

src/LinkedCell/unittests/LinkedCellUnitTest.cpp

@@ -66 +66 @@
 
   // add a point
-  cell->push_back(Walker);
+  cell->insert(Walker);
   CPPUNIT_ASSERT_EQUAL((size_t)1, cell->size());
 

src/LinkedCell/unittests/LinkedCell_ViewUnitTest.cpp

@@ -119 +119 @@
   for (PointSet::const_iterator iter = NodeList.begin(); iter != NodeList.end(); ++iter)
     if (center.DistanceSquared((*iter)->getPosition()) <= distance*distance) {
-      ComparisonList.push_back(*iter);
+      ComparisonList.insert(*iter);
       //std::cout << **iter << " is inside of " << center << " plus " << distance << "." << std::endl;
     }
   // check that we get at least as many as needed
   CPPUNIT_ASSERT(ComparisonList.size() <= NeighborList.size());
-
-  // sort lists to ease comparison
-  ComparisonList.sort();
-  NeighborList.sort();
 
   // check element-wise and skip unrequired ones
@@ -160 +156 @@
   for (PointSet::const_iterator iter = NodeList.begin(); iter != NodeList.end(); ++iter)
     if (center.DistanceSquared((*iter)->getPosition()) <= distance*distance) {
-      ComparisonList.push_back(*iter);
+      ComparisonList.insert(*iter);
       //std::cout << **iter << " is inside of " << center << " plus " << distance << "." << std::endl;
     }
   // check that we get at least as many as needed
   CPPUNIT_ASSERT(ComparisonList.size() == NeighborList.size());
-
-  // sort lists to ease comparison
-  ComparisonList.sort();
-  NeighborList.sort();
 
   // check element-wise and skip unrequired ones