Skip to content

Replica networks cleanup #263

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

Merged
jhprinz merged 24 commits into from
May 30, 2015
Merged

Replica networks cleanup #263

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
926db48
Starting some cleanup of rep_network analysis
dwhswenson May 16, 2015
07be9d4
Fix traces; add transitions from traces
dwhswenson May 16, 2015
198c334
Start to refactor matrix and dataframe generation
dwhswenson May 16, 2015
6ca105b
Merge remote-tracking branch 'upstream/master' into replica_networks
dwhswenson May 20, 2015
a11298c
set_labels runs (tho not used within functions yet)
dwhswenson May 23, 2015
3641475
Labels now all come from set_labels
dwhswenson May 23, 2015
436e1d5
Split data building from matrix/df generation
dwhswenson May 24, 2015
70c3d76
docstrings (part 1)
dwhswenson May 25, 2015
42dd883
Docstrings part 2
dwhswenson May 27, 2015
8d788d9
docstrings part 3 (and final -- for now)
dwhswenson May 28, 2015
f03ee6b
Merge remote-tracking branch 'upstream/master' into replica_networks
dwhswenson May 28, 2015
7abbe34
Revert "Merge remote-tracking branch 'upstream/master' into replica_n…
dwhswenson May 28, 2015
10fd3ad
Temp
dwhswenson May 28, 2015
c261b3c
Merge remote-tracking branch 'upstream/master' into HEAD
dwhswenson May 28, 2015
a872707
Run the notebook; it works
dwhswenson May 28, 2015
354d124
Revert "Revert "Merge remote-tracking branch 'upstream/master' into r…
dwhswenson May 28, 2015
4be0f9e
Merge branch 'repnetwork_mergefix' into replica_networks
dwhswenson May 28, 2015
8887779
That seemed to fix it...
dwhswenson May 28, 2015
f373f12
Draft of is_ensemble_change_mover
dwhswenson May 28, 2015
f8c2bb0
New version of the calculation now runs
dwhswenson May 28, 2015
4c33b05
Tests for is_ensemble_change_mover
dwhswenson May 29, 2015
fca934a
Merge remote-tracking branch 'upstream/master' into replica_networks
dwhswenson May 29, 2015
22b15ea
Count steps, not samplesets, in ipynb
dwhswenson May 30, 2015
a1374d8
Merge remote-tracking branch 'upstream/master' into replica_networks
dwhswenson May 30, 2015
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
Prev Previous commit
Next Next commit
Count steps, not samplesets, in ipynb
  • Loading branch information
@dwhswenson
dwhswenson committed May 30, 2015
commit 22b15ea5aa5dc93b12744c38ac1529bb2daf9197
Loading