nojhan/paradiseo
Watch
1
0
Fork
You've already forked paradiseo
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More work on split new infraestructure

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1593 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
wcancino 2009-06-26 15:15:59 +00:00
commit abca116edb
2 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
contribution/branches/PhyloMOEA/PhyloMOEA/phylotreeIND.h
View file

@ -42,9 +42,10 @@ struct split_info
{
int left, right, num_nodes, map_to_node, node_to_map;
split_info *hash;
int side;
split_info() {};
split_info(int n) : left(n), right(-1), num_nodes(0), hash(NULL), map_to_node(-1), node_to_map(-1) {};
split_info(int n) : left(n), right(-1), num_nodes(0), hash(NULL), map_to_node(-1), node_to_map(-1), side(0) {};
bool invalid() { return right == -1; };
};
@ -110,6 +111,7 @@ class phylotreeIND
void mutate_branch_lenght ( float );
edge select_edge_outsidetree ( edge source_edge ) const;
edge choose_edge_fromside ( int id, bool side ) const;
edge choose_edge_fromside_2( struct split_info &info, bool inside ) const;
edge choose_neighboor ( edge, node ) const;