Ignore:
Timestamp:
Jul 20, 2010, 1:01:11 PM (15 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:
3d078d, 4b6777, c644a5
Parents:
ba9f5b (diff), 818eda (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'StructureRefactoring' into stable

Conflicts:

test_all.sh

  • test_all.sh was modified by Till in StructureRefactoring (these changes taken over).
  • World::setDomain() was missing OBSERVE macro.
  • MapOfActions: "molecule-by-name" needs String not Molecule.
  • TESTFIX: Tesselations/defs.in - paths changed such that @srcdir@ may be absolute.
  • TESTFIX: Tesselations/heptan/1.5/NonConvexEnvelope.dat - exchanged due to same surface but different polygon triangulation.
  • TESTFIX: Domain/4 molecule-by-id changed from 208 to 207 due to different handling of molecule ids.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    rba9f5b rbe97a8  
    3131  LogUnitTest \
    3232  manipulateAtomsTest \
    33   MemoryUsageObserverUnitTest \
    34   MemoryAllocatorUnitTest \
     33  MatrixUnittest \
    3534  MoleculeDescriptorTest \
    3635  ObserverTest \
    … …  
    3837  periodentafelTest \
    3938  PlaneUnittest \
     39  ShapeUnittest \
    4040  SingletonTest \
    4141  StackClassUnitTest \
    … …  
    7575  listofbondsunittest.cpp \
    7676  logunittest.cpp \
     77  MatrixUnittest.cpp \
    7778  manipulateAtomsTest.cpp \
    78   memoryallocatorunittest.cpp  \
    79   memoryusageobserverunittest.cpp \
    8079  MoleculeDescriptorTest.cpp \
    8180  ObserverTest.cpp \
    … …  
    8382  periodentafelTest.cpp \
    8483  PlaneUnittest.cpp \
     84  ShapeUnittest.cpp \
    8585  SingletonTest.cpp \
    8686  stackclassunittest.cpp \
    … …  
    112112  logunittest.hpp \
    113113  manipulateAtomsTest.hpp \
    114   memoryallocatorunittest.hpp  \
    115   memoryusageobserverunittest.hpp \
     114  MatrixUnittest.hpp \
    116115  MoleculeDescriptorTest.hpp \
    117116  periodentafelTest.hpp \
    … …  
    189188manipulateAtomsTest_LDADD = ${ALLLIBS}
    190189
    191 MemoryAllocatorUnitTest_SOURCES = UnitTestMain.cpp ../memoryallocator.hpp ../memoryallocator.cpp ../memoryusageobserver.cpp ../memoryusageobserver.hpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp
    192 MemoryAllocatorUnitTest_LDADD = ${ALLLIBS}
    193 
    194 MemoryUsageObserverUnitTest_SOURCES = UnitTestMain.cpp ../memoryallocator.hpp ../memoryusageobserver.cpp ../memoryusageobserver.hpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
    195 MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
     190MatrixUnittest_SOURCES = UnitTestMain.cpp MatrixUnittest.cpp MatrixUnittest.hpp
     191MatrixUnittest_LDADD = ${ALLLIBS}
    196192
    197193MoleculeDescriptorTest_SOURCES = UnitTestMain.cpp MoleculeDescriptorTest.cpp MoleculeDescriptorTest.hpp
    … …  
    210206PlaneUnittest_LDADD = ${ALLLIBS}
    211207
     208ShapeUnittest_SOURCES = UnitTestMain.cpp ShapeUnittest.cpp ShapeUnittest.hpp
     209ShapeUnittest_LDADD = ${ALLLIBS}
     210
    212211SingletonTest_SOURCES = UnitTestMain.cpp SingletonTest.cpp SingletonTest.hpp
    213212SingletonTest_LDADD = ${ALLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
    … …  
    225224Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
    226225
    227 TestRunner_SOURCES = TestRunnerMain.cpp ../memoryallocator.hpp ../memoryallocator.cpp ../memoryusageobserver.cpp ../memoryusageobserver.hpp $(TESTSOURCES) $(TESTHEADERS)
     226TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
    228227TestRunner_LDADD = ${ALLLIBS}
    229228
Note: See TracChangeset for help on using the changeset viewer.