Skip to content

Adding weightHP query option to functions #29

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

Draft
umayaml wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Adding weightHP query option to functions #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72da372
Added weightHP option to fetch_simple_connections and fetch_shortest_…
Oct 6, 2021
3a91b54
Tweaked code to check if weightHP is True to best practice.
Oct 6, 2021
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
22 changes: 15 additions & 7 deletions neuprint/queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ def _process_neuron_df(neuron_df, client):
@inject_client
@make_args_iterable(['rois'])
@neuroncriteria_args('upstream_criteria', 'downstream_criteria')
def fetch_simple_connections(upstream_criteria=None, downstream_criteria=None, rois=None, min_weight=1,
def fetch_simple_connections(upstream_criteria=None, downstream_criteria=None, rois=None, weightHP=False, min_weight=1,
properties=['type', 'instance'],
*, client=None):
"""
Expand Down Expand Up @@ -537,6 +537,10 @@ def fetch_simple_connections(upstream_criteria=None, downstream_criteria=None, r
up_crit = copy.deepcopy(upstream_criteria)
down_crit = copy.deepcopy(downstream_criteria)

weight_type = "weight"
if weightHP:
weight_type = "weightHP"

if up_crit is None:
up_crit = NC(label='Neuron')
if down_crit is None:
Expand All @@ -550,7 +554,7 @@ def fetch_simple_connections(upstream_criteria=None, downstream_criteria=None, r
if min_weight > 1:
weight_expr = dedent(f"""\
WITH n, m, e
WHERE e.weight >= {min_weight}
WHERE e.{weight_type} >= {min_weight}
""")
weight_expr = indent(weight_expr, ' '*8)[8:]
else:
Expand All @@ -563,7 +567,7 @@ def fetch_simple_connections(upstream_criteria=None, downstream_criteria=None, r

return_props = ['n.bodyId as bodyId_pre',
'm.bodyId as bodyId_post',
'e.weight as weight']
'e.{weight_type} as weight']

for p in properties:
if p == 'roiInfo':
Expand All @@ -586,7 +590,7 @@ def fetch_simple_connections(upstream_criteria=None, downstream_criteria=None, r
{combined_conditions}
{weight_expr}
RETURN {return_props_str}
ORDER BY e.weight DESC,
ORDER BY e.{weight_type} DESC,
n.bodyId,
m.bodyId
"""
Expand Down Expand Up @@ -1196,7 +1200,7 @@ def fetch_common_connectivity(criteria, search_direction='upstream', min_weight=

@inject_client
def fetch_shortest_paths(upstream_bodyId, downstream_bodyId, min_weight=1,
intermediate_criteria=None,
intermediate_criteria=None, weightHP=False,
timeout=5.0, *, client=None):
"""
Find all neurons along the shortest path between two neurons.
Expand Down Expand Up @@ -1250,6 +1254,10 @@ def fetch_shortest_paths(upstream_bodyId, downstream_bodyId, min_weight=1,

[5778 rows x 4 columns]
"""
weight_type = "weight"
if weightHP:
weight_type = "weightHP"

if intermediate_criteria is None:
intermediate_criteria = NeuronCriteria(status="Traced", client=client)
else:
Expand All @@ -1273,11 +1281,11 @@ def fetch_shortest_paths(upstream_bodyId, downstream_bodyId, min_weight=1,
(dest:Neuron {{ bodyId: {downstream_bodyId} }}),
p = allShortestPaths((src)-[:ConnectsTo*]->(dest))

WHERE ALL (x in relationships(p) WHERE x.weight >= {min_weight})
WHERE ALL (x in relationships(p) WHERE x.{weight_type} >= {min_weight})
AND ALL (n in nodes(p) {nodes_where})

RETURN [n in nodes(p) | [n.bodyId, n.type]] AS path,
[x in relationships(p) | x.weight] AS weights",
[x in relationships(p) | x.{weight_type}] AS weights",

{{}},{timeout_ms}) YIELD value
RETURN value.path as path, value.weights AS weights
Expand Down