Changeset 2ced6b for src/LinkedCell

Timestamp:

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

69459d

Parents:

b1c5ddb

git-author:

Frederik Heber <heber@…> (12/22/11 09:26:45)

git-committer:

Frederik Heber <heber@…> (01/02/12 13:34:58)

Message:

Replaced Molecuilder library dependencies by stubs in LinkedCell_...UnitTests.

• Implemented stubs for World and AtomObserver.
• Renamed BoxStub to ObserverBoxStub.
• Enhanced stub for TesselPoint, defines its own class to get around all those virtual inheritances.
• LinkedCell_ControllerUnitTest uses molecuilderLinkedCell lib but no other, everything else is stubbed.
• LinkedCellUnitTest is now the same.

Location:

src/LinkedCell/unittests

Files:

• Makefile.am (modified) (5 diffs)
• stubs/AtomObserverStub.cpp (added)
• stubs/AtomStub.cpp (moved) (moved from src/LinkedCell/unittests/stubs/LinkedCellStub.cpp ) (2 diffs)
• stubs/LinkedCell_ModelStub.cpp (deleted)
• stubs/LinkedCell_ViewStub.cpp (deleted)
• stubs/ObserverBoxStub.cpp (added)
• stubs/TesselPointStub.cpp (added)
• stubs/WorldStub.cpp (added)

src/LinkedCell/unittests/Makefile.am

@@ -29 +29 @@
 
 LINKEDCELLLIBS = \
-        ../libMolecuilderUI.la \
-        ../libMolecuilder.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
@@ -38 +36 @@
         ../LinkedCell/unittests/linkedcellUnitTest.cpp \
         ../LinkedCell/unittests/linkedcellUnitTest.hpp
-linkedcellUnitTest_LDADD = $(LINKEDCELLLIBS)
+linkedcellUnitTest_LDADD = \
+        ../libMolecuilderUI.la \
+        ../libMolecuilder.la \
+        $(LINKEDCELLLIBS)
 
 LinkedCellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../LinkedCell/unittests/LinkedCellUnitTest.cpp \
-        ../LinkedCell/unittests/LinkedCellUnitTest.hpp
+        ../LinkedCell/unittests/LinkedCellUnitTest.hpp \
+        ../LinkedCell/unittests/stubs/TesselPointStub.cpp
 LinkedCellUnitTest_LDADD = \
+        ../libMolecuilderLinkedCell.la \
         $(LINKEDCELLLIBS)
 
@@ -49 +52 @@
         ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.cpp \
         ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.hpp \
-        ../LinkedCell/unittests/stubs/LinkedCell_ModelStub.cpp \
-        ../LinkedCell/unittests/stubs/LinkedCell_ViewStub.cpp \
-        ../LinkedCell/unittests/stubs/LinkedCellStub.cpp \
-  ../LinkedCell/LinkedCell_Controller.cpp \
-  ../LinkedCell/LinkedCell.hpp \
-  ../LinkedCell/LinkedCell_Controller.hpp \
-  ../LinkedCell/LinkedCell_Model.hpp \
-  ../LinkedCell/LinkedCell_View.hpp \
+        ../LinkedCell/unittests/stubs/AtomStub.cpp \
+        ../LinkedCell/unittests/stubs/AtomObserverStub.cpp \
+        ../LinkedCell/unittests/stubs/ObserverBoxStub.cpp \
+        ../LinkedCell/unittests/stubs/TesselPointStub.cpp \
+        ../LinkedCell/unittests/stubs/WorldStub.cpp \
         ../LinkedCell/PointCloudAdaptor.hpp
 LinkedCell_ControllerUnitTest_LDADD = \
+        ../libMolecuilderLinkedCell.la \
         $(LINKEDCELLLIBS)
 
@@ -65 +66 @@
         ../LinkedCell/unittests/LinkedCell_ModelUnitTest.hpp
 LinkedCell_ModelUnitTest_LDADD = \
+        ../libMolecuilderUI.la \
+        ../libMolecuilder.la \
         $(LINKEDCELLLIBS)
 
@@ -72 +75 @@
         ../LinkedCell/PointCloudAdaptor.hpp
 LinkedCell_ViewUnitTest_LDADD = \
+        ../libMolecuilderUI.la \
+        ../libMolecuilder.la \
         $(LINKEDCELLLIBS)
 

src/LinkedCell/unittests/stubs/AtomStub.cpp

@@ -7 +7 @@
 
 /*
- * LinkedCellStub.cpp
+ * AtomStub.cpp
  *
- *  Created on: Nov 29, 2011
+ *  Created on: Dec 22, 2011
  *      Author: heber
  */
@@ -20 +20 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "LinkedCell/LinkedCell.hpp"
-#include "LinkedCell/types.hpp"
+#include "Atom/atom.hpp"
 
-
-
-LinkedCell::LinkedCell::LinkedCell(const tripleIndex &_indices) :
-    indices(_indices)
-{}
-
-LinkedCell::LinkedCell::~LinkedCell()
-{
+int atom::getNr() const {
+  return 0;
 }