Skip to content

Commit

Permalink
Apply clang-format pre-commit changes
Browse files Browse the repository at this point in the history
  pre-commit run -a clang-format
  • Loading branch information
dbarbier committed Sep 3, 2021
1 parent 57603f9 commit 067705f
Show file tree
Hide file tree
Showing 48 changed files with 8,815 additions and 7,928 deletions.
38 changes: 19 additions & 19 deletions cpp/src/hub/py_skdecide.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@

namespace py = pybind11;

void init_pyaostar(py::module& m);
void init_pyastar(py::module& m);
void init_pybfws(py::module& m);
void init_pyilaostar(py::module& m);
void init_pyiw(py::module& m);
void init_pylrtdp(py::module& m);
void init_pymartdp(py::module& m);
void init_pymcts(py::module& m);
void init_pyriw(py::module& m);
void init_pyaostar(py::module &m);
void init_pyastar(py::module &m);
void init_pybfws(py::module &m);
void init_pyilaostar(py::module &m);
void init_pyiw(py::module &m);
void init_pylrtdp(py::module &m);
void init_pymartdp(py::module &m);
void init_pymcts(py::module &m);
void init_pyriw(py::module &m);

PYBIND11_MODULE(__skdecide_hub_cpp, m) {
skdecide::Globals::init();
init_pyaostar(m);
init_pyastar(m);
init_pybfws(m);
init_pyilaostar(m);
init_pyiw(m);
init_pylrtdp(m);
init_pymartdp(m);
init_pymcts(m);
init_pyriw(m);
skdecide::Globals::init();
init_pyaostar(m);
init_pyastar(m);
init_pybfws(m);
init_pyilaostar(m);
init_pyiw(m);
init_pylrtdp(m);
init_pymartdp(m);
init_pymcts(m);
init_pyriw(m);
}
129 changes: 64 additions & 65 deletions cpp/src/hub/solver/aostar/aostar.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,77 +15,76 @@

namespace skdecide {

template <typename Tdomain,
typename Texecution_policy = SequentialExecution>
template <typename Tdomain, typename Texecution_policy = SequentialExecution>
class AOStarSolver {
public :
typedef Tdomain Domain;
typedef typename Domain::State State;
typedef typename Domain::Action Action;
typedef typename Domain::Predicate Predicate;
typedef typename Domain::Value Value;
typedef Texecution_policy ExecutionPolicy;

AOStarSolver(Domain& domain,
const std::function<Predicate (Domain&, const State&)>& goal_checker,
const std::function<Value (Domain&, const State&)>& heuristic,
double discount = 1.0,
std::size_t max_tip_expansions = 1,
bool detect_cycles = false,
bool debug_logs = false);

// clears the solver (clears the search graph, thus preventing from reusing
// previous search results)
void clear();

// solves from state s using heuristic function h
void solve(const State& s);
bool is_solution_defined_for(const State& s) const;
const Action& get_best_action(const State& s) const;
const double& get_best_value(const State& s) const;

private :
Domain& _domain;
std::function<bool (Domain&, const State&)> _goal_checker;
std::function<Value (Domain&, const State&)> _heuristic;
double _discount;
std::size_t _max_tip_expansions;
bool _detect_cycles;
bool _debug_logs;
ExecutionPolicy _execution_policy;

struct ActionNode;

struct StateNode {
State state;
std::list<std::unique_ptr<ActionNode>> actions;
ActionNode* best_action;
double best_value;
bool solved;
std::list<ActionNode*> parents;

StateNode(const State& s);

struct Key {
const State& operator()(const StateNode& sn) const;
};
public:
typedef Tdomain Domain;
typedef typename Domain::State State;
typedef typename Domain::Action Action;
typedef typename Domain::Predicate Predicate;
typedef typename Domain::Value Value;
typedef Texecution_policy ExecutionPolicy;

AOStarSolver(
Domain &domain,
const std::function<Predicate(Domain &, const State &)> &goal_checker,
const std::function<Value(Domain &, const State &)> &heuristic,
double discount = 1.0, std::size_t max_tip_expansions = 1,
bool detect_cycles = false, bool debug_logs = false);

// clears the solver (clears the search graph, thus preventing from reusing
// previous search results)
void clear();

// solves from state s using heuristic function h
void solve(const State &s);
bool is_solution_defined_for(const State &s) const;
const Action &get_best_action(const State &s) const;
const double &get_best_value(const State &s) const;

private:
Domain &_domain;
std::function<bool(Domain &, const State &)> _goal_checker;
std::function<Value(Domain &, const State &)> _heuristic;
double _discount;
std::size_t _max_tip_expansions;
bool _detect_cycles;
bool _debug_logs;
ExecutionPolicy _execution_policy;

struct ActionNode;

struct StateNode {
State state;
std::list<std::unique_ptr<ActionNode>> actions;
ActionNode *best_action;
double best_value;
bool solved;
std::list<ActionNode *> parents;

StateNode(const State &s);

struct Key {
const State &operator()(const StateNode &sn) const;
};
};

struct ActionNode {
Action action;
std::list<std::tuple<double, double, StateNode*>> outcomes; // next state nodes owned by _graph
double value;
StateNode* parent;
struct ActionNode {
Action action;
std::list<std::tuple<double, double, StateNode *>>
outcomes; // next state nodes owned by _graph
double value;
StateNode *parent;

ActionNode(const Action& a);
};
ActionNode(const Action &a);
};

struct StateNodeCompare {
bool operator()(StateNode*& a, StateNode*& b) const;
};
struct StateNodeCompare {
bool operator()(StateNode *&a, StateNode *&b) const;
};

typedef typename SetTypeDeducer<StateNode, State>::Set Graph;
Graph _graph;
typedef typename SetTypeDeducer<StateNode, State>::Set Graph;
Graph _graph;
};

} // namespace skdecide
Expand Down
Loading

0 comments on commit 067705f

Please sign in to comment.