Skip to content
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

Jump to bottom

Feature staged tree ahc parallelisation #36

Closed
wants to merge 71 commits into from
Closed

Feature staged tree ahc parallelisation #36

wants to merge 71 commits into from

Conversation

g-walley
Copy link
Owner

Merging changes as of 16/12/2021

closes #11 . That task included multi-threading in AHC. We will add that at a future date.

peterrhysstrong and others added 30 commits September 20, 2021 13:52
@peterrhysstrong
added in extra tests to test_event.py
f01d1c3
@peterrhysstrong
removed files mistakenly added
2c1825e
@g-walley
package description and init files fixed for latest release
ffb9f12
@g-walley
0.1.4.1 - Added util for creating Path object from a string
f50c250
@g-walley
Fixed node labels to make number subscript
26e513c
@g-walley
Released new nightly build
8fdb857
@g-walley
Modified evidence class to be consistent
c2a7fd1
@g-walley
clear evidence fixed to match new evidence class
ecda684
@g-walley
added test to show clear_evidence is working
f50ece5
@g-walley
Fixed bug in max_dist_to_sink calculation
df2da10
@peterrhysstrong
Merge branch 'dev' of https://github.com/g-walley/cegpy into networkx
4b90288
@g-walley
Fixed issue of mislabeling leaves as stages.
894e9e6
@peterrhysstrong
Added in more tests for event and staged trees
cd62caf
@peterrhysstrong
Added in more tests for event and staged trees
dfdc295
@g-walley
formatting and refactoring
333730a
@g-walley
Merge branch 'dev' of https://github.com/g-walley/cegpy into dev
bbdd21d
@g-walley
test passing: graph drawing with numbers
988dd22
@g-walley
Added Initial Sphinx Documentation
5fb7a94
@g-walley
Added Failing tests and tidied them up
62e80d6
@g-walley
Fixed a couple of doc strings
2ebbde7
@g-walley
Merge branch 'dev' into networkx
4c46b66
@g-walley
added *.pdf to gitignore
46d48b1
@g-walley
Merge branch 'networkx' into dev
a869c22
@g-walley
Fixed formatting for test_merged_leaves tests
12cbe22 
removed dead code
@g-walley
Parallelise pytest execution
06ad6ec
@g-walley
VScode dev container
b0d40d1
@g-walley
Fixed output file names in tests
367bf01
@g-walley
fixed lint errors
71c3419
@g-walley
Fixed imports in tests
d418134
@g-walley
added useful pacakges to the dev container
e24b4a5
g-walley and others added 22 commits November 1, 2021 17:58
@g-walley
Test Failing: generator correctly establishes which subsets have
7c21bd1 
        cross-over, and returns correct number of subsets
@g-walley
First Sub-task complete
2928d75
@kasia-kobalczyk
Merge branch 'dev' of https://github.com/g-walley/cegpy into dev
e87e793
@kasia-kobalczyk
Add optional order of columns i#22
a059922
@g-walley
added python app
5353ece
@g-walley
removed unused import pytest
9412f58
@g-walley
added coverage files
baf1ebb
@g-walley
xlsxwriter missing from requirements
02fb0de
@kasia-kobalczyk
Fix reordered columns unit test
1d77fa5
@g-walley
Merge pull request #29 from g-walley/event_tree_feature_var_order
abfd98b 
Add variable order optional parameter
@kasia-kobalczyk
Add optional list of colours
ce086f2
@g-walley
Merge pull request #30 from g-walley/staged_tree_feature_custom_colours
518a582 
Add optional list of colours
@g-walley
Refactor: AHC clean up
21ee37b
@ashenvi10
added pytest-mock/cov to requirements
e6f4668
@ashenvi10
Merge branch 'dev' of https://github.com/g-walley/cegpy into dev
6513305
@g-walley
Modified AHC to clean it up and use list comprehension
c3c87bf
@g-walley
Tidied up code after AHC_execute
e2e8825
@kasia-kobalczyk
Add dot exporting
95168af
@kasia-kobalczyk
Clean the code
d1d1f3e
@g-walley
Merge pull request #34 from g-walley/dot-exporting
a0d97ca 
Add dot exporting
@g-walley
Clean up mapping of indexes in AHC to situations, fixed broken leaf/s…
3cf76f4 
…ituation tests
@g-walley
Merge remote-tracking branch 'origin/dev' into feature-staged-tree-ah…
da049fd 
…c-parallelisation
@g-walley g-walley added the todo label Dec 16, 2021
@g-walley g-walley added this to the Paper milestone Dec 16, 2021
@g-walley g-walley requested a review from ashenvi10 December 16, 2021 20:33
@g-walley g-walley self-assigned this Dec 16, 2021
@g-walley g-walley closed this Dec 16, 2021
@g-walley g-walley deleted the feature-staged-tree-ahc-parallelisation branch December 21, 2021 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ashenvi10 ashenvi10 Awaiting requested review from ashenvi10

Assignees

@g-walley g-walley

Labels
todo
Projects
None yet
Milestone
Paper/v1.0
Development

Successfully merging this pull request may close these issues.

New Feature: AHC Parallelisation
4 participants
@g-walley @peterrhysstrong @kasia-kobalczyk @ashenvi10