Changeset 6d08032


Ignore:
Timestamp:
Oct 3, 2016, 5:11:26 PM (9 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Fix_FitPotential_needs_atomicnumbers
Children:
4266eb
Parents:
de81b9
Message:

tempcommit: Replaced boost::adjacency_list by PotentialSubgraph.

Location:
src
Files:
5 added
4 edited

Legend:

Unmodified
Added
Removed

  • src/FunctionApproximation/Extractors.cpp

    rde81b9 r6d08032  
    161161    const FunctionModel::list_of_arguments_t &listargs,
    162162    const ParticleTypes_t &_types,
    163     const boost::adjacency_list<> &_subgraph
     163    const PotentialSubgraph &_subgraph
    164164    )
    165165{
    … …  
    306306    const FunctionModel::arguments_t &args,
    307307    const ParticleTypes_t &_types,
    308     const boost::adjacency_list<> &_subgraph
     308    const PotentialSubgraph &_subgraph
    309309    )
    310310{
    … …  
    365365  singlelist_allargs.push_back(allargs);
    366366  FunctionModel::list_of_arguments_t sortedargs =
    367       reorderArgumentsByParticleTypes(singlelist_allargs, _types);
     367      reorderArgumentsByParticleTypes(singlelist_allargs, _types, _subgraph);
    368368  ASSERT( sortedargs.size() == (size_t)1,
    369369      "Extractors::filterArgumentsByParticleTypes() - reordering did not generate a single list.");

  • src/FunctionApproximation/Extractors.hpp

    rde81b9 r6d08032  
    111111      const FunctionModel::list_of_arguments_t &eachargs,
    112112      const ParticleTypes_t &_types,
    113       const boost::adjacency_list<> &_subgraph
     113      const PotentialSubgraph &_subgraph
    114114      );
    115115
    … …  
    127127      const FunctionModel::arguments_t &args,
    128128      const ParticleTypes_t &_types,
    129       const boost::adjacency_list<> &_subgraph
     129      const PotentialSubgraph &_subgraph
    130130      );
    131131

  • src/Potentials/Makefile.am

    rde81b9 r6d08032  
    6363  Potentials/StreamFactory.hpp \
    6464  Potentials/StreamFactory_EmpiricalPotential.hpp \
     65  Potentials/Subgraph/PotentialSubgraph.hpp \
     66  Potentials/Subgraph/SubgraphEdge.hpp \
    6567  Potentials/TremoloPotentialFileParser.hpp \
    6668  Potentials/TremoloPotentialTypes.hpp

  • src/unittests/Makefile.am

    rde81b9 r6d08032  
    3737include ../../src/Potentials/unittests/Makefile.am
    3838include ../../src/Potentials/Specifics/unittests/Makefile.am
     39include ../../src/Potentials/Subgraph/unittests/Makefile.am
    3940include ../../src/RandomNumbers/unittests/Makefile.am
    4041include ../../src/Shapes/unittests/Makefile.am
Note: See TracChangeset for help on using the changeset viewer.