@@ -10507,17 +10507,25 @@ TreeSequence_ld_matrix(TreeSequence *self, PyObject *args, PyObject *kwds,
10507
10507
PyObject * ret = NULL ;
10508
10508
static char * kwlist [] = { "sample_set_sizes" , "sample_sets" , "row_sites" ,
10509
10509
"col_sites" , "row_positions" , "column_positions" , "mode" , NULL };
10510
-
10511
- PyObject * row_sites = NULL , * col_sites = NULL , * row_positions = NULL ,
10512
- * col_positions = NULL , * sample_set_sizes = NULL , * sample_sets = NULL ;
10513
- PyArrayObject * row_sites_array = NULL , * col_sites_array = NULL ,
10514
- * row_positions_array = NULL , * col_positions_array = NULL ,
10515
- * sample_sets_array = NULL , * sample_set_sizes_array = NULL ,
10516
- * result_matrix = NULL ;
10517
- tsk_id_t * row_sites_parsed = NULL , * col_sites_parsed = NULL ;
10518
- double * row_positions_parsed = NULL , * col_positions_parsed = NULL ;
10519
- npy_intp result_dim [3 ] = { 0 , 0 , 0 };
10510
+ PyObject * sample_set_sizes = NULL ;
10511
+ PyObject * sample_sets = NULL ;
10512
+ PyObject * row_sites = NULL ;
10513
+ PyObject * col_sites = NULL ;
10514
+ PyObject * row_positions = NULL ;
10515
+ PyObject * col_positions = NULL ;
10520
10516
char * mode = NULL ;
10517
+ PyArrayObject * sample_set_sizes_array = NULL ;
10518
+ PyArrayObject * sample_sets_array = NULL ;
10519
+ PyArrayObject * row_sites_array = NULL ;
10520
+ PyArrayObject * col_sites_array = NULL ;
10521
+ PyArrayObject * row_positions_array = NULL ;
10522
+ PyArrayObject * col_positions_array = NULL ;
10523
+ PyArrayObject * result_matrix = NULL ;
10524
+ tsk_id_t * row_sites_parsed = NULL ;
10525
+ tsk_id_t * col_sites_parsed = NULL ;
10526
+ double * row_positions_parsed = NULL ;
10527
+ double * col_positions_parsed = NULL ;
10528
+ npy_intp result_dim [3 ] = { 0 , 0 , 0 };
10521
10529
tsk_size_t num_sample_sets ;
10522
10530
tsk_flags_t options = 0 ;
10523
10531
int err ;
@@ -10666,29 +10674,29 @@ TreeSequence_k_way_ld_matrix(TreeSequence *self, PyObject *args, PyObject *kwds,
10666
10674
PyObject * ret = NULL ;
10667
10675
static char * kwlist [] = { "sample_set_sizes" , "sample_sets" , "indexes" , "row_sites" ,
10668
10676
"col_sites" , "row_positions" , "column_positions" , "mode" , NULL };
10677
+ PyObject * sample_set_sizes = NULL ;
10678
+ PyObject * sample_sets = NULL ;
10679
+ PyObject * indexes = NULL ;
10669
10680
PyObject * row_sites = NULL ;
10670
10681
PyObject * col_sites = NULL ;
10671
10682
PyObject * row_positions = NULL ;
10672
10683
PyObject * col_positions = NULL ;
10673
- PyObject * sample_set_sizes = NULL ;
10674
- PyObject * sample_sets = NULL ;
10675
- PyObject * indexes = NULL ;
10684
+ char * mode = NULL ;
10685
+ PyArrayObject * sample_set_sizes_array = NULL ;
10686
+ PyArrayObject * sample_sets_array = NULL ;
10687
+ PyArrayObject * indexes_array = NULL ;
10676
10688
PyArrayObject * row_sites_array = NULL ;
10677
10689
PyArrayObject * col_sites_array = NULL ;
10678
10690
PyArrayObject * row_positions_array = NULL ;
10679
10691
PyArrayObject * col_positions_array = NULL ;
10680
- PyArrayObject * sample_sets_array = NULL ;
10681
- PyArrayObject * sample_set_sizes_array = NULL ;
10682
- PyArrayObject * indexes_array = NULL ;
10683
10692
PyArrayObject * result_matrix = NULL ;
10684
10693
tsk_id_t * row_sites_parsed = NULL ;
10685
10694
tsk_id_t * col_sites_parsed = NULL ;
10686
10695
double * row_positions_parsed = NULL ;
10687
10696
double * col_positions_parsed = NULL ;
10688
- npy_intp * shape , result_dim [3 ] = { 0 , 0 , 0 };
10689
- char * mode = NULL ;
10690
10697
tsk_size_t num_sample_sets ;
10691
10698
tsk_size_t num_set_index_tuples ;
10699
+ npy_intp * shape , result_dim [3 ] = { 0 , 0 , 0 };
10692
10700
tsk_flags_t options = 0 ;
10693
10701
int err ;
10694
10702
0 commit comments