Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
208 commits
Select commit Hold shift + click to select a range
8b56a97
Three clustering packages based on Markov clustering, MCL, MLR-MCL an…
cerebis Feb 10, 2014
8dfc73f
First import of hic simulator
cerebis Mar 5, 2014
18e56ab
Fixed issues
cerebis Mar 5, 2014
baa6ea8
bugfixes and adding code to simulate primer-directed read1
koadman Mar 10, 2014
751a5d3
removing obsolete code
koadman Mar 10, 2014
12ba8ff
Added comments, moved geometric parameter to global scope
cerebis Mar 10, 2014
37c22e6
merged conflicts between aaron changes and my uncommitted work
cerebis Mar 10, 2014
89a2bd5
Made globals more obvious. Tidied up changes after merge.
cerebis Mar 10, 2014
e17ea6d
Added UI
cerebis Mar 10, 2014
5b4f6e3
allow different cut sites to be used for forward & reverse reads
koadman Mar 11, 2014
3fe524a
Merging my own changes with Matt's
koadman Mar 11, 2014
5b5e164
Added option to supply a random seed for the number generator
cerebis Mar 13, 2014
45def93
Resolved conflicts with head.
cerebis Mar 13, 2014
1caf4cb
Merged conflicts
cerebis Mar 13, 2014
10b69a7
Removed mcl build files
cerebis Mar 18, 2014
b6b7dd0
First commit of pipeline code
cerebis Mar 18, 2014
aa0f656
Fixed up overload scripts and added WGS only nest
cerebis Mar 25, 2014
42ff7db
Pipeline redesigned to utilize the SCons build system wrapper extenti…
cerebis Mar 28, 2014
52b9e87
Updated README
cerebis Mar 28, 2014
c44df30
Updated README, removed obsolete files
cerebis Mar 28, 2014
b92e86d
Updated README
cerebis Mar 28, 2014
3680d64
Updated README
cerebis Mar 28, 2014
84a6881
Updated README
cerebis Mar 28, 2014
99a61cd
Removed obsolete files
cerebis Mar 28, 2014
aa3c90b
Added vmeasure to performance testing. Increased sampling rate across…
cerebis Mar 31, 2014
255de1f
Added initial support for SR-MCL and R-MCL clustering output
cerebis Apr 8, 2014
8a7817d
First commit of graph creation code
cerebis Jul 18, 2014
040f17b
Small typo
cerebis Jul 18, 2014
f1c675e
Unintended inclusion.
cerebis Jul 29, 2014
5db9f8f
maximum flow calculations on subgraphs
cerebis Sep 4, 2014
64f2a89
improvements to code
cerebis Sep 4, 2014
2d3b590
blah
cerebis Sep 4, 2014
ed96548
New approach to split network
cerebis Sep 8, 2014
d00b9ec
changed logfile name
cerebis Sep 8, 2014
cfb5b72
changes for split network
cerebis Sep 8, 2014
7218ab0
Refactoring to python coding conventions
cerebis Feb 2, 2015
7055e64
Created pycharm projects
cerebis Feb 3, 2015
b9b68ed
Path changes
cerebis Feb 3, 2015
fad1527
runtime improvements
cerebis Feb 3, 2015
3a79d3a
External config and further refactoring
cerebis Feb 5, 2015
f0fe590
Execution refactoring RC1
cerebis Feb 6, 2015
1e5a33b
Finished clean-up
cerebis Feb 9, 2015
b52788d
Initial commit of GFM code, under work
cerebis Feb 9, 2015
a58ba0d
Added script to calcualte GFM index
cerebis Feb 11, 2015
2d14e2b
first draft of an inference engine for genotype mixtures in 3C data. …
koadman Feb 15, 2015
210c48d
Truth table generation from SAM, LASTTAB or PSL format
cerebis Feb 16, 2015
d3197f6
Merge remote-tracking branch 'origin/pipeline.r1' into pipeline.r1
cerebis Feb 16, 2015
eed1d79
Changing to LAST based truth table
cerebis Feb 16, 2015
5db086e
config changes
cerebis Feb 16, 2015
5ecc4fb
Changing to LAST based truth table
cerebis Feb 16, 2015
061349e
config syntax error fixed
cerebis Feb 16, 2015
5fd14a4
minor fixes
cerebis Feb 16, 2015
00cb7d6
updates to wgs stage for LAST awareness
cerebis Feb 16, 2015
db3f645
further fixes
cerebis Feb 16, 2015
fd0a196
adding getters, setters, and listeners for models
koadman Feb 16, 2015
ebcb369
Further supoort for new truth table format
cerebis Feb 17, 2015
189c332
code to read an MCL ABC format file containing SNV link data, initialize
koadman Feb 18, 2015
ddb1ca9
Initial execution robustness changes #27
cerebis Feb 19, 2015
e292276
Finished initial support of rollback #27
cerebis Feb 19, 2015
1258e64
minor update
cerebis Feb 19, 2015
f201c51
minor
cerebis Feb 19, 2015
577d111
moved PBS config params to top of each file
cerebis Feb 19, 2015
08b1f6b
removed deprecated biopython method calls.
cerebis Feb 19, 2015
bedbe39
minor
cerebis Feb 19, 2015
546bdf7
minor
cerebis Feb 19, 2015
f5b4811
minor
cerebis Feb 19, 2015
38262b4
minor
cerebis Feb 19, 2015
4b976f4
simplifying scons map
cerebis Feb 19, 2015
e6635d2
added gitignore
cerebis Feb 20, 2015
be57048
Resolves #27, #26, #24, #23, #21
cerebis Feb 20, 2015
08c3e7c
resovled conflict
cerebis Feb 20, 2015
0d9d771
Validity measures now in YAML format
cerebis Feb 23, 2015
e562229
Validity measures now in YAML format
cerebis Feb 23, 2015
b9c5df8
Update pipeline_utils.py
cerebis Feb 23, 2015
c2c4b5a
initial commit for sgevolver
cerebis Feb 26, 2015
03de1a7
moved old test data to new path
cerebis Feb 26, 2015
2953c86
Further integration of sgevolver
cerebis Feb 26, 2015
d397d66
minor fixes
cerebis Feb 26, 2015
8a3ce06
further
cerebis Feb 26, 2015
1f0b524
working hic
cerebis Feb 26, 2015
15babd0
resolved conflicts
cerebis Feb 26, 2015
be72cac
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
cerebis Feb 26, 2015
3855be5
wgs step working with evo
cerebis Feb 26, 2015
08847bc
initial map step
cerebis Feb 26, 2015
4df1458
fixes
cerebis Feb 26, 2015
f4ef5b8
file dependency adjustments
cerebis Feb 26, 2015
59f0e71
Closes #17, closes #29, closes #30; finished sgEvolver integration
cerebis Feb 26, 2015
a9c3706
removed stale reference file
cerebis Feb 26, 2015
90748ac
updated default config to be closer to a real run
cerebis Feb 27, 2015
ef6930c
ongoing fixes
cerebis Mar 3, 2015
56ab3cd
resolved conflict
cerebis Mar 3, 2015
95b9dd8
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
koadman Mar 4, 2015
f9dbc9b
Community creation fixes. sg_scale introduced
cerebis Mar 16, 2015
dd1dcfc
Community creation fixes. sg_scale introduced
cerebis Mar 16, 2015
9fb2796
white space changes
cerebis Mar 16, 2015
ede1441
switched from inheritance of dict to encapsulation
cerebis Mar 16, 2015
51d6c3e
Removed debug constraint on commpaths
cerebis Mar 16, 2015
8dea893
First attempt at simulation sweep settings
cerebis Mar 16, 2015
2ff42cd
Simple utility for generating truth table statistics
cerebis Mar 16, 2015
2c36a45
Update README.md
cerebis Mar 16, 2015
ebdb82a
Update README.md
cerebis Mar 17, 2015
4e0c87d
new scoring metric that supports arbitrary overlap
cerebis Mar 20, 2015
4f5fe01
minor fix
cerebis Mar 20, 2015
b24bb89
minor cli enhancements to submission tool
cerebis Mar 20, 2015
9f71bb6
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
cerebis Mar 20, 2015
8f045d8
Resolves #19, workflow figures
cerebis Mar 24, 2015
49a4f87
extra info to stdout
cerebis Mar 25, 2015
143f222
fix bcubed
cerebis Mar 25, 2015
a27c3c8
additional comments
cerebis Mar 25, 2015
cc33a4c
fixed two significant bugs reading MCL format
cerebis Mar 26, 2015
8377074
refactored calculation, should now be correct
cerebis Mar 26, 2015
dcac401
new utils for inspecting bam files
cerebis Mar 27, 2015
6c2b1a3
typo in comments
cerebis Mar 27, 2015
82e3f70
Filteration of alignments incorperated into pipeline
cerebis Mar 30, 2015
572c1d0
first attempt weighted bcubed
cerebis Mar 31, 2015
7f01c57
added debug actions, but still need switch
cerebis Mar 31, 2015
5e109cd
debug switch for map build
cerebis Mar 31, 2015
73a9cdd
debug switch for map build stage
cerebis Mar 31, 2015
2782ee2
merged
cerebis Mar 31, 2015
8df1405
Added bcubed, sweep on hic filter, removed scons debugs
cerebis Mar 31, 2015
66ac0b4
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
cerebis Mar 31, 2015
9a8a523
cli improvements
cerebis Mar 31, 2015
3733184
minor fixes
cerebis Apr 1, 2015
8c6f6de
minor fixes
cerebis Apr 1, 2015
8ba75af
added graph file formats
cerebis Apr 2, 2015
cec970d
further improvements to edgetometis
cerebis Apr 2, 2015
93d38cc
new clustering methods
cerebis Apr 20, 2015
b2d3b81
Full sweep
cerebis Apr 20, 2015
1d58db9
adding separate clustering builds
cerebis Apr 22, 2015
208db64
minor update
cerebis Apr 22, 2015
092ccbd
further updates for separate algos
cerebis Apr 22, 2015
f30bf19
further work to separate clustering
cerebis Apr 22, 2015
00b166c
minor
cerebis Apr 22, 2015
02b1a13
added oclustr algorithm
cerebis Apr 22, 2015
5e3de25
fixes
cerebis Apr 22, 2015
e7ebcc5
moved oclustr to queue job
cerebis Apr 22, 2015
059194d
fixes
cerebis Apr 22, 2015
c054162
modified output logic of oclustr, needed single file for deps
cerebis Apr 22, 2015
3227ffe
handle case of no reported nodes
cerebis Apr 22, 2015
bde6d7c
Handle case where truth or predition empty
cerebis Apr 23, 2015
fcc3f28
added scons choice for local or pbs execution
cerebis Apr 23, 2015
5d94275
updates to execution env choices and mcl addition
cerebis Apr 23, 2015
975ed85
mcl moved to local bin folder
cerebis Apr 23, 2015
914f64b
fixed unknown method call when removing nodes
cerebis Apr 23, 2015
c2c50c9
removed dependency on wgs2ctg bam in making graphs edge/node
cerebis Apr 24, 2015
2e63a48
removed dependency on wgs2ctg bam in making graphs edge/node
cerebis Apr 24, 2015
a5d190e
self-loops are now included in hic graph construction
cerebis Apr 27, 2015
92a87bb
simple tabulation tool for scoring results
cerebis Apr 27, 2015
f86f51e
updates for srmcl and louvain
cerebis Apr 27, 2015
2f5ad06
additional clustering methods
cerebis Apr 28, 2015
ca64d16
reduced threads
cerebis Apr 28, 2015
856125c
reduced per-task concurrency in pbs
cerebis May 1, 2015
2a9198d
added option to restrict f1 score calculation to objects of a minimum…
cerebis May 1, 2015
55ebf89
minor fix to support older implementations of numpy
cerebis May 1, 2015
edc5ad4
minor fix
cerebis May 4, 2015
2ba193a
minor updates
cerebis May 5, 2015
3be3799
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
cerebis May 5, 2015
db19f01
small fix
cerebis May 5, 2015
1493381
Added srmcl sweep
cerebis May 5, 2015
3bf6ab2
minor fix
cerebis May 5, 2015
f23e777
further srmcl fixes
cerebis May 5, 2015
e913aa6
improve output info in f1
cerebis May 5, 2015
8b495db
multiple small runtime fixes for pbs
cerebis May 6, 2015
db0d02b
dev and runtime system divergence
cerebis May 6, 2015
9c9b46a
resolved
cerebis May 6, 2015
fbbeaa1
changed handling of metis output with no cl assignments
cerebis May 6, 2015
bc269a1
SRMCL fixed for edge case of trivial unconnected graph
cerebis May 7, 2015
520553d
removed lingering experimental change
cerebis May 7, 2015
2400016
minor fix
cerebis May 7, 2015
a71b54e
minor changes
cerebis May 28, 2015
0e29bf8
extra runtime info
cerebis May 28, 2015
c387005
minor changes
cerebis May 28, 2015
d863ec1
updated cli
cerebis May 28, 2015
9e460a7
Added support for PSL to graph
cerebis May 28, 2015
1a47ac4
hpc changes
cerebis May 28, 2015
e0add93
merged with hpc
cerebis May 28, 2015
53df54e
added last read mapping script
cerebis May 28, 2015
b634d0f
include alternate alignments in graph building
cerebis May 28, 2015
ec7cc0e
lap calculations
cerebis Jun 1, 2015
3754855
minor fixes
cerebis Jun 1, 2015
120a3b2
minor fixes
cerebis Jun 1, 2015
0877905
minor fixes
cerebis Jun 1, 2015
a1af988
minor fixes
cerebis Jun 1, 2015
0a525ae
minor fixes
cerebis Jun 1, 2015
6d28a8c
Assembly entropy
cerebis Jun 2, 2015
070481e
warnings to stderr
cerebis Jun 2, 2015
b8684f3
Intra-chr fragment separation model now correctly implemented
cerebis Jun 18, 2015
947f4b4
Added tool to calculate contact map and optionally plot it
cerebis Jun 18, 2015
b3d4228
add support for illumina read names
cerebis Jun 18, 2015
f610f13
Improved contact map calculator
cerebis Jun 19, 2015
b61b5af
support calls to matplotlib without xserver
cerebis Jun 19, 2015
0a85089
further adjustments
cerebis Jun 19, 2015
5dedbfc
added contact per contig
cerebis Jun 25, 2015
adb71ec
added estimated kolmogorov for large graphs
cerebis Jul 2, 2015
b984fff
commented out experimental code
cerebis Jul 3, 2015
5c0b80f
Added extrinsic complexity measure, generalized executable
cerebis Jul 6, 2015
a5fd8da
uncommitted conflict
cerebis Jul 7, 2015
9a43f6d
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
cerebis Jul 7, 2015
46b786c
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
koadman Jul 9, 2015
9bb24e7
added more complexity measures for graphs, fixed entropy
cerebis Jul 9, 2015
61f99e7
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
cerebis Jul 9, 2015
f0ce608
increased flexibility of tabulation script
cerebis Jul 10, 2015
0f74ccf
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
cerebis Jul 10, 2015
6bed2d2
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
koadman Jul 24, 2015
e9596dd
some changes to make it work on my ubuntu 14.04LTS system
koadman Sep 8, 2015
09ca829
Merge branch 'pipeline.r1' of https://github.com/koadman/proxigenomic…
cerebis Sep 16, 2015
e3cc7a0
pycharm update
cerebis Sep 16, 2015
b5c7d49
Changes lingering from pipeline.r1 pre-merge with master
cerebis Sep 16, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
48 changes: 48 additions & 0 deletions clustering/SR-MCL_package/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
SR-MCL (Soft Regularized Markov Clustering) - Version 1.0

Copyright 2012, The Ohio State University.
Portions Copyright 1997, Regents of the University of Minnesota.
All rights reserved.

Redistribution and use in source and binary forms, with or
without modification, are
permitted provided that the following conditions are met:

1. Redistributions, with or without modifications, of source
code must retain the above
copyright notice, this list of conditions and the following
disclaimer.

2. Redistributions, with or without modifications, in binary form
must reproduce the above
copyright notice, this list of conditions and the following
disclaimer
in the documentation and/or other materials provided with the
distribution.

3. The names of the Ohio
State University, the University of Minnesota and
their contributors may not be used to endorse or promote products
derived from this software without specific prior permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.

29 changes: 29 additions & 0 deletions clustering/SR-MCL_package/Lib/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
include ../Makefile.in

#INCLUDES = -I../hipr/ -I.
INCLUDES = -I.

CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
LD = $(CC) -L.


OBJS = coarsen.o match.o ccgraph.o memory.o \
util.o metrics.o merge.o\
graph.o io.o \
subgraphs.o \
myqsort.o \
mlmcl.o mclbase.o mclutils.o rmcl.o \
srmcl.o

.c.o:
$(CC) $(CFLAGS) -c $*.c

../libmlrmcl.a: $(OBJS) *.h
$(AR) $@ $(OBJS)
$(RANLIB) $@

clean:
rm -f *.o

realclean:
rm -f *.o ; rm -f ../libmlrmcl.a
Loading