Changeset 4a6ef3

Timestamp:

Jul 12, 2017, 7:10:32 PM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChemicalSpaceEvaluator, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision

Children:

d1134d

Parents:

e0b960

git-author:

Frederik Heber <frederik.heber@…> (05/19/17 14:29:09)

git-committer:

Frederik Heber <frederik.heber@…> (07/12/17 19:10:32)

Message:

Moved AlwaysTruePredicate from BoostGraphCreatorUnitTest into BreadthFirstSearchGatherer.

Location:

src/Graph

Files:

• BreadthFirstSearchGatherer.hpp (modified) (2 diffs)
• unittests/BoostGraphCreatorUnitTest.cpp (modified) (3 diffs)

src/Graph/BreadthFirstSearchGatherer.hpp

@@ -21 +21 @@
 #include "types.hpp"
 
+class bond;
 struct BoostGraphCreator;
 
@@ -54 +55 @@
   { return distance_map; }
 
+  /** This is a default predicate which returns always true.
+   *
+   * \return true
+   */
+  static bool AlwaysTruePredicate(const bond &_bond) { return true; }
+
 private:
   //!> typedef for a vector of BFS discovery distances

src/Graph/unittests/BoostGraphCreatorUnitTest.cpp

@@ -45 +45 @@
 #include "Atom/atom.hpp"
 #include "Graph/BoostGraphCreator.hpp"
+#include "Graph/BreadthFirstSearchGatherer.hpp"
 #include "molecule.hpp"
 #include "Element/periodentafel.hpp"
@@ -149 +150 @@
 };
 
-static bool AlwaysTruePredicate(const bond &_bond) { return true; }
-
 /** Tests whether createFromMolecule() works.
  */
 void BoostGraphCreatorTest::createFromMoleculeTest()
 {
-  BGCreator->createFromMolecule(*TestMolecule, AlwaysTruePredicate);
+  BGCreator->createFromMolecule(*TestMolecule, BreadthFirstSearchGatherer::AlwaysTruePredicate);
 
   CPPUNIT_ASSERT_EQUAL ((size_t)6, BGCreator->getNumVertices());
@@ -167 +166 @@
   std::vector<atom *> atoms;
   std::copy(TestMolecule->begin(), TestMolecule->end(), std::back_inserter(atoms));
-  BGCreator->createFromAtoms(atoms, AlwaysTruePredicate);
+  BGCreator->createFromAtoms(atoms, BreadthFirstSearchGatherer::AlwaysTruePredicate);
 
   CPPUNIT_ASSERT_EQUAL ((size_t)6, BGCreator->getNumVertices());