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

More working in new split infraestructure

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1594 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
wcancino 2009-06-29 16:23:17 +00:00
commit d0d4b4bd0e
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,7 +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_edge_fromside_2( struct split_info *info, bool inside ) const;
edge choose_neighboor ( edge, node ) const;
@ -204,6 +204,7 @@ class phylotreeIND
inline bool splits_valid() const { return valid_splits; }
inline bool split ( edge edgeaux, node nodeaux ) const
{ return split_bits[ edgeaux.id() * TREE.number_of_nodes() + nodeaux.id() ]; }
bool split2(edge edgeaux);
void read_newick ( string newickstring );
void read_newick2 ( string newickstring );