Changeset 79ac03 for src/Graph/unittests


Ignore:
Timestamp:
Dec 13, 2012, 10:12:51 AM (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, Candidate_v1.7.0, 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:
c8f12e
Parents:
a576eb (diff), 12a24c (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 'Fragmentation_Homology' into Candidate_v1.3.7

Conflicts:

src/unittests/Makefile.am

Location:
src/Graph/unittests
Files:
2 added
2 deleted
1 edited

Legend:

Unmodified
Added
Removed

  • src/Graph/unittests/Makefile.am

    ra576eb r79ac03  
    33
    44GRAPHTESTSSOURCES = \
    5         ../Graph/unittests/BondGraphUnitTest.cpp \
    6         ../Graph/unittests/CheckAgainstAdjacencyFileUnitTest.cpp
     5        ../Graph/unittests/AdjacencyListUnitTest.cpp \
     6        ../Graph/unittests/BondGraphUnitTest.cpp
    77
    88GRAPHTESTSHEADERS = \
    9         ../Graph/unittests/BondGraphUnitTest.hpp \
    10         ../Graph/unittests/CheckAgainstAdjacencyFileUnitTest.hpp
     9        ../Graph/unittests/AdjacencyListUnitTest.hpp \
     10        ../Graph/unittests/BondGraphUnitTest.hpp
    1111
    1212GRAPHTESTS = \
    13         BondGraphUnitTest \
    14         CheckAgainstAdjacencyFileUnitTest
     13        AdjacencyListUnitTest \
     14        BondGraphUnitTest
    1515
    1616
    … …  
    3232
    3333
     34AdjacencyListUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     35        ../Graph/unittests/AdjacencyListUnitTest.cpp \
     36        ../Graph/unittests/AdjacencyListUnitTest.hpp
     37AdjacencyListUnitTest_LDADD = ${ALLLIBS}
     38
    3439BondGraphUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    3540        ../Graph/unittests/BondGraphUnitTest.cpp \
    … …  
    3742BondGraphUnitTest_LDADD = ${GRAPHLIBS}
    3843
    39 CheckAgainstAdjacencyFileUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    40         ../Graph/unittests/CheckAgainstAdjacencyFileUnitTest.cpp \
    41         ../Graph/unittests/CheckAgainstAdjacencyFileUnitTest.hpp
    42 CheckAgainstAdjacencyFileUnitTest_LDADD = ${ALLLIBS}
    43 
    4444
    4545
Note: See TracChangeset for help on using the changeset viewer.