Skip to content

Commit

Permalink
Format latest changes
Browse files Browse the repository at this point in the history
  • Loading branch information
SSoelvsten committed Mar 13, 2024
1 parent aa9178d commit 38a0537
Show file tree
Hide file tree
Showing 6 changed files with 348 additions and 485 deletions.
8 changes: 2 additions & 6 deletions src/adiar/bdd/apply.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,8 @@ namespace adiar
internal::tuple<bdd::pointer_type>
__resolve_request(const internal::tuple<bdd::pointer_type>& r) const
{
if (this->_op.can_left_shortcut(r[0])) {
return { r[0], bdd::pointer_type(true) };
}
if (this->_op.can_right_shortcut(r[1])) {
return { bdd::pointer_type(true), r[1] };
}
if (this->_op.can_left_shortcut(r[0])) { return { r[0], bdd::pointer_type(true) }; }
if (this->_op.can_right_shortcut(r[1])) { return { bdd::pointer_type(true), r[1] }; }
return r;
}

Expand Down
7 changes: 2 additions & 5 deletions src/adiar/exec_policy.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,7 @@ namespace adiar
/// \brief Settings for Nested Sweeping framework
////////////////////////////////////////////////////////////////////////////////////////////////
class nested
{

};
{};

private:
// TODO: Merge all enums into a single 64 bit integer to safe on space?
Expand Down Expand Up @@ -330,8 +328,7 @@ namespace adiar
return this->_memory == ep._memory && this->_access == ep._access
&& this->_quantify__algorithm == ep._quantify__algorithm
&& this->_quantify__transposition_growth == ep._quantify__transposition_growth
&& this->_quantify__transposition_max == ep._quantify__transposition_max
;
&& this->_quantify__transposition_max == ep._quantify__transposition_max;
}

////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
7 changes: 4 additions & 3 deletions src/adiar/internal/algorithms/nested_sweeping.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace adiar::internal
{
// Count number of arcs that cross this level. Since all or no levels are reduced with this
// logic, no node should suppressed and its parents arcs tainted.
cuts_t local_1level_cut = { { 0u, 0u, 0u, 0u } };
cuts_t local_1level_cut = { { 0u, 0u, 0u, 0u } };

__reduce_cut_add(local_1level_cut,
pq.size_without_terminals(),
Expand All @@ -76,7 +76,8 @@ namespace adiar::internal

// Output node
adiar_assert(out_id > 0, "Should still have more ids left");
const typename dd_policy::node_type out_node(label, out_id--, e_low.target(), e_high.target());
const typename dd_policy::node_type out_node(
label, out_id--, e_low.target(), e_high.target());
out_writer.unsafe_push(out_node);

// Forward resulting node to parents
Expand Down Expand Up @@ -1399,7 +1400,7 @@ namespace adiar::internal
//////////////////////////////////////////////////////////////////////////////////////////////
template <typename nesting_policy, typename inner_pq_t, typename outer_pq_t>
inline void
up(const exec_policy&/*ep*/,
up(const exec_policy& /*ep*/,
const arc_stream<>& outer_arcs,
outer_pq_t& outer_pq,
node_writer& outer_writer,
Expand Down
Loading

0 comments on commit 38a0537

Please sign in to comment.