Skip to content

Commit

Permalink
proper indexing for gradient calculations and max_iter
Browse files Browse the repository at this point in the history
  • Loading branch information
François Laurent committed Apr 4, 2018
1 parent c098fd5 commit 5b75459
Show file tree
Hide file tree
Showing 11 changed files with 351 additions and 272 deletions.
4 changes: 4 additions & 0 deletions tramway/core/lazy.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ def unload(self, visited=None):
Beware: only direct Lazy object attributes are unloaded,
not Lazy objects stored in non-lazy attributes!
*Deprecated*
"""
warn('`unload` will be removed soon', DeprecationWarning)
if visited is None:
Expand Down Expand Up @@ -170,6 +172,8 @@ def lightcopy(x):
Returns:
any: copy of `x`.
*Deprecated*
"""
warn('`lightcopy` will be removed soon', DeprecationWarning)
return x
Expand Down
4 changes: 2 additions & 2 deletions tramway/helper/inference.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

def infer(cells, mode='D', output_file=None, partition={}, verbose=False, \
localization_error=None, diffusivity_prior=None, potential_prior=None, jeffreys_prior=None, \
max_cell_count=None, dilation=None, worker_count=None, min_diffusivity=0, \
max_cell_count=None, dilation=None, worker_count=None, min_diffusivity=None, \
store_distributed=False, constructor=None, cell_sampling=None, \
priorD=None, priorV=None, input_label=None, output_label=None, comment=None, \
return_cells=None, profile=None, force=False, **kwargs):
Expand Down Expand Up @@ -168,7 +168,7 @@ def infer(cells, mode='D', output_file=None, partition={}, verbose=False, \
# prepare the data for the inference
if constructor is None:
constructor = Distributed
detailled_map = distributed(cells, new=constructor)
detailled_map = distributed(cells, new_group=constructor)

if cell_sampling is None:
try:
Expand Down

0 comments on commit 5b75459

Please sign in to comment.