Changeset 5344e4 for src/LinkedCell

Timestamp:

Jan 2, 2012, 1:00: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:

c379f9

Parents:

d82961

git-author:

Frederik Heber <heber@…> (11/18/11 08:11:57)

git-committer:

Frederik Heber <heber@…> (01/02/12 13:00:04)

Message:

Added implementation of linked cell view part with high-level functions.

• LinkedCell_View has nearest neighbor functionality.

Location:

src/LinkedCell

Files:

• LinkedCell.hpp (modified) (1 diff)
• LinkedCell_View.cpp (added)
• LinkedCell_View.hpp (added)
• types.hpp (modified) (1 diff)
• unittests/LinkedCell_ViewUnitTest.cpp (added)
• unittests/LinkedCell_ViewUnitTest.hpp (added)
• unittests/Makefile.am (modified) (4 diffs)

src/LinkedCell/LinkedCell.hpp

@@ -16 +16 @@
 #include "LinkedCell/types.hpp"
 
+class TesselPoint;
+
 namespace LinkedCell {
-
-  //!> linked list of tesselpoints
-  typedef std::list<TesselPoint *> LinkedList;
-
 
   /** This class contains a specific cell of a three-dimensional linked cell

src/LinkedCell/types.hpp

@@ -31 +31 @@
   class LinkedCell;
 
+  //!> linked list of tesselpoints
+  typedef std::list<TesselPoint *> LinkedList;
+
   //!> three-dimensional array of LinkedCell instances
   typedef boost::multi_array<LinkedCell *, NDIM> LinkedCellArray;

src/LinkedCell/unittests/Makefile.am

@@ -5 +5 @@
         ../LinkedCell/LinkedCell.cpp \
         ../LinkedCell/LinkedCell_Model.cpp \
+        ../LinkedCell/LinkedCell_View.cpp \
         ../LinkedCell/unittests/LinkedCellUnitTest.cpp \
         ../LinkedCell/unittests/LinkedCell_ModelUnitTest.cpp \
+        ../LinkedCell/unittests/LinkedCell_ViewUnitTest.cpp \
         ../LinkedCell/unittests/linkedcellUnitTest.cpp
 
@@ -12 +14 @@
         ../LinkedCell/LinkedCell.hpp \
         ../LinkedCell/LinkedCell_Model.hpp \
+        ../LinkedCell/LinkedCell_View.hpp \
         ../LinkedCell/PointCloudAdaptor.hpp \
         ../LinkedCell/unittests/LinkedCellUnitTest.hpp \
         ../LinkedCell/unittests/LinkedCell_ModelUnitTest.hpp \
+        ../LinkedCell/unittests/LinkedCell_ViewUnitTest.hpp \
         ../LinkedCell/unittests/linkedcellUnitTest.hpp
 
@@ -20 +24 @@
   LinkedCellUnitTest \
   LinkedCell_ModelUnitTest \
+  LinkedCell_ViewUnitTest \
   linkedcellUnitTest
 
@@ -59 +64 @@
 LinkedCell_ModelUnitTest_LDADD = $(LINKEDCELLLIBS)
 
+LinkedCell_ViewUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ../LinkedCell/unittests/LinkedCell_ViewUnitTest.cpp \
+        ../LinkedCell/unittests/LinkedCell_ViewUnitTest.hpp \
+        ../LinkedCell/LinkedCell.cpp \
+        ../LinkedCell/LinkedCell_Model.cpp \
+        ../LinkedCell/LinkedCell_View.cpp \
+        ../LinkedCell/LinkedCell.hpp \
+        ../LinkedCell/LinkedCell_Model.hpp \
+        ../LinkedCell/LinkedCell_View.hpp \
+        ../LinkedCell/PointCloudAdaptor.hpp
+LinkedCell_ViewUnitTest_LDADD = $(LINKEDCELLLIBS)
 
 #AUTOMAKE_OPTIONS = parallel-tests