Changeset 91f592 for src

Timestamp:

Dec 28, 2011, 3:30:06 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:

6f0841

Parents:

aa6c75

git-author:

Frederik Heber <heber@…> (11/15/11 14:15:25)

git-committer:

Frederik Heber <heber@…> (12/28/11 15:30:06)

Message:

Added own convenience library for LinkedCell construct.

Location:

src

Files:

• LinkedCell/Makefile.am (added)
• LinkedCell/unittests/Makefile.am (added)
• LinkedCell/unittests/linkedcellUnitTest.cpp (moved) (moved from src/unittests/LinkedCellUnitTest.cpp ) (11 diffs)
• LinkedCell/unittests/linkedcellUnitTest.hpp (moved) (moved from src/unittests/LinkedCellUnitTest.hpp ) (1 diff)
• Makefile.am (modified) (4 diffs)
• UIElements/Makefile.am (modified) (1 diff)
• unittests/Makefile.am (modified) (7 diffs)

src/LinkedCell/unittests/linkedcellUnitTest.cpp

@@ -38 +38 @@
 #include "World.hpp"
 
-#include "LinkedCellUnitTest.hpp"
+#include "linkedcellUnitTest.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -47 +47 @@
 
 // Registers the fixture into the 'registry'
-CPPUNIT_TEST_SUITE_REGISTRATION( LinkedCellTest );
-
-
-void LinkedCellTest::setUp()
+CPPUNIT_TEST_SUITE_REGISTRATION( linkedcelltest );
+
+
+void linkedcelltest::setUp()
 {
   // failing asserts should be thrown
@@ -84 +84 @@
 
 
-void LinkedCellTest::tearDown()
+void linkedcelltest::tearDown()
 {
   delete(LC);
@@ -93 +93 @@
 /** UnitTest for LinkedCell::CheckBounds().
  */
-void LinkedCellTest::CheckBoundsTest()
+void linkedcelltest::CheckBoundsTest()
 {
   // check for within bounds
@@ -124 +124 @@
  * Note that CheckBounds() is used and has to be tested already.
  */
-void LinkedCellTest::GetCurrentCellTest()
+void linkedcelltest::GetCurrentCellTest()
 {
   // within bounds
@@ -145 +145 @@
 /** UnitTest for LinkedCell::GetRelativeToCurrentCell().
  */
-void LinkedCellTest::GetRelativeToCurrentCellTest()
+void linkedcelltest::GetRelativeToCurrentCellTest()
 {
   int offset[3];
@@ -202 +202 @@
 /** UnitTest for LinkedCell::SetIndexToNode().
  */
-void LinkedCellTest::SetIndexToNodeTest()
+void linkedcelltest::SetIndexToNodeTest()
 {
   // check all atoms
@@ -227 +227 @@
 /** UnitTest for LinkedCell::SetIndexToVector().
  */
-void LinkedCellTest::SetIndexToVectorTest()
+void linkedcelltest::SetIndexToVectorTest()
 {
   Vector tester;
@@ -263 +263 @@
 /** UnitTest for LinkedCell::GetNeighbourBounds().
  */
-void LinkedCellTest::GetNeighbourBoundsTest()
+void linkedcelltest::GetNeighbourBoundsTest()
 {
   Vector tester;
@@ -280 +280 @@
 /** UnitTest for LinkedCell::GetallNeighbours().
  */
-void LinkedCellTest::GetallNeighboursTest()
+void linkedcelltest::GetallNeighboursTest()
 {
   Vector tester;
@@ -341 +341 @@
 /** UnitTest for LinkedCell::GetPointsInsideSphere().
  */
-void LinkedCellTest::GetPointsInsideSphereTest()
+void linkedcelltest::GetPointsInsideSphereTest()
 {
   Vector tester;

src/LinkedCell/unittests/linkedcellUnitTest.hpp

@@ -25 +25 @@
 /********************************************** Test classes **************************************/
 
-class LinkedCellTest : public CppUnit::TestFixture
+class linkedcelltest : public CppUnit::TestFixture
 {
-    CPPUNIT_TEST_SUITE( LinkedCellTest) ;
+    CPPUNIT_TEST_SUITE( linkedcelltest) ;
     CPPUNIT_TEST ( CheckBoundsTest );
     CPPUNIT_TEST ( GetCurrentCellTest );

src/Makefile.am

@@ -15 +15 @@
 include Graph/Makefile.am
 include Helpers/Makefile.am
+include LinkedCell/Makefile.am
 include Parser/Makefile.am
 include RandomNumbers/Makefile.am
@@ -115 +116 @@
         Dynamics/VerletForceIntegration.hpp
 
-LINKEDCELLSOURCE = \
-  LinkedCell/linkedcell.cpp
-
-LINKEDCELLHEADER = \
-  LinkedCell/linkedcell.hpp \
-  LinkedCell/IPointCloud.hpp \
-  LinkedCell/PointCloudAdaptor.hpp
-
 THERMOSTATSOURCE = \
   Thermostats/Berendsen.cpp \
@@ -175 +168 @@
   ${DESCRIPTORSOURCE} \
   ${DYNAMICSSOURCE} \
-  ${LINKEDCELLSOURCE} \
   ${THERMOSTATSOURCE} \
   ${TESSELATIONSOURCE} \
@@ -197 +189 @@
   ${DESCRIPTORIMPLHEADER} \
   ${DYNAMICSHEADER} \
-  ${LINKEDCELLHEADER} \
   ${THERMOSTATHEADER} \
   ${TESSELATIONHEADER} \

src/UIElements/Makefile.am

@@ -267 +267 @@
         libMolecuilderParser.la \
         libMolecuilderShapes.la \
+        libMolecuilderLinkedCell.la \
         libMolecuilderHelpers.la \
         libMolecuilderElement.la \

src/unittests/Makefile.am

@@ -12 +12 @@
 include ../../src/Fragmentation/unittests/Makefile.am
 include ../../src/Graph/unittests/Makefile.am
+include ../../src/LinkedCell/unittests/Makefile.am
 include ../../src/Parser/unittests/Makefile.am
 include ../../src/RandomNumbers/unittests/Makefile.am
@@ -27 +28 @@
   BoxUnitTest \
   FormulaUnittest \
-  LinkedCellUnitTest \
   ListOfBondsUnitTest \
   WorldTimeUnitTest
@@ -64 +64 @@
         ${FRAGMENTATIONTESTSSOURCES} \
         ${GRAPHTESTSSOURCES} \
+        ${LINKEDCELLSOURCES} \
         ${LINEARALGEBRATESTSSOURCES} \
         ${PARSERTESTSSOURCES} \
@@ -73 +74 @@
   BoxUnitTest.cpp \
   FormulaUnitTest.cpp \
-  LinkedCellUnitTest.cpp \
   ListOfBondsUnitTest.cpp \
   WorldTimeUnitTest.cpp
@@ -84 +84 @@
         ${FRAGMENTATIONTESTSHEADERS} \
         ${GRAPHTESTSHEADERS} \
+        ${LINKEDCELLHEADERS} \
         ${LINEARALGEBRATESTSHEADERS} \
         ${PARSERTESTSHEADERS} \
@@ -93 +94 @@
   BoxUnitTest.hpp \
   FormulaUnitTest.hpp \
-  LinkedCellUnitTest.hpp \
   ListOfBondsUnitTest.hpp \
   WorldTimeUnitTest.hpp
@@ -112 +112 @@
 FormulaUnittest_LDADD = $(ALLLIBS)
 
-LinkedCellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        LinkedCellUnitTest.cpp \
-        LinkedCellUnitTest.hpp
-LinkedCellUnitTest_LDADD = $(ALLLIBS)
-
 ListOfBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ListOfBondsUnitTest.cpp \