Skip to content

Merging construct_bfs #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dagalindo wants to merge 3 commits into
base: testing
Choose a base branch
from
Open

Merging construct_bfs #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cf7414
readding TDTree changes, plus updates to bfs tree construction
dagalindo Nov 13, 2013
7a4508a
implementation of Dourisboure & Gavoille's bfs algorithm, with up to …
dagalindo Nov 18, 2013
96fd985
merging in upstream branch
dagalindo Nov 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib_treed/inc/TDTree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ class TDTree
// Sorts all the members of the bags of T.
void sort_bags();

// Constructs a tree dcomposition using Dourisboure-Gavoille's BFS-Layering algorithm
// doesn't require an elimination ordering
void construct_bfs(int root=1);
void build_bags( int separator_type, int* newbags, int current_index, int parent_index, Graph::VertexWeightedGraph *H, list<int> *parentbaglist, Graph::GraphUtil *util, Graph::Node *n2, list<int> *nbrs2 );

// Constructs a tree decomposition using Bodlaender-Koster's "Algorithm 2"
// with the provided elimination order
void construct_BK(vector<int> *elim_order);
Expand Down
1 change: 1 addition & 0 deletions lib_treed/inc/TreeDecomposition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#define TD_GAVRIL 2
#define TD_BK 3
#define TD_NICE 4
#define TD_BFS 5

// Types of graphviz output that are available for tree decompositions
#define GV_BAG_LABELS 0
Expand Down
Loading