Skip to content

Commit 5f71557

Browse files
committed
Updated DNACLUST
1 parent cd7594a commit 5f71557

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3879
-3727
lines changed

Environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ dependencies:
88
- seqkit=0.16.0
99
- pandas=1.2.4
1010
- numpy=1.20.2
11+
- gxx>=9

Experiments/Summarize_Findings/Comparing Mode to Length for Choice of Centroids.ipynb

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cells": [
33
{
44
"cell_type": "code",
5-
"execution_count": 6,
5+
"execution_count": 1,
66
"metadata": {},
77
"outputs": [],
88
"source": [
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"cell_type": "code",
59-
"execution_count": 12,
59+
"execution_count": 5,
6060
"metadata": {},
6161
"outputs": [
6262
{
@@ -73,6 +73,8 @@
7373
}
7474
],
7575
"source": [
76+
"plt.rcParams.update(rcParams)\n",
77+
"\n",
7678
"fig,ax = plt.subplots(1,1, figsize = (16,10))\n",
7779
"ax.plot(np.cumsum(df_mode_summary['Seq_Counts']), linewidth = 5, label = 'SCRAPT + Mode')\n",
7880
"ax.plot(np.cumsum(df_length_summary['Seq_Counts']), linewidth = 5, label = 'SCRAPT + Length')\n",
@@ -81,12 +83,13 @@
8183
"ax.yaxis.set_major_formatter(mtick.FuncFormatter(g))\n",
8284
"ax.legend()\n",
8385
"ax.legend(loc=4, frameon = False)\n",
84-
"fig.tight_layout()"
86+
"fig.tight_layout()\n",
87+
"fig.savefig('/Users/harihara/Research-Activities/Plots/Iterative_Clustering/Len_vs_Mode_cum_seq.pdf')"
8588
]
8689
},
8790
{
8891
"cell_type": "code",
89-
"execution_count": 15,
92+
"execution_count": 6,
9093
"metadata": {},
9194
"outputs": [
9295
{
@@ -116,7 +119,8 @@
116119
"ax.set_ylabel('Total number of sequences from \\n'+r'clusters of size $\\geq$ x')\n",
117120
"ax.set_xlabel('x: Cluster size (% total number of sequences, N = '+str(n)+\n",
118121
" ')\\n Ordered from the largest to the smallest')\n",
119-
"fig.tight_layout()"
122+
"fig.tight_layout()\n",
123+
"fig.savefig('/Users/harihara/Research-Activities/Plots/Iterative_Clustering/Len_vs_Mode_frag.pdf')"
120124
]
121125
},
122126
{

Experiments/Summarize_Findings/Make_Charts_Clustering.ipynb

Lines changed: 29 additions & 199 deletions
Large diffs are not rendered by default.

dnaclust/Makefile

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#PROFILE_FLAGS = -pg -fprofile-arcs -ftest-coverage -g -O1
2+
CXXFLAGS = -Wall -std=c++17 -pedantic -O2 -static
3+
CXX = g++
4+
#I/fs/cbcb-software/RedHat-7-x86_64/users/hsmurali/venvs/SCRAPT/include
5+
6+
all: dnaclust fastaselect fastasort clean
7+
8+
dnaclust: dnaclust.o fasta.o
9+
$(CXX) $(CXXFLAGS) $(PROFILE_FLAGS) dnaclust.o fasta.o -o $@ -lpthread
10+
11+
dnaclust.o: src/dnaclust.cpp src/search_include.cpp src/utility.hpp src/ternary_sort.hpp src/multi_dim.hpp
12+
$(CXX) -c $(CXXFLAGS) $(PROFILE_FLAGS) src/dnaclust.cpp
13+
14+
fastaselect: fastaselect.o fasta.o
15+
$(CXX) $(CXXFLAGS) $(PROFILE_FLAGS) fastaselect.o fasta.o -o $@
16+
17+
fastaselect.o: src/fastaselect.cpp
18+
$(CXX) -c $(CXXFLAGS) $(PROFILE_FLAGS) src/fastaselect.cpp
19+
20+
fastasort: fastasort.o fasta.o
21+
$(CXX) $(CXXFLAGS) $(PROFILE_FLAGS) $+ -o $@
22+
23+
fastasort.o: src/fastasort.cpp
24+
$(CXX) -c $(CXXFLAGS) $(PROFILE_FLAGS) $+ -o $@
25+
26+
fasta.o: src/fasta.cpp src/fasta.hpp
27+
$(CXX) -c $(CXXFLAGS) src/fasta.cpp
28+
29+
clean:
30+
mkdir bin
31+
mv dnaclust bin/
32+
mv fastaselect bin/
33+
mv fastasort bin/
34+
rm *.o
File renamed without changes.
-4 KB
Binary file not shown.
-4 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
-4 KB
Binary file not shown.

0 commit comments

Comments
 (0)