@@ -124,33 +124,33 @@ simplify_tables(tsk_table_collection_t *tcs, int num_chroms, int *samples, int N
124
124
{
125
125
int j , k , ret ;
126
126
const tsk_size_t num_nodes = tcs [0 ].nodes .num_rows ;
127
- bool * delete_nodes = malloc (num_nodes * sizeof (* delete_nodes ));
127
+ tsk_bool_t * keep_nodes = malloc (num_nodes * sizeof (* keep_nodes ));
128
128
tsk_id_t * node_id_map = malloc (num_nodes * sizeof (* node_id_map ));
129
129
tsk_id_t * edge_child , * edge_parent ;
130
130
131
- if (delete_nodes == NULL || node_id_map == NULL ) {
131
+ if (keep_nodes == NULL || node_id_map == NULL ) {
132
132
errx (EXIT_FAILURE , "Out of memory" );
133
133
}
134
134
135
135
printf ("Simplify %lld nodes\n" , (long long ) tcs [0 ].nodes .num_rows );
136
136
sort_and_simplify_all (tcs , num_chroms , samples , N );
137
137
138
138
for (j = 0 ; j < num_nodes ; j ++ ) {
139
- delete_nodes [j ] = true ;
139
+ keep_nodes [j ] = false ;
140
140
}
141
141
for (j = 0 ; j < N ; j ++ ) {
142
- delete_nodes [samples [j ]] = false ;
142
+ keep_nodes [samples [j ]] = true ;
143
143
}
144
144
145
145
for (j = 0 ; j < num_chroms ; j ++ ) {
146
146
edge_child = tcs [j ].edges .child ;
147
147
edge_parent = tcs [j ].edges .parent ;
148
148
for (k = 0 ; k < tcs [j ].edges .num_rows ; k ++ ) {
149
- delete_nodes [edge_child [k ]] = false ;
150
- delete_nodes [edge_parent [k ]] = false ;
149
+ keep_nodes [edge_child [k ]] = true ;
150
+ keep_nodes [edge_parent [k ]] = true ;
151
151
}
152
152
}
153
- tsk_node_table_delete_rows (& tcs [0 ].nodes , delete_nodes , 0 , node_id_map );
153
+ tsk_node_table_keep_rows (& tcs [0 ].nodes , keep_nodes , 0 , node_id_map );
154
154
printf ("\tdone: %lld nodes\n" , (long long ) tcs [0 ].nodes .num_rows );
155
155
156
156
/* Remap node references */
@@ -167,7 +167,7 @@ simplify_tables(tsk_table_collection_t *tcs, int num_chroms, int *samples, int N
167
167
for (j = 0 ; j < N ; j ++ ) {
168
168
samples [j ] = node_id_map [samples [j ]];
169
169
}
170
- free (delete_nodes );
170
+ free (keep_nodes );
171
171
free (node_id_map );
172
172
}
173
173
0 commit comments