Skip to content

Commit

Permalink
Merge pull request #10 from NelleV/0.0.X
Browse files Browse the repository at this point in the history
DOC better explanation on PDB vs txt results
  • Loading branch information
NelleV committed Sep 4, 2015
2 parents 517700e + 1ab07e9 commit 685a9d3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 5 additions & 2 deletions doc/documentation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,15 @@ installed ``MDS_all`` (respectively ``PM_all``).
To run the code, simply call the program of your choice, and the repository
containing the configuration file as argument. From the root of the
repository, to run the MDS::

pastis-mds example

A bunch of files, necessary for the optimization are written in the same
folder as the optimization, including the results of the optimization:
``mds.structure.pdb``.
``mds.structure.pdb.txt`` and ``mds.structure.pdb``. The ``txt`` file
contains a the flatten array of coordinates :math:`(x_1, y_1, z_1, x_2, y_2, \dots)`
while the ``pdb`` contains a smoothed interpolation of the structure for
visualization purposes.

Running the algorithms on your own structure
============================================
Expand Down
1 change: 0 additions & 1 deletion pastis/poisson_model_power_law.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ def gradient_poisson_exp(X, counts, alpha, beta, use_empty_entries=True):
mask = np.tri(m, dtype=np.bool) == False
else:
mask = (np.tri(m, dtype=np.bool) == False) & (counts != 0)

beta = counts[mask].sum() / (d[mask] ** alpha).sum()

grad_alpha = - beta * (d[mask] ** alpha * np.log(d[mask])).sum() \
Expand Down

0 comments on commit 685a9d3

Please sign in to comment.