Skip to content

Commit

Permalink
minor change on Assemble::ann_to_graph()
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhixing Feng authored and Zhixing Feng committed Feb 15, 2020
1 parent dadf534 commit 660da63
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 48 deletions.
Binary file modified ...roj/project.xcworkspace/xcuserdata/zhixingfeng.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
112 changes: 65 additions & 47 deletions iGDA.xcodeproj/xcuserdata/zhixingfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "src/modules/assemble/assembler.cpp"
timestampString = "590545323.447065"
timestampString = "603425340.151193"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "760"
endingLineNumber = "760"
landmarkName = "Assembler::ann_clust_recode(recode_file, recode_ref_file, encode_file, align_file, var_file, min_cvg, min_prop, max_prop, topn, max_nn, min_jaccard, is_correct, is_hang, max_iter, is_recode)"
landmarkName = "Assembler::ann_clust_recode(string recode_file, string recode_ref_file, string encode_file, string align_file, string var_file, int min_cvg, double min_prop, double max_prop, int topn, int max_nn, double min_jaccard, bool is_correct, bool is_hang, int max_iter, bool is_recode)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
Expand All @@ -29,12 +29,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "src/modules/assemble/assembler.cpp"
timestampString = "590545323.44719"
timestampString = "603425340.152985"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "774"
endingLineNumber = "774"
landmarkName = "Assembler::ann_clust_recode(recode_file, recode_ref_file, encode_file, align_file, var_file, min_cvg, min_prop, max_prop, topn, max_nn, min_jaccard, is_correct, is_hang, max_iter, is_recode)"
landmarkName = "Assembler::ann_clust_recode(string recode_file, string recode_ref_file, string encode_file, string align_file, string var_file, int min_cvg, double min_prop, double max_prop, int topn, int max_nn, double min_jaccard, bool is_correct, bool is_hang, int max_iter, bool is_recode)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
Expand All @@ -46,12 +46,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "src/modules/assemble/assembler.cpp"
timestampString = "590545323.44726"
timestampString = "603425340.153415"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "781"
endingLineNumber = "781"
landmarkName = "Assembler::ann_clust_recode(recode_file, recode_ref_file, encode_file, align_file, var_file, min_cvg, min_prop, max_prop, topn, max_nn, min_jaccard, is_correct, is_hang, max_iter, is_recode)"
landmarkName = "Assembler::ann_clust_recode(string recode_file, string recode_ref_file, string encode_file, string align_file, string var_file, int min_cvg, double min_prop, double max_prop, int topn, int max_nn, double min_jaccard, bool is_correct, bool is_hang, int max_iter, bool is_recode)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
Expand All @@ -63,12 +63,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "src/modules/assemble/assembler.cpp"
timestampString = "590545323.44732"
timestampString = "603425340.153754"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "783"
endingLineNumber = "783"
landmarkName = "Assembler::ann_clust_recode(recode_file, recode_ref_file, encode_file, align_file, var_file, min_cvg, min_prop, max_prop, topn, max_nn, min_jaccard, is_correct, is_hang, max_iter, is_recode)"
landmarkName = "Assembler::ann_clust_recode(string recode_file, string recode_ref_file, string encode_file, string align_file, string var_file, int min_cvg, double min_prop, double max_prop, int topn, int max_nn, double min_jaccard, bool is_correct, bool is_hang, int max_iter, bool is_recode)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
Expand Down Expand Up @@ -127,7 +127,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E91DE682-D3D8-4AFA-92B3-789133D87D42"
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "src/misc/permute_reads.cpp"
Expand All @@ -138,55 +138,73 @@
endingLineNumber = "76"
landmarkName = "get_condprob_threshold(dforest_permuted_file, pileup_file, min_prob)"
landmarkType = "9">
<Locations>
<Location
uuid = "E91DE682-D3D8-4AFA-92B3-789133D87D42 - 28dd34bbababd525"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "get_condprob_threshold(std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, double)"
moduleName = "iGDA"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zhixingfeng/dev/iGDA/src/misc/permute_reads.cpp"
timestampString = "0"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "77"
endingLineNumber = "77"
offsetFromSymbolStart = "585">
</Location>
<Location
uuid = "E91DE682-D3D8-4AFA-92B3-789133D87D42 - 28dd34bbababd525"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "get_condprob_threshold(std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, double)"
moduleName = "iGDA"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zhixingfeng/dev/iGDA/src/misc/permute_reads.cpp"
timestampString = "0"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "77"
endingLineNumber = "77"
offsetFromSymbolStart = "662">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "116BAE7F-1EA8-4466-BD40-683A7C7E404F"
shouldBeEnabled = "No"
ignoreCount = "0"
condition = "i == 22"
continueAfterRunningActions = "No"
filePath = "src/modules/assemble/assembler.cpp"
timestampString = "603425340.1541131"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1207"
endingLineNumber = "1207"
landmarkName = "Assembler::ann_to_graph(Graph &amp;gp, string ann_file, double min_prop, double min_len_prop)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
condition = "i == 22 &amp;&amp; j ==23"
continueAfterRunningActions = "No"
filePath = "src/modules/assemble/assembler.cpp"
timestampString = "603425340.154421"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1235"
endingLineNumber = "1235"
landmarkName = "Assembler::ann_to_graph(Graph &amp;gp, string ann_file, double min_prop, double min_len_prop)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
condition = "i == 22 &amp;&amp; j == 23"
continueAfterRunningActions = "No"
filePath = "src/modules/assemble/assembler.cpp"
timestampString = "603425340.154705"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1245"
endingLineNumber = "1245"
landmarkName = "Assembler::ann_to_graph(Graph &amp;gp, string ann_file, double min_prop, double min_len_prop)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
condition = "i == 22 &amp;&amp; j == 23"
continueAfterRunningActions = "No"
filePath = "src/modules/assemble/assembler.cpp"
timestampString = "603425340.155005"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2136"
endingLineNumber = "2136"
landmarkName = "Assembler::assign_reads_to_contigs(recode_data, reads_range, is_random)"
startingLineNumber = "1210"
endingLineNumber = "1210"
landmarkName = "Assembler::ann_to_graph(Graph &amp;gp, string ann_file, double min_prop, double min_len_prop)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
Expand Down
2 changes: 1 addition & 1 deletion src/modules/assemble/assembler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,7 @@ void Assembler::ann_to_graph(Graph &gp, string ann_file, double min_prop, double
for (int64_t j = 0; j < this->rl_ann_clust.size(); ++j){
if (j == i) continue;

if (rl_ann_clust[j].start < rl_ann_clust[i].start || rl_ann_clust[j].start >= rl_ann_clust[i].end || rl_ann_clust[j].end <= rl_ann_clust[i].end)
if (rl_ann_clust[j].start < rl_ann_clust[i].start || rl_ann_clust[j].start >= rl_ann_clust[i].end || rl_ann_clust[j].end < rl_ann_clust[i].end)
continue;

int overlap_len = rl_ann_clust[i].end - rl_ann_clust[j].start + 1;
Expand Down
12 changes: 12 additions & 0 deletions test/test_assembler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,3 +558,15 @@ TEST_CASE("test dforest in polish()", "[hide]")
forestsnvstxxl.run(encode_file, m5_file, cmpreads_file, out_file, tmp_dir, 10, 1000, 1, 0.3, 1, 1, true);

}

TEST_CASE("debug Assemble::ann_to_graph()", "[hide]")
{
string ann_file = "/Users/zhixingfeng/Dropbox/work/iGDA/development/test/test_polish/phase/clpX_1/realign.ann.tested.ft.count.ft";
Assembler assembler;
Graph gp;
assembler.ann_to_graph(gp, ann_file);

ofstream fs_graph(ann_file + ".dot");
boost::write_graphviz(fs_graph, gp);
}

0 comments on commit 660da63

Please sign in to comment.