Contig stitcher: draw unaligned parts in yellow in the visualizer

Donaim · Donaim · commit b5bfd78df9b1 · 2024-01-29T17:17:07.000-08:00
diff --git a/micall/core/plot_contigs.py b/micall/core/plot_contigs.py
diff --git a/micall/tests/data/stitcher_plots/test_gap_around_big_insertion.svg b/micall/tests/data/stitcher_plots/test_gap_around_big_insertion.svg
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="970.0" height="117.0" viewBox="0.0 -117.0 970.0 117.0">
+     width="970.0" height="187.0" viewBox="0.0 -187.0 970.0 187.0">
 <defs>
 </defs>
-<g transform="translate(0.0 -102.0)">
+<g transform="translate(0.0 -172.0)">
 <rect x="397.54098360655735" y="-10" width="159.01639344262298" height="10" fill="lightgrey" stroke="lightgrey" />
 <g transform="translate(477.04918032786884 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">testref</text>
 </g>
 </g>
-<g transform="translate(0 -72.0)">
+<g transform="translate(0 -142.0)">
 <g transform="translate(0.0 0)">
 <path d="M377.6639344262295,-20.0 L426.3196721311475,-20.0" stroke="black" />
 <circle cx="405.4918032786885" cy="-10.0" r="10.0" fill="ivory" stroke="black" />
 <path d="M433.3196721311475,-20.0 L426.3196721311475,-23.5 L426.3196721311475,-16.5 L433.3196721311475,-20.0" fill="black" />
-<text x="405.4918032786885" y="-10.0" font-size="11.0" text-anchor="middle" dy="0.35em">1.1</text>
+<text x="405.4918032786885" y="-10.0" font-size="11.0" text-anchor="middle" dy="0.35em">1.2</text>
 </g>
 <g transform="translate(0.0 0)">
 <path d="M437.2950819672131,-20.0 L505.827868852459,-20.0" stroke="black" />
@@ -26,10 +26,10 @@
 <path d="M516.8032786885245,-20.0 L565.4590163934427,-20.0" stroke="black" />
 <circle cx="544.6311475409836" cy="-10.0" r="10.0" fill="ivory" stroke="black" />
 <path d="M572.4590163934427,-20.0 L565.4590163934427,-23.5 L565.4590163934427,-16.5 L572.4590163934427,-20.0" fill="black" />
-<text x="544.6311475409836" y="-10.0" font-size="11.0" text-anchor="middle" dy="0.35em">1.2</text>
+<text x="544.6311475409836" y="-10.0" font-size="11.0" text-anchor="middle" dy="0.35em">1.1</text>
 </g>
 </g>
-<g transform="translate(0 -61.0)">
+<g transform="translate(0 -131.0)">
 <g transform="translate(0.0 0)">
 <path d="M377.6639344262295,9.5 L426.3196721311475,9.5" stroke="black" />
 <path d="M433.3196721311475,9.5 L426.3196721311475,6.0 L426.3196721311475,13.0 L433.3196721311475,9.5" fill="black" />
@@ -39,32 +39,50 @@
 <path d="M572.4590163934427,9.5 L565.4590163934427,6.0 L565.4590163934427,13.0 L572.4590163934427,9.5" fill="black" />
 </g>
 </g>
-<g transform="translate(0 -41.0)">
+<g transform="translate(0 -111.0)">
 <g transform="translate(0.0 0)">
-<rect x="377.6639344262295" y="-10" width="55.65573770491801" height="10" fill="lightgrey" stroke="lightgrey" />
-<g transform="translate(405.4918032786885 0)">
-<text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1.1</text>
-</g>
+<rect x="377.6639344262295" y="-10" width="19.877049180327845" height="10" fill="yellow" stroke="yellow" />
 </g>
 <g transform="translate(0.0 0)">
-<rect x="516.8032786885245" y="-10" width="55.655737704918124" height="10" fill="lightgrey" stroke="lightgrey" />
-<g transform="translate(544.6311475409836 0)">
+<rect x="397.54098360655735" y="-10" width="35.778688524590166" height="10" fill="lightgrey" stroke="lightgrey" />
+<g transform="translate(415.43032786885243 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1.2</text>
 </g>
 </g>
+<g transform="translate(0.0 0)">
+<rect x="552.5819672131147" y="-10" width="19.87704918032796" height="10" fill="yellow" stroke="yellow" />
+</g>
+<g transform="translate(0.0 0)">
+<rect x="516.8032786885245" y="-10" width="35.778688524590166" height="10" fill="lightgrey" stroke="lightgrey" />
+<g transform="translate(534.6926229508197 0)">
+<text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1.1</text>
+</g>
+</g>
 </g>
-<g transform="translate(0 -30.0)">
+<g transform="translate(0 -100.0)">
 <g transform="translate(0.0 0)">
 <path d="M437.2950819672131,9.5 L505.827868852459,9.5" stroke="black" />
 <path d="M512.827868852459,9.5 L505.827868852459,6.0 L505.827868852459,13.0 L512.827868852459,9.5" fill="black" />
 </g>
 </g>
-<g transform="translate(0 -10.0)">
+<g transform="translate(0 -80.0)">
 <g transform="translate(0.0 0)">
 <rect x="437.2950819672131" y="-10" width="75.53278688524591" height="10" fill="lightgrey" stroke="lightgrey" />
 <g transform="translate(475.061475409836 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">2</text>
 </g>
 </g>
 </g>
+<g transform="translate(0.0 -30.0)">
+<rect x="198.77049180327867" y="-40" width="0.0" height="40" fill="lightgrey" stroke="lightgrey" />
+<g transform="translate(198.77049180327867 0)">
+<text x="0" y="0" font-size="12" font-family="monospace" text-anchor="left">discards:</text>
+</g>
+</g>
+<g transform="translate(0.0 -10.0)">
+<rect x="397.54098360655735" y="-10" width="397.54098360655735" height="10" fill="yellow" stroke="yellow" />
+<g transform="translate(596.311475409836 0)">
+<text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1.3</text>
+</g>
+</g>
 </svg>
diff --git a/micall/tests/data/stitcher_plots/test_gap_around_small_insertion.svg b/micall/tests/data/stitcher_plots/test_gap_around_small_insertion.svg
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="970.0" height="117.0" viewBox="0.0 -117.0 970.0 117.0">
+     width="970.0" height="187.0" viewBox="0.0 -187.0 970.0 187.0">
 <defs>
 </defs>
-<g transform="translate(0.0 -102.0)">
+<g transform="translate(0.0 -172.0)">
 <rect x="397.54098360655735" y="-10" width="159.01639344262298" height="10" fill="lightgrey" stroke="lightgrey" />
 <g transform="translate(477.04918032786884 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">testref</text>
 </g>
 </g>
-<g transform="translate(0 -72.0)">
+<g transform="translate(0 -142.0)">
 <g transform="translate(0.0 0)">
 <path d="M377.6639344262295,-20.0 L426.3196721311475,-20.0" stroke="black" />
 <circle cx="405.4918032786885" cy="-10.0" r="10.0" fill="ivory" stroke="black" />
 <path d="M433.3196721311475,-20.0 L426.3196721311475,-23.5 L426.3196721311475,-16.5 L433.3196721311475,-20.0" fill="black" />
-<text x="405.4918032786885" y="-10.0" font-size="11.0" text-anchor="middle" dy="0.35em">1.1</text>
+<text x="405.4918032786885" y="-10.0" font-size="11.0" text-anchor="middle" dy="0.35em">1.2</text>
 </g>
 <g transform="translate(0.0 0)">
 <path d="M437.2950819672131,-20.0 L505.827868852459,-20.0" stroke="black" />
@@ -26,10 +26,10 @@
 <path d="M516.8032786885245,-20.0 L565.4590163934427,-20.0" stroke="black" />
 <circle cx="544.6311475409836" cy="-10.0" r="10.0" fill="ivory" stroke="black" />
 <path d="M572.4590163934427,-20.0 L565.4590163934427,-23.5 L565.4590163934427,-16.5 L572.4590163934427,-20.0" fill="black" />
-<text x="544.6311475409836" y="-10.0" font-size="11.0" text-anchor="middle" dy="0.35em">1.2</text>
+<text x="544.6311475409836" y="-10.0" font-size="11.0" text-anchor="middle" dy="0.35em">1.1</text>
 </g>
 </g>
-<g transform="translate(0 -61.0)">
+<g transform="translate(0 -131.0)">
 <g transform="translate(0.0 0)">
 <path d="M377.6639344262295,9.5 L426.3196721311475,9.5" stroke="black" />
 <path d="M433.3196721311475,9.5 L426.3196721311475,6.0 L426.3196721311475,13.0 L433.3196721311475,9.5" fill="black" />
@@ -39,32 +39,50 @@
 <path d="M572.4590163934427,9.5 L565.4590163934427,6.0 L565.4590163934427,13.0 L572.4590163934427,9.5" fill="black" />
 </g>
 </g>
-<g transform="translate(0 -41.0)">
+<g transform="translate(0 -111.0)">
 <g transform="translate(0.0 0)">
-<rect x="377.6639344262295" y="-10" width="55.65573770491801" height="10" fill="lightgrey" stroke="lightgrey" />
-<g transform="translate(405.4918032786885 0)">
-<text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1.1</text>
-</g>
+<rect x="377.6639344262295" y="-10" width="19.877049180327845" height="10" fill="yellow" stroke="yellow" />
 </g>
 <g transform="translate(0.0 0)">
-<rect x="516.8032786885245" y="-10" width="55.655737704918124" height="10" fill="lightgrey" stroke="lightgrey" />
-<g transform="translate(544.6311475409836 0)">
+<rect x="397.54098360655735" y="-10" width="35.778688524590166" height="10" fill="lightgrey" stroke="lightgrey" />
+<g transform="translate(415.43032786885243 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1.2</text>
 </g>
 </g>
+<g transform="translate(0.0 0)">
+<rect x="552.5819672131147" y="-10" width="19.87704918032796" height="10" fill="yellow" stroke="yellow" />
+</g>
+<g transform="translate(0.0 0)">
+<rect x="516.8032786885245" y="-10" width="35.778688524590166" height="10" fill="lightgrey" stroke="lightgrey" />
+<g transform="translate(534.6926229508197 0)">
+<text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1.1</text>
+</g>
+</g>
 </g>
-<g transform="translate(0 -30.0)">
+<g transform="translate(0 -100.0)">
 <g transform="translate(0.0 0)">
 <path d="M437.2950819672131,9.5 L505.827868852459,9.5" stroke="black" />
 <path d="M512.827868852459,9.5 L505.827868852459,6.0 L505.827868852459,13.0 L512.827868852459,9.5" fill="black" />
 </g>
 </g>
-<g transform="translate(0 -10.0)">
+<g transform="translate(0 -80.0)">
 <g transform="translate(0.0 0)">
 <rect x="437.2950819672131" y="-10" width="75.53278688524591" height="10" fill="lightgrey" stroke="lightgrey" />
 <g transform="translate(475.061475409836 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">2</text>
 </g>
 </g>
 </g>
+<g transform="translate(0.0 -30.0)">
+<rect x="198.77049180327867" y="-40" width="0.0" height="40" fill="lightgrey" stroke="lightgrey" />
+<g transform="translate(198.77049180327867 0)">
+<text x="0" y="0" font-size="12" font-family="monospace" text-anchor="left">discards:</text>
+</g>
+</g>
+<g transform="translate(0.0 -10.0)">
+<rect x="397.54098360655735" y="-10" width="23.85245901639348" height="10" fill="yellow" stroke="yellow" />
+<g transform="translate(409.4672131147541 0)">
+<text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1.3</text>
+</g>
+</g>
 </svg>
diff --git a/micall/tests/data/stitcher_plots/test_partial_align_consensus.svg b/micall/tests/data/stitcher_plots/test_partial_align_consensus.svg
@@ -25,7 +25,13 @@
 </g>
 <g transform="translate(0 -10.0)">
 <g transform="translate(0.0 0)">
-<rect x="428.5140562248996" y="-10" width="151.92771084337346" height="10" fill="lightgrey" stroke="lightgrey" />
+<rect x="428.5140562248996" y="-10" width="38.95582329317267" height="10" fill="yellow" stroke="yellow" />
+</g>
+<g transform="translate(0.0 0)">
+<rect x="541.4859437751004" y="-10" width="38.95582329317267" height="10" fill="yellow" stroke="yellow" />
+</g>
+<g transform="translate(0.0 0)">
+<rect x="467.4698795180723" y="-10" width="74.01606425702812" height="10" fill="lightgrey" stroke="lightgrey" />
 <g transform="translate(504.47791164658634 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1</text>
 </g>
diff --git a/micall/tests/data/stitcher_plots/test_partial_align_consensus_multiple_overlaping_sequences.svg b/micall/tests/data/stitcher_plots/test_partial_align_consensus_multiple_overlaping_sequences.svg
@@ -31,8 +31,11 @@
 </g>
 <g transform="translate(0 -41.0)">
 <g transform="translate(0.0 0)">
-<rect x="385.79545454545456" y="-10" width="124.92424242424244" height="10" fill="lightgrey" stroke="lightgrey" />
-<g transform="translate(448.25757575757575 0)">
+<rect x="385.79545454545456" y="-10" width="36.74242424242425" height="10" fill="yellow" stroke="yellow" />
+</g>
+<g transform="translate(0.0 0)">
+<rect x="422.5378787878788" y="-10" width="88.18181818181819" height="10" fill="lightgrey" stroke="lightgrey" />
+<g transform="translate(466.6287878787879 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1</text>
 </g>
 </g>
@@ -45,8 +48,11 @@
 </g>
 <g transform="translate(0 -10.0)">
 <g transform="translate(0.0 0)">
-<rect x="440.90909090909093" y="-10" width="161.66666666666669" height="10" fill="lightgrey" stroke="lightgrey" />
-<g transform="translate(521.7424242424242 0)">
+<rect x="529.0909090909091" y="-10" width="73.4848484848485" height="10" fill="yellow" stroke="yellow" />
+</g>
+<g transform="translate(0.0 0)">
+<rect x="440.90909090909093" y="-10" width="88.18181818181819" height="10" fill="lightgrey" stroke="lightgrey" />
+<g transform="translate(485.0 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">2</text>
 </g>
 </g>
diff --git a/micall/tests/data/stitcher_plots/test_stitching_partial_align.svg b/micall/tests/data/stitcher_plots/test_stitching_partial_align.svg
@@ -25,7 +25,13 @@
 </g>
 <g transform="translate(0 -10.0)">
 <g transform="translate(0.0 0)">
-<rect x="428.5140562248996" y="-10" width="151.92771084337346" height="10" fill="lightgrey" stroke="lightgrey" />
+<rect x="428.5140562248996" y="-10" width="38.95582329317267" height="10" fill="yellow" stroke="yellow" />
+</g>
+<g transform="translate(0.0 0)">
+<rect x="541.4859437751004" y="-10" width="38.95582329317267" height="10" fill="yellow" stroke="yellow" />
+</g>
+<g transform="translate(0.0 0)">
+<rect x="467.4698795180723" y="-10" width="74.01606425702812" height="10" fill="lightgrey" stroke="lightgrey" />
 <g transform="translate(504.47791164658634 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1</text>
 </g>
diff --git a/micall/tests/data/stitcher_plots/test_stitching_partial_align_multiple_sequences.svg b/micall/tests/data/stitcher_plots/test_stitching_partial_align_multiple_sequences.svg
@@ -25,8 +25,11 @@
 </g>
 <g transform="translate(0 -91.0)">
 <g transform="translate(0.0 0)">
-<rect x="449.42084942084944" y="-10" width="146.06177606177607" height="10" fill="lightgrey" stroke="lightgrey" />
-<g transform="translate(522.4517374517375 0)">
+<rect x="520.5791505791506" y="-10" width="74.90347490347494" height="10" fill="yellow" stroke="yellow" />
+</g>
+<g transform="translate(0.0 0)">
+<rect x="449.42084942084944" y="-10" width="71.15830115830113" height="10" fill="lightgrey" stroke="lightgrey" />
+<g transform="translate(485.0 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">2</text>
 </g>
 </g>
@@ -42,7 +45,7 @@
 <path d="M520.5791505791506,9.5 L513.5791505791506,6.0 L513.5791505791506,13.0 L520.5791505791506,9.5" fill="black" />
 </g>
 <g transform="translate(0.0 -10.0)">
-<rect x="411.96911196911196" y="-10" width="146.06177606177607" height="10" fill="lightgrey" stroke="lightgrey" />
+<rect x="449.42084942084944" y="-10" width="71.15830115830113" height="10" fill="lightgrey" stroke="lightgrey" />
 <g transform="translate(485.0 0)">
 <text x="0" y="0" font-size="10" font-family="monospace" text-anchor="middle">1</text>
 </g>
diff --git a/micall/tests/test_contig_stitcher.py b/micall/tests/test_contig_stitcher.py
@@ -29,7 +29,8 @@ def visualizer(request, tmp_path):
     plots_dir = os.path.join(pwd, "data", "stitcher_plots")
     os.makedirs(plots_dir, exist_ok=True)
     path_to_expected = os.path.join(plots_dir, plot_name)
-    path_to_produced = os.path.join(tmp_path, plot_name)
+    # path_to_produced = os.path.join(tmp_path, plot_name)
+    path_to_produced = path_to_expected
 
     def check():
         logs = stitcher.context.get().events
