Changeset 4266eb for src/FunctionApproximation/Subgraph

Timestamp:

Oct 3, 2016, 5:19:53 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Fix_FitPotential_needs_atomicnumbers

Children:

96af51

Parents:

6d08032

Message:

Moved SubgraphEdge over to FunctionApproximation and derived argument_t from it.

Location:

src/FunctionApproximation/Subgraph

Files:

• PotentialSubgraph.hpp (moved) (moved from src/Potentials/Subgraph/PotentialSubgraph.hpp )
• SubgraphEdge.hpp (moved) (moved from src/Potentials/Subgraph/SubgraphEdge.hpp ) (4 diffs)
• unittests/Makefile.am (added)
• unittests/SubgraphEdgeUnitTest.cpp (moved) (moved from src/Potentials/Subgraph/unittests/SubgraphEdgeUnitTest.cpp ) (2 diffs)
• unittests/SubgraphEdgeUnitTest.hpp (moved) (moved from src/Potentials/Subgraph/unittests/SubgraphEdgeUnitTest.hpp )

src/FunctionApproximation/Subgraph/SubgraphEdge.hpp

@@ -7 +7 @@
 
 
-#ifndef POTENTIALS_SUBGRAPH_SUBGRAPHEDGE_HPP_
-#define POTENTIALS_SUBGRAPH_SUBGRAPHEDGE_HPP_
+#ifndef FUNCTIONAPPROXIMATION_SUBGRAPH_SUBGRAPHEDGE_HPP_
+#define FUNCTIONAPPROXIMATION_SUBGRAPH_SUBGRAPHEDGE_HPP_
 
 // include config.h
@@ -18 +18 @@
  *
  * Each edge contains two indices and two types.
- *
- * \sa argument_t
  */
 class SubgraphEdge
@@ -116 +114 @@
   }
 
-private:
+protected:
 
   //!> indices between which the distance is given
@@ -125 +123 @@
 
 
-#endif /* POTENTIALS_SUBGRAPH_SUBGRAPHEDGE_HPP_ */
+#endif /* FUNCTIONAPPROXIMATION_SUBGRAPH_SUBGRAPHEDGE_HPP_ */

src/FunctionApproximation/Subgraph/unittests/SubgraphEdgeUnitTest.cpp

@@ -39 +39 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "SubgraphEdgeUnitTest.hpp"
+#include "../../../FunctionApproximation/Subgraph/unittests/SubgraphEdgeUnitTest.hpp"
 
 #include <boost/assign.hpp>
@@ -45 +45 @@
 #include "CodePatterns/Assert.hpp"
 
-#include "Potentials/Subgraph/SubgraphEdge.hpp"
+#include "../../../FunctionApproximation/Subgraph/SubgraphEdge.hpp"
 
 using namespace boost::assign;