# HG changeset patch # User iuc # Date 1524814436 14400 # Node ID 2d8543aeeb65d56afc9816f51995f36cb1908ffc # Parent 602a0c6f4bb0e8e75018a1238fa49c4d47cb72c7 planemo upload for repository https://github.com/maxplanck-ie/HiCExplorer/tree/master/galaxy/wrapper/ commit eec0a4d5a7c5ba4ec0fbd2ead8280c3d143bb9d8 diff -r 602a0c6f4bb0 -r 2d8543aeeb65 hicCorrelate.xml --- a/hicCorrelate.xml Wed Mar 07 03:39:03 2018 -0500 +++ b/hicCorrelate.xml Fri Apr 27 03:33:56 2018 -0400 @@ -1,5 +1,5 @@ - Computes pairwise correlations between hic matrices data + compute pairwise correlations between multiple Hi-C contact matrices hicCorrelate macros.xml @@ -40,12 +40,16 @@ + label="Use the log1p of the matrix values" help="If set, then the log1p of the matrix values is used. + This parameter has no effect for Spearman correlations + but changes the output of Pearson correlation and, for + the scatter plot, if set, the visualization of the + values is easier." /> - + @@ -93,43 +97,43 @@ Matrix correlation ================== -Computes pairwise correlations between Hi-C contact matrices. -The correlation is computed taking the values from each pair of matrices and discarding values that are zero in both matrices. +**hicCorrelate** is a dedicated Quality Control tool that allows the correlation of multiple Hi-C matrices at once with either a heatmap or scatterplots output. + +Computes pairwise correlations between Hi-C matrices data. The correlation is computed taking the values from each pair of matrices and discarding values that are zero in both matrices. Parameters that strongly affect correlations are bin size of the Hi-C matrices (can be changed using ``hicMergeMatrixBins``) and the considered range. The smaller the bin size of the matrices, the finer the differences you score. The *Range* parameter should be selected at a meaningful genomic scale according to, for example, the mean size of the TADs in the organism you work with or to specific ranges found using ``hicPlotDistVsCounts``. -Input +_________________ + +Usage ----- -Parameters -__________ -- Two contact matrices which are used for the correlation. -- Choice if pearson or spearman correlation should be used. -- log scale for the values -- Correlate full matrix or only specific chromosomes -- Correlate only within a given range. -- colormap to use: Colormap_ +It is recommended to use this tool on corrected matrices (``hicCorrectMatrix``) at restriction enzyme resolution (unmerged bins). + +_________________ Output ------ -Pearson correlation -___________________ +**hicCorrelate** outputs correlation plots of multiple Hi-C matrices. + +Below, you can find a correlation example of uncorrected Hi-C matrices obtained from *Drosophila melanogaster* embryos, either wild-type or having one gene knocked-down by RNAi. -.. image:: $PATH_TO_IMAGES/hicCorrelate_pearson.png +Heatmap +_______ + +.. image:: $PATH_TO_IMAGES/hicCorrelate_Dmel_heatmap.png :width: 45% -.. image:: $PATH_TO_IMAGES/hicCorrelate_pearson_scatter.png - :width: 45% +This example is showing a heatmap that was calculated using the Pearson correlation of corrected Hi-C matrices with a bin size of 6000 bp at a range of 5000 to 200000. The dendrogram indicates which samples are most similar to each other. You can see that the wild-type samples are seperated from the knock-down samples. In that case, Spearman correlation gives very similar results (not shown). - +Scatterplot +___________ -Spearman correlation -_____________________ +.. image:: $PATH_TO_IMAGES/hicCorrelate_Dmel_scatterplot.png + :width: 45% -.. image:: $PATH_TO_IMAGES/hicCorrelate_spearman.png - :width: 45 % +Additionally, pairwise scatterplots comparing interactions between each sample can be plotted. -.. image:: $PATH_TO_IMAGES/hicCorrelate_spearman_scatter.png - :width: 45 % +_________________ For more information about HiCExplorer please consider our documentation on readthedocs.io_. diff -r 602a0c6f4bb0 -r 2d8543aeeb65 involucro Binary file involucro has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 macros.xml --- a/macros.xml Wed Mar 07 03:39:03 2018 -0500 +++ b/macros.xml Fri Apr 27 03:33:56 2018 -0400 @@ -1,7 +1,6 @@ \${GALAXY_SLOTS:-4} - 2.1 - + 2.1.2 #if $use_range.select_use_range == "yes_use_range": --range $range_min:$range_max @@ -28,7 +27,7 @@ - + @@ -40,8 +39,8 @@ - - + + @@ -189,9 +188,9 @@ - + - \${GALAXY_SLOTS:-4} -<<<<<<< HEAD - 2.0 - - - #if $use_range.select_use_range == "yes_use_range": - --range $range_min:$range_max - #end if - - -======= - 2.1alpha1 ->>>>>>> joachimwolff-master - - - hicexplorer - - - @BINARY@ --version - - - - - 10.5281/zenodo.1133705 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #set $matrices = [] - #set $mlabels = [] - #for $counter, $i in enumerate($input_files): - ln -s $i.matrix #echo str($counter)+'_matrix'#; - #silent $matrices.append( '%s_matrix' % $counter ) - - #if str($i.mlabel.value) != "": - #set $mlabels += ['"%s"' % ($i.mlabel.value)] - #else - #set $mlabels += ['"%s"' % ($i.matrix.name)] - #end if - #end for - #set $mlabels = ' '.join($mlabels) - #set $matrices = ' '.join($matrices) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #if $advancedOpt.used_multiple_regions.used_multiple_regions_options == 'no': - #if $advancedOpt.used_multiple_regions.clustering.clustering_options == 'kmeans': - #if int($advancedOpt.used_multiple_regions.clustering.k_kmeans) > 0: - --kmeans $advancedOpt.used_multiple_regions.clustering.k_kmeans - #end if - #end if - #end if - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -.. class:: infomark - -For more information on the tools, please visit our `help site`_. - -If you would like to give us feedback or you run into any trouble, please send an email to deeptools@googlegroups.com - -This tool is developed by the `Bioinformatics and Deep-Sequencing Unit`_ at the `Max Planck Institute for Immunobiology and Epigenetics`_. - -.. _Bioinformatics and Deep-Sequencing Unit: http://www3.ie-freiburg.mpg.de/facilities/research-facilities/bioinformatics-and-deep-sequencing-unit/ -.. _Max Planck Institute for Immunobiology and Epigenetics: http://www3.ie-freiburg.mpg.de -.. _help site: https://hicexplorer.readthedocs.org - - - - - - - - - - - - - - - - - - - - - - - - #import tempfile - #set $temp_dir = os.path.abspath(tempfile.mkdtemp()) - #set files=[] - #set labels=[] - #for $i in $input_files: - #set $temp_input_handle = tempfile.NamedTemporaryFile( dir=$temp_dir ) - #set $temp_input_path = $temp_input_handle.name - #silent $temp_input_handle.close() - #silent os.system("ln -s %s %s.bam" % (str($i.bamfile), $temp_input_path)) - #silent os.system("ln -s %s %s.bam.bai" % (str($i.bamfile.metadata.bam_index), $temp_input_path)) - #silent $files.append('%s.bam' % $temp_input_path) - - ##set $files += [str($i.bamfile)] - #if str($i.label.value) != "": - #set $labels += ["\"%s\"" % ($i.label.value)] - #else - #set $labels += ["\"%s\"" % ($i.bamfile.name)] - #end if - #end for - - - - #import tempfile - #set $temp_dir = os.path.abspath(tempfile.mkdtemp()) - #set files=[] - #set labels=[] - #for $i in $input_files: - #set $temp_input_handle = tempfile.NamedTemporaryFile( dir=$temp_dir ) - #set $temp_input_path = $temp_input_handle.name - #silent $temp_input_handle.close() - #silent os.system("ln -s %s %s.bw" % (str($i.bigwigfile), $temp_input_path)) - #silent $files.append('%s.bw' % $temp_input_path) - - ##set $files += [str($i.bigwigfile)] - #if str($i.label.value) != "": - #set $labels += ["\"%s\"" % ($i.label.value)] - #else - #set $labels += ["\"%s\"" % ($i.bigwigfile.name)] - #end if - #end for - - - - - - - - - - - - - - - - - - - - - - - - #if $source.ref_source=="history": - --genome $source.input1 - #else: - --genome "${source.input1_2bit.fields.path}" - #end if - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (( - output['showOutputSettings'] == 'yes' and - output['saveMatrix'] is True - )) - - - - - - - - (( - output['showOutputSettings'] == 'yes' and - output['saveData'] is True - )) - - - - - (( - output['showOutputSettings'] == 'yes' and - output['saveSortedRegions'] is True - )) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicAggregateContacts.png Binary file static/images/hicAggregateContacts.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicCompareMatrices_QC_log2_m50_matrix_plot (1).png Binary file static/images/hicCompareMatrices_QC_log2_m50_matrix_plot (1).png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicCompareMatrices_m1bp_over_gst_log2_m50_matrix_plot (1).png Binary file static/images/hicCompareMatrices_m1bp_over_gst_log2_m50_matrix_plot (1).png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicCorrelate_Dmel_heatmap.png Binary file static/images/hicCorrelate_Dmel_heatmap.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicCorrelate_Dmel_scatterplot.png Binary file static/images/hicCorrelate_Dmel_scatterplot.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicMergeMatrixBins_Xchr.png Binary file static/images/hicMergeMatrixBins_Xchr.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicMergeMatrixBins_Xregion.png Binary file static/images/hicMergeMatrixBins_Xregion.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicPCA.png Binary file static/images/hicPCA.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicPlotDistvsCounts.png Binary file static/images/hicPlotDistvsCounts.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicPlotMatrix.png Binary file static/images/hicPlotMatrix.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicPlotTADs.png Binary file static/images/hicPlotTADs.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicQC_distance.png Binary file static/images/hicQC_distance.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicQC_pairs_discarded.png Binary file static/images/hicQC_pairs_discarded.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicQC_pairs_sequenced.png Binary file static/images/hicQC_pairs_sequenced.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicQC_read_orientation.png Binary file static/images/hicQC_read_orientation.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/hicQC_unmappable_and_non_unique.png Binary file static/images/hicQC_unmappable_and_non_unique.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 static/images/pulication_plots_viewpoint.png Binary file static/images/pulication_plots_viewpoint.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/compare_matrices_log2ratio.h5 Binary file test-data/compare_matrices_log2ratio.h5 has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/compare_matrices_pearson_ratio.cool Binary file test-data/compare_matrices_pearson_ratio.cool has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/covariance_small_50kb.cool Binary file test-data/covariance_small_50kb.cool has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/covariance_small_50kb.h5 Binary file test-data/covariance_small_50kb.h5 has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/hicCorrectMatrix_result1.npz.h5 Binary file test-data/hicCorrectMatrix_result1.npz.h5 has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/hicMergeMatrixBins_result1.npz.h5 Binary file test-data/hicMergeMatrixBins_result1.npz.h5 has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/hicPlotDistVsCounts_result2.png Binary file test-data/hicPlotDistVsCounts_result2.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/hicSumMatrices_result1.npz.h5 Binary file test-data/hicSumMatrices_result1.npz.h5 has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/li_viewpoint_32-33Mb.png Binary file test-data/li_viewpoint_32-33Mb.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/li_viewpoint_32Mb.png Binary file test-data/li_viewpoint_32Mb.png has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/multiFDR_zscore_matrix.h5 Binary file test-data/multiFDR_zscore_matrix.h5 has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/obs_exp_small_50kb.cool Binary file test-data/obs_exp_small_50kb.cool has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/obs_exp_small_50kb.h5 Binary file test-data/obs_exp_small_50kb.h5 has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/pca1.bw Binary file test-data/pca1.bw has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/pearson_small_50kb.h5 Binary file test-data/pearson_small_50kb.h5 has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/pearson_small_50kb_transform.cool Binary file test-data/pearson_small_50kb_transform.cool has changed diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/small_matrix_50kb_pearson_pca1_plot.svg --- a/test-data/small_matrix_50kb_pearson_pca1_plot.svg Wed Mar 07 03:39:03 2018 -0500 +++ b/test-data/small_matrix_50kb_pearson_pca1_plot.svg Fri Apr 27 03:33:56 2018 -0400 @@ -19,25 +19,25 @@ - - + +" id="m97ff0dfa59" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -72,7 +72,7 @@ " id="DejaVuSans-2e"/> - + @@ -84,7 +84,7 @@ - + @@ -115,7 +115,7 @@ z " id="DejaVuSans-35"/> - + @@ -127,7 +127,7 @@ - + @@ -147,7 +147,7 @@ z " id="DejaVuSans-31"/> - + @@ -159,12 +159,12 @@ - + - + @@ -176,7 +176,7 @@ - + @@ -207,7 +207,7 @@ z " id="DejaVuSans-32"/> - + @@ -219,12 +219,12 @@ - + - + @@ -236,7 +236,7 @@ - + @@ -341,7 +341,7 @@ z " id="DejaVuSans-70"/> - + @@ -499,7 +499,7 @@ z " id="DejaVuSans-74"/> - + @@ -517,15 +517,15 @@ +" id="meaf3285180" style="stroke:#000000;stroke-width:0.8;"/> - + - + @@ -537,12 +537,12 @@ - + - + @@ -554,12 +554,12 @@ - + - + @@ -571,12 +571,12 @@ - + - + @@ -588,12 +588,12 @@ - + - + @@ -605,12 +605,12 @@ - + - + @@ -622,12 +622,12 @@ - + - + @@ -642,7 +642,7 @@ - + @@ -655,1788 +655,1788 @@ - - - - - - - - - - - + + + + + + @@ -2444,7 +2444,7 @@ - + @@ -2457,7 +2457,7 @@ z " id="DejaVuSans-2212"/> - + @@ -2469,12 +2469,12 @@ - + - + @@ -2486,19 +2486,19 @@ - - + @@ -2506,15 +2506,15 @@ +" id="m61d7b75cf5" style="stroke:#000000;stroke-width:0.8;"/> - + - + @@ -2524,12 +2524,12 @@ - + - + @@ -2539,7 +2539,7 @@ - + @@ -2563,7 +2563,7 @@ z " id="DejaVuSans-34"/> - + @@ -2573,7 +2573,7 @@ - + @@ -2610,7 +2610,7 @@ z " id="DejaVuSans-36"/> - + @@ -2620,7 +2620,7 @@ - + @@ -2666,7 +2666,7 @@ z " id="DejaVuSans-38"/> - + @@ -2676,12 +2676,12 @@ - + - + @@ -2690,39 +2690,39 @@ - - - + - + - + @@ -2734,12 +2734,12 @@ - + - + @@ -2751,12 +2751,12 @@ - + - + @@ -2768,12 +2768,12 @@ - + - + @@ -2785,12 +2785,12 @@ - + - + @@ -2806,12 +2806,12 @@ - + - + @@ -2822,7 +2822,7 @@ - + @@ -2838,12 +2838,12 @@ - + - + @@ -2855,12 +2855,12 @@ - + - + @@ -2872,12 +2872,12 @@ - + - + @@ -2889,12 +2889,12 @@ - + - + @@ -2906,12 +2906,12 @@ - + - + @@ -2927,12 +2927,12 @@ - + - + @@ -2943,7 +2943,7 @@ - + @@ -2956,1964 +2956,1964 @@ - - - - - - - + + @@ -4921,12 +4921,12 @@ - + - + @@ -4937,12 +4937,12 @@ - + - + @@ -4954,30 +4954,30 @@ - - + - + - + @@ -4987,12 +4987,12 @@ - + - + @@ -5002,12 +5002,12 @@ - + - + @@ -5017,12 +5017,12 @@ - + - + @@ -5032,12 +5032,12 @@ - + - + @@ -5047,12 +5047,12 @@ - + - + @@ -5061,39 +5061,39 @@ - - - + - + - + @@ -5101,12 +5101,12 @@ - + - + @@ -5115,12 +5115,12 @@ - + - + @@ -5130,12 +5130,12 @@ - + - + @@ -5145,12 +5145,12 @@ - + - + @@ -5160,12 +5160,12 @@ - + - + @@ -5175,7 +5175,7 @@ - + @@ -5195,7 +5195,7 @@ z " id="DejaVuSans-4b"/> - + @@ -5209,12 +5209,12 @@ - + - + @@ -5233,7 +5233,7 @@ z " id="DejaVuSans-4c"/> - + @@ -5249,12 +5249,12 @@ - + - + @@ -5262,12 +5262,12 @@ - + - + @@ -5276,12 +5276,12 @@ - + - + @@ -5291,12 +5291,12 @@ - + - + @@ -5306,12 +5306,12 @@ - + - + @@ -5321,12 +5321,12 @@ - + - + @@ -5336,12 +5336,12 @@ - + - + @@ -5355,12 +5355,12 @@ - + - + @@ -5369,7 +5369,7 @@ - + @@ -5382,2030 +5382,2030 @@ - - - - - @@ -7413,12 +7413,12 @@ - + - + @@ -7428,12 +7428,12 @@ - + - + @@ -7444,30 +7444,30 @@ - - + - + - + @@ -7477,12 +7477,12 @@ - + - + @@ -7492,12 +7492,12 @@ - + - + @@ -7507,12 +7507,12 @@ - + - + @@ -7522,12 +7522,12 @@ - + - + @@ -7537,12 +7537,12 @@ - + - + @@ -7551,39 +7551,39 @@ - - - + - + - + @@ -7591,12 +7591,12 @@ - + - + @@ -7606,12 +7606,12 @@ - + - + @@ -7621,12 +7621,12 @@ - + - + @@ -7636,12 +7636,12 @@ - + - + @@ -7651,12 +7651,12 @@ - + - + @@ -7667,12 +7667,12 @@ - + - + @@ -7686,7 +7686,7 @@ - + @@ -7698,12 +7698,12 @@ - + - + @@ -7711,12 +7711,12 @@ - + - + @@ -7726,12 +7726,12 @@ - + - + @@ -7741,12 +7741,12 @@ - + - + @@ -7756,12 +7756,12 @@ - + - + @@ -7771,12 +7771,12 @@ - + - + @@ -7787,12 +7787,12 @@ - + - + @@ -7806,7 +7806,7 @@ - + @@ -7815,1954 +7815,1954 @@ - - - - - @@ -9770,12 +9770,12 @@ - + - + @@ -9787,12 +9787,12 @@ - + - + @@ -9803,12 +9803,12 @@ - + - + @@ -9820,30 +9820,30 @@ - - + - + - + @@ -9854,12 +9854,12 @@ - + - + @@ -9869,12 +9869,12 @@ - + - + @@ -9884,12 +9884,12 @@ - + - + @@ -9899,12 +9899,12 @@ - + - + @@ -9914,12 +9914,12 @@ - + - + @@ -9929,12 +9929,12 @@ - + - + @@ -9943,39 +9943,39 @@ - - - + - + - + @@ -9983,12 +9983,12 @@ - + - + @@ -9997,12 +9997,12 @@ - + - + @@ -10012,12 +10012,12 @@ - + - + @@ -10027,12 +10027,12 @@ - + - + @@ -10042,12 +10042,12 @@ - + - + @@ -10061,12 +10061,12 @@ - + - + @@ -10088,7 +10088,7 @@ z " id="DejaVuSans-59"/> - + @@ -10103,12 +10103,12 @@ - + - + @@ -10116,12 +10116,12 @@ - + - + @@ -10130,12 +10130,12 @@ - + - + @@ -10145,12 +10145,12 @@ - + - + @@ -10160,12 +10160,12 @@ - + - + @@ -10175,12 +10175,12 @@ - + - + @@ -10194,12 +10194,12 @@ - + - + @@ -10208,7 +10208,7 @@ - + @@ -10220,23 +10220,23 @@ - - - - @@ -10246,12 +10246,12 @@ - + - + @@ -10263,12 +10263,12 @@ - + - + @@ -10279,12 +10279,12 @@ - + - + @@ -10296,30 +10296,30 @@ - - + - + - + @@ -10332,7 +10332,7 @@ - + @@ -10348,7 +10348,7 @@ z " id="DejaVuSans-37"/> - + @@ -10361,12 +10361,12 @@ - + - + @@ -10379,12 +10379,12 @@ - + - + @@ -10397,12 +10397,12 @@ - + - + @@ -10414,12 +10414,12 @@ - + - + @@ -10431,12 +10431,12 @@ - + - + @@ -10448,12 +10448,12 @@ - + - + @@ -10465,12 +10465,12 @@ - + - + @@ -10481,39 +10481,39 @@ - - - + - + - + @@ -10525,12 +10525,12 @@ - + - + @@ -10542,12 +10542,12 @@ - + - + @@ -10560,12 +10560,12 @@ - + - + @@ -10578,12 +10578,12 @@ - + - + @@ -10599,7 +10599,7 @@ - + @@ -10612,12 +10612,12 @@ - + - + @@ -10629,12 +10629,12 @@ - + - + @@ -10646,12 +10646,12 @@ - + - + @@ -10664,12 +10664,12 @@ - + - + @@ -10682,12 +10682,12 @@ - + - + @@ -10703,7 +10703,7 @@ - + @@ -10713,2026 +10713,2026 @@ - - - - - @@ -12740,12 +12740,12 @@ - + - + @@ -12757,12 +12757,12 @@ - + - + @@ -12773,12 +12773,12 @@ - + - + @@ -12790,30 +12790,30 @@ - - + - + - + @@ -12823,12 +12823,12 @@ - + - + @@ -12838,12 +12838,12 @@ - + - + @@ -12853,12 +12853,12 @@ - + - + @@ -12868,12 +12868,12 @@ - + - + @@ -12883,12 +12883,12 @@ - + - + @@ -12897,39 +12897,39 @@ - - - + - + - + @@ -12941,12 +12941,12 @@ - + - + @@ -12958,12 +12958,12 @@ - + - + @@ -12976,12 +12976,12 @@ - + - + @@ -12994,12 +12994,12 @@ - + - + @@ -13015,7 +13015,7 @@ - + @@ -13028,12 +13028,12 @@ - + - + @@ -13045,12 +13045,12 @@ - + - + @@ -13062,12 +13062,12 @@ - + - + @@ -13080,12 +13080,12 @@ - + - + @@ -13098,12 +13098,12 @@ - + - + @@ -13119,7 +13119,7 @@ - + @@ -13129,2032 +13129,2032 @@ - - - - - - + @@ -15162,12 +15162,12 @@ - + - + @@ -15179,12 +15179,12 @@ - + - + @@ -15196,30 +15196,30 @@ - - + - + - + @@ -15229,12 +15229,12 @@ - + - + @@ -15244,12 +15244,12 @@ - + - + @@ -15259,12 +15259,12 @@ - + - + @@ -15274,12 +15274,12 @@ - + - + @@ -15289,12 +15289,12 @@ - + - + @@ -15303,39 +15303,39 @@ - - - + - + - + @@ -15347,12 +15347,12 @@ - + - + @@ -15364,12 +15364,12 @@ - + - + @@ -15381,12 +15381,12 @@ - + - + @@ -15398,12 +15398,12 @@ - + - + @@ -15419,12 +15419,12 @@ - + - + @@ -15454,7 +15454,7 @@ z " id="DejaVuSans-55"/> - + @@ -15466,12 +15466,12 @@ - + - + @@ -15483,12 +15483,12 @@ - + - + @@ -15500,12 +15500,12 @@ - + - + @@ -15517,12 +15517,12 @@ - + - + @@ -15534,12 +15534,12 @@ - + - + @@ -15555,12 +15555,12 @@ - + - + @@ -15572,7 +15572,7 @@ - + @@ -15581,1128 +15581,1128 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16710,12 +16710,12 @@ - + - + @@ -16727,12 +16727,12 @@ - + - + @@ -16744,30 +16744,30 @@ - - + - + - + @@ -16777,12 +16777,12 @@ - + - + @@ -16792,12 +16792,12 @@ - + - + @@ -16807,12 +16807,12 @@ - + - + @@ -16822,12 +16822,12 @@ - + - + @@ -16837,12 +16837,12 @@ - + - + @@ -16851,39 +16851,39 @@ - - - + - + - + @@ -16895,12 +16895,12 @@ - + - + @@ -16912,12 +16912,12 @@ - + - + @@ -16929,12 +16929,12 @@ - + - + @@ -16946,12 +16946,12 @@ - + - + @@ -16964,12 +16964,12 @@ - + - + @@ -16982,12 +16982,12 @@ - + - + @@ -17000,12 +17000,12 @@ - + - + @@ -17018,12 +17018,12 @@ - + - + @@ -17055,7 +17055,7 @@ z " id="DejaVuSans-58"/> - + @@ -17067,12 +17067,12 @@ - + - + @@ -17084,12 +17084,12 @@ - + - + @@ -17101,12 +17101,12 @@ - + - + @@ -17118,12 +17118,12 @@ - + - + @@ -17135,12 +17135,12 @@ - + - + @@ -17153,12 +17153,12 @@ - + - + @@ -17171,12 +17171,12 @@ - + - + @@ -17189,12 +17189,12 @@ - + - + @@ -17207,12 +17207,12 @@ - + - + @@ -17228,7 +17228,7 @@ - + @@ -17237,2024 +17237,2024 @@ - - - - - - - + + @@ -19262,12 +19262,12 @@ - + - + @@ -19278,12 +19278,12 @@ - + - + @@ -19295,30 +19295,30 @@ - - + - + - + @@ -19328,12 +19328,12 @@ - + - + @@ -19343,12 +19343,12 @@ - + - + @@ -19358,12 +19358,12 @@ - + - + @@ -19373,12 +19373,12 @@ - + - + @@ -19388,12 +19388,12 @@ - + - + @@ -19402,39 +19402,39 @@ - - - + - + - + @@ -19442,12 +19442,12 @@ - + - + @@ -19456,12 +19456,12 @@ - + - + @@ -19470,12 +19470,12 @@ - + - + @@ -19484,12 +19484,12 @@ - + - + @@ -19499,12 +19499,12 @@ - + - + @@ -19514,12 +19514,12 @@ - + - + @@ -19529,12 +19529,12 @@ - + - + @@ -19548,12 +19548,12 @@ - + - + @@ -19562,7 +19562,7 @@ - + @@ -19577,12 +19577,12 @@ - + - + @@ -19590,12 +19590,12 @@ - + - + @@ -19604,12 +19604,12 @@ - + - + @@ -19618,12 +19618,12 @@ - + - + @@ -19632,12 +19632,12 @@ - + - + @@ -19647,12 +19647,12 @@ - + - + @@ -19662,12 +19662,12 @@ - + - + @@ -19677,12 +19677,12 @@ - + - + @@ -19696,12 +19696,12 @@ - + - + @@ -19710,7 +19710,7 @@ - + @@ -19722,2030 +19722,2030 @@ - - - - - @@ -21753,12 +21753,12 @@ - + - + @@ -21768,12 +21768,12 @@ - + - + @@ -21784,30 +21784,30 @@ - - + - + - + @@ -21818,12 +21818,12 @@ - + - + @@ -21833,12 +21833,12 @@ - + - + @@ -21848,12 +21848,12 @@ - + - + @@ -21863,12 +21863,12 @@ - + - + @@ -21878,12 +21878,12 @@ - + - + @@ -21893,12 +21893,12 @@ - + - + @@ -21907,39 +21907,39 @@ - - - + - + - + @@ -21951,12 +21951,12 @@ - + - + @@ -21968,12 +21968,12 @@ - + - + @@ -21985,12 +21985,12 @@ - + - + @@ -22002,12 +22002,12 @@ - + - + @@ -22020,12 +22020,12 @@ - + - + @@ -22038,12 +22038,12 @@ - + - + @@ -22056,12 +22056,12 @@ - + - + @@ -22074,12 +22074,12 @@ - + - + @@ -22095,7 +22095,7 @@ - + @@ -22108,12 +22108,12 @@ - + - + @@ -22125,12 +22125,12 @@ - + - + @@ -22142,12 +22142,12 @@ - + - + @@ -22159,12 +22159,12 @@ - + - + @@ -22176,12 +22176,12 @@ - + - + @@ -22194,12 +22194,12 @@ - + - + @@ -22212,12 +22212,12 @@ - + - + @@ -22230,12 +22230,12 @@ - + - + @@ -22248,12 +22248,12 @@ - + - + @@ -22269,7 +22269,7 @@ - + @@ -22279,2032 +22279,2032 @@ - - - - - - + @@ -24312,12 +24312,12 @@ - + - + @@ -24328,12 +24328,12 @@ - + - + @@ -24345,30 +24345,30 @@ - - + - + - + @@ -24378,12 +24378,12 @@ - + - + @@ -24393,12 +24393,12 @@ - + - + @@ -24408,12 +24408,12 @@ - + - + @@ -24423,12 +24423,12 @@ - + - + @@ -24438,12 +24438,12 @@ - + - + @@ -24452,39 +24452,39 @@ - - - + - + - + @@ -24496,12 +24496,12 @@ - + - + @@ -24513,12 +24513,12 @@ - + - + @@ -24531,12 +24531,12 @@ - + - + @@ -24549,12 +24549,12 @@ - + - + @@ -24567,12 +24567,12 @@ - + - + @@ -24588,7 +24588,7 @@ - + @@ -24601,12 +24601,12 @@ - + - + @@ -24618,12 +24618,12 @@ - + - + @@ -24635,12 +24635,12 @@ - + - + @@ -24653,12 +24653,12 @@ - + - + @@ -24671,12 +24671,12 @@ - + - + @@ -24689,12 +24689,12 @@ - + - + @@ -24710,7 +24710,7 @@ - + @@ -24720,2030 +24720,2030 @@ - - - - - @@ -26751,12 +26751,12 @@ - + - + @@ -26767,12 +26767,12 @@ - + - + @@ -26784,30 +26784,30 @@ - - + - + - + @@ -26819,12 +26819,12 @@ - + - + @@ -26836,12 +26836,12 @@ - + - + @@ -26853,12 +26853,12 @@ - + - + @@ -26869,12 +26869,12 @@ - + - + @@ -26885,12 +26885,12 @@ - + - + @@ -26901,12 +26901,12 @@ - + - + @@ -26917,12 +26917,12 @@ - + - + @@ -26932,39 +26932,39 @@ - - - - + - + @@ -26976,12 +26976,12 @@ - + - + @@ -26993,12 +26993,12 @@ - + - + @@ -27011,12 +27011,12 @@ - + - + @@ -27029,12 +27029,12 @@ - + - + @@ -27047,12 +27047,12 @@ - + - + @@ -27116,7 +27116,7 @@ z " id="DejaVuSans-61"/> - + @@ -27133,12 +27133,12 @@ - + - + @@ -27150,12 +27150,12 @@ - + - + @@ -27167,12 +27167,12 @@ - + - + @@ -27185,12 +27185,12 @@ - + - + @@ -27203,12 +27203,12 @@ - + - + @@ -27221,12 +27221,12 @@ - + - + @@ -27242,7 +27242,7 @@ - + @@ -27256,488 +27256,488 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27745,12 +27745,12 @@ - + - + @@ -27760,12 +27760,12 @@ - + - + @@ -27776,30 +27776,30 @@ - - + - + - + @@ -27809,12 +27809,12 @@ - + - + @@ -27824,12 +27824,12 @@ - + - + @@ -27839,12 +27839,12 @@ - + - + @@ -27854,12 +27854,12 @@ - + - + @@ -27869,12 +27869,12 @@ - + - + @@ -27883,24 +27883,24 @@ - - @@ -27910,15 +27910,15 @@ +" id="m72d66e3025" style="stroke:#000000;stroke-width:0.8;"/> - + - + @@ -27928,12 +27928,12 @@ - + - + @@ -27943,12 +27943,12 @@ - + - + @@ -27958,12 +27958,12 @@ - + - + @@ -27973,12 +27973,12 @@ - + - + @@ -27988,12 +27988,12 @@ - + - + @@ -28005,12 +28005,12 @@ - + - + @@ -28020,12 +28020,12 @@ - + - + @@ -28035,12 +28035,12 @@ - + - + @@ -28050,12 +28050,12 @@ - + - + @@ -28065,12 +28065,12 @@ - + - + @@ -28080,12 +28080,12 @@ - + - + @@ -28094,32 +28094,32 @@ - - - - - @@ -28127,12 +28127,12 @@ - + - + @@ -28142,12 +28142,12 @@ - + - + @@ -28157,12 +28157,12 @@ - + - + @@ -28172,12 +28172,12 @@ - + - + @@ -28187,12 +28187,12 @@ - + - + @@ -28202,12 +28202,12 @@ - + - + @@ -28219,12 +28219,12 @@ - + - + @@ -28234,12 +28234,12 @@ - + - + @@ -28249,12 +28249,12 @@ - + - + @@ -28263,32 +28263,32 @@ - - - - - @@ -28296,12 +28296,12 @@ - + - + @@ -28309,12 +28309,12 @@ - + - + @@ -28324,12 +28324,12 @@ - + - + @@ -28339,12 +28339,12 @@ - + - + @@ -28354,12 +28354,12 @@ - + - + @@ -28369,12 +28369,12 @@ - + - + @@ -28384,12 +28384,12 @@ - + - + @@ -28399,12 +28399,12 @@ - + - + @@ -28413,47 +28413,47 @@ - - - - - - + - + - + @@ -28465,12 +28465,12 @@ - + - + @@ -28482,12 +28482,12 @@ - + - + @@ -28499,12 +28499,12 @@ - + - + @@ -28516,12 +28516,12 @@ - + - + @@ -28533,12 +28533,12 @@ - + - + @@ -28553,7 +28553,7 @@ - + @@ -28569,12 +28569,12 @@ - + - + @@ -28586,12 +28586,12 @@ - + - + @@ -28603,12 +28603,12 @@ - + - + @@ -28620,12 +28620,12 @@ - + - + @@ -28637,12 +28637,12 @@ - + - + @@ -28654,12 +28654,12 @@ - + - + @@ -28674,7 +28674,7 @@ - + @@ -28687,1884 +28687,1884 @@ - - - - - - - + + @@ -30572,12 +30572,12 @@ - + - + @@ -30589,12 +30589,12 @@ - + - + @@ -30605,12 +30605,12 @@ - + - + @@ -30622,30 +30622,30 @@ - - + - + - + @@ -30655,12 +30655,12 @@ - + - + @@ -30670,12 +30670,12 @@ - + - + @@ -30685,12 +30685,12 @@ - + - + @@ -30700,12 +30700,12 @@ - + - + @@ -30715,12 +30715,12 @@ - + - + @@ -30729,100 +30729,100 @@ - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff -r 602a0c6f4bb0 -r 2d8543aeeb65 test-data/small_test_matrix_2.h5 Binary file test-data/small_test_matrix_2.h5 has changed