Changeset fea945 for src/LinkedCell

Timestamp:

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

9a5649

Parents:

6b91e64

git-author:

Frederik Heber <heber@…> (11/18/11 15:07:38)

git-committer:

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

Message:

Added simple implementation for LinkedCell_Controller.

• getBestModel() contains the (non-working) heuristic stub.
• getView() calls getBestModel() to obtain current best model or creates a new one and returns the view of this model.
• added unit test that does not yet test any functionality.

Location:

src/LinkedCell

Files:

• LinkedCell_Controller.cpp (added)
• LinkedCell_Controller.hpp (added)
• Makefile.am (modified) (2 diffs)
• unittests/LinkedCell_ControllerUnitTest.cpp (added)
• unittests/LinkedCell_ControllerUnitTest.hpp (added)
• unittests/Makefile.am (modified) (5 diffs)

src/LinkedCell/Makefile.am

@@ -54 +54 @@
 LINKEDCELL_REFACTOREDSOURCE = \
   LinkedCell/LinkedCell.cpp \
+  LinkedCell/LinkedCell_Controller.cpp \
   LinkedCell/LinkedCell_Model.cpp \
   LinkedCell/LinkedCell_View.cpp
@@ -59 +60 @@
 LINKEDCELL_REFACTOREDHEADER = \
   LinkedCell/LinkedCell.hpp \
+  LinkedCell/LinkedCell_Controller.hpp \
   LinkedCell/LinkedCell_Model.hpp \
   LinkedCell/LinkedCell_View.hpp

src/LinkedCell/unittests/Makefile.am

@@ -4 +4 @@
 LINKEDCELLTESTSSOURCES = \
         ../LinkedCell/unittests/LinkedCellUnitTest.cpp \
+        ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.cpp \
         ../LinkedCell/unittests/LinkedCell_ModelUnitTest.cpp \
         ../LinkedCell/unittests/LinkedCell_ViewUnitTest.cpp \
@@ -11 +12 @@
         ../LinkedCell/PointCloudAdaptor.hpp \
         ../LinkedCell/unittests/LinkedCellUnitTest.hpp \
+        ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.hpp \
         ../LinkedCell/unittests/LinkedCell_ModelUnitTest.hpp \
         ../LinkedCell/unittests/LinkedCell_ViewUnitTest.hpp \
@@ -17 +19 @@
 LINKEDCELLTESTS = \
   LinkedCellUnitTest \
+  LinkedCell_ControllerUnitTest \
   LinkedCell_ModelUnitTest \
   LinkedCell_ViewUnitTest \
   linkedcellUnitTest
-
 
 TESTS += $(LINKEDCELLTESTS)
@@ -45 +47 @@
         $(LINKEDCELLLIBS)
 
+LinkedCell_ControllerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.cpp \
+        ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.hpp
+LinkedCell_ControllerUnitTest_LDADD = \
+        ../libMolecuilderLinkedCell_refactored.la \
+        $(LINKEDCELLLIBS)
+
 LinkedCell_ModelUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../LinkedCell/unittests/LinkedCell_ModelUnitTest.cpp \
-        ../LinkedCell/unittests/LinkedCell_ModelUnitTest.hpp \
-        ../LinkedCell/PointCloudAdaptor.hpp
+        ../LinkedCell/unittests/LinkedCell_ModelUnitTest.hpp
 LinkedCell_ModelUnitTest_LDADD = \
         ../libMolecuilderLinkedCell_refactored.la \
@@ -61 +69 @@
         $(LINKEDCELLLIBS)
 
+
 #AUTOMAKE_OPTIONS = parallel-tests