Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
caretta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Durairaj, Janani
caretta
Commits
872a2d92
Commit
872a2d92
authored
5 years ago
by
Akdel
Browse files
Options
Downloads
Patches
Plain Diff
debug (removed njit)
parent
a756da5c
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
caretta/neighbor_joining.py
+3
-3
3 additions, 3 deletions
caretta/neighbor_joining.py
with
3 additions
and
3 deletions
caretta/neighbor_joining.py
+
3
−
3
View file @
872a2d92
...
@@ -13,7 +13,7 @@ import numpy as np
...
@@ -13,7 +13,7 @@ import numpy as np
# 5. Start the algorithm again, replacing the pair of joined neighbors with the new node and using the distances calculated in the previous step.
# 5. Start the algorithm again, replacing the pair of joined neighbors with the new node and using the distances calculated in the previous step.
@nb.njit
#
@nb.njit
# @numba_cc.export('neighbor_joining', '(f64[:])')
# @numba_cc.export('neighbor_joining', '(f64[:])')
def
neighbor_joining
(
distance_matrix
:
np
.
ndarray
)
->
(
np
.
ndarray
,
np
.
ndarray
):
def
neighbor_joining
(
distance_matrix
:
np
.
ndarray
)
->
(
np
.
ndarray
,
np
.
ndarray
):
"""
"""
...
@@ -88,7 +88,7 @@ def neighbor_joining(distance_matrix: np.ndarray) -> (np.ndarray, np.ndarray):
...
@@ -88,7 +88,7 @@ def neighbor_joining(distance_matrix: np.ndarray) -> (np.ndarray, np.ndarray):
# Q matrix calculation + minimum i, j (step 1 & 2)
# Q matrix calculation + minimum i, j (step 1 & 2)
@nb.njit
#
@nb.njit
# @numba_cc.export('_find_join_nodes', '(f64[:])')
# @numba_cc.export('_find_join_nodes', '(f64[:])')
def
_find_join_nodes
(
distance_matrix
):
def
_find_join_nodes
(
distance_matrix
):
"""
"""
...
@@ -119,7 +119,7 @@ def _find_join_nodes(distance_matrix):
...
@@ -119,7 +119,7 @@ def _find_join_nodes(distance_matrix):
# Branch length calculation (step 3)
# Branch length calculation (step 3)
@nb.njit
#
@nb.njit
# @numba_cc.export('_find_branch_length', '(f64[:], i64, i64)')
# @numba_cc.export('_find_branch_length', '(f64[:], i64, i64)')
def
_find_branch_length
(
distance_matrix
,
i
,
j
):
def
_find_branch_length
(
distance_matrix
,
i
,
j
):
"""
"""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment