Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-23 07:59:37 +00:00
Code Issues Projects Releases Wiki Activity

neaten

Browse source
This commit is contained in:
John Kerl 2015-10-20 17:01:57 -04:00
parent e38afe2b5c
commit dbc2ad28c0
3 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
c/mapping/mapper_stats1.c
View file

@ -48,7 +48,7 @@ static mapper_t* mapper_stats1_alloc(slls_t* paccumulator_names, slls_t* pvalue_
slls_t* pgroup_by_field_names, int do_iterative_stats);
static void mapper_stats1_free(void* pvstate);
static sllv_t* mapper_stats1_process(lrec_t* pinrec, context_t* pctx, void* pvstate);
static lrec_t* mapper_stats1_ingest(lrec_t* pinrec, mapper_stats1_state_t* pstate);
static void mapper_stats1_ingest(lrec_t* pinrec, mapper_stats1_state_t* pstate);
static sllv_t* mapper_stats1_emit_all(mapper_stats1_state_t* pstate);
static lrec_t* mapper_stats1_emit(mapper_stats1_state_t* pstate, lrec_t* poutrec,
char* value_field_name, char* stats1_name, lhmsv_t* acc_field_to_acc_state);
@ -230,12 +230,13 @@ char* fake_acc_name_for_setups = "__setup_done__";
static sllv_t* mapper_stats1_process(lrec_t* pinrec, context_t* pctx, void* pvstate) {
mapper_stats1_state_t* pstate = pvstate;
if (pinrec != NULL) {
lrec_t* poutrec = mapper_stats1_ingest(pinrec, pstate);
if (poutrec == NULL) {
mapper_stats1_ingest(pinrec, pstate);
if (pstate->do_iterative_stats) {
// The input record will be modified in this case, with new fields appended
return sllv_single(pinrec);
} else {
lrec_free(pinrec);
return NULL;
} else {
return sllv_single(poutrec);
}
} else if (!pstate->do_iterative_stats) {
return mapper_stats1_emit_all(pstate);
@ -252,7 +253,7 @@ static stats1_t* make_acc(char* value_field_name, char* stats1_name) {
}
// ----------------------------------------------------------------
static lrec_t* mapper_stats1_ingest(lrec_t* pinrec, mapper_stats1_state_t* pstate) {
static void mapper_stats1_ingest(lrec_t* pinrec, mapper_stats1_state_t* pstate) {
// E.g. ["s", "t"]
// To do: make value_field_values into a hashmap. Then accept partial
// population on that, but retain full-population requirement on group-by.
@ -261,9 +262,9 @@ static lrec_t* mapper_stats1_ingest(lrec_t* pinrec, mapper_stats1_state_t* pstat
slls_t* pvalue_field_values = mlr_selected_values_from_record(pinrec, pstate->pvalue_field_names);
slls_t* pgroup_by_field_values = mlr_selected_values_from_record(pinrec, pstate->pgroup_by_field_names);
if (pvalue_field_values->length != pstate->pvalue_field_names->length)
return pstate->do_iterative_stats ? pinrec : NULL;
return;
if (pgroup_by_field_values->length != pstate->pgroup_by_field_names->length)
return pstate->do_iterative_stats ? pinrec : NULL;
return;
lhmsv_t* group_to_acc_field = lhmslv_get(pstate->groups, pgroup_by_field_values);
if (group_to_acc_field == NULL) {
@ -321,7 +322,6 @@ static lrec_t* mapper_stats1_ingest(lrec_t* pinrec, mapper_stats1_state_t* pstat
}
}
}
return pstate->do_iterative_stats ? pinrec : NULL;
}
// ----------------------------------------------------------------

28
c/mapping/mapper_stats2.c
View file

@ -50,7 +50,7 @@ static mapper_t* mapper_stats2_alloc(slls_t* paccumulator_names, slls_t* pvalue_
slls_t* pgroup_by_field_names, int do_verbose, int do_iterative_stats);
static void mapper_stats2_free(void* pvstate);
static sllv_t* mapper_stats2_process(lrec_t* pinrec, context_t* pctx, void* pvstate);
static lrec_t* mapper_stats2_ingest(lrec_t* pinrec, context_t* pctx, mapper_stats2_state_t* pstate);
static void mapper_stats2_ingest(lrec_t* pinrec, context_t* pctx, mapper_stats2_state_t* pstate);
static sllv_t* mapper_stats2_emit_all(mapper_stats2_state_t* pstate);
static void mapper_stats2_emit(mapper_stats2_state_t* pstate, lrec_t* pinrec,
char* value_field_name_1, char* value_field_name_2, lhmsv_t* acc_fields_to_acc_state);
@ -185,20 +185,20 @@ static void mapper_stats2_free(void* pvstate) {
// {
// ["s","t"] : { <--- group-by field names
// ["x","y"] : { <--- value field names
// "corr" : C stats2_corr_t object,
// "cov" : C stats2_cov_t object
// "corr" : stats2_corr_t object,
// "cov" : stats2_cov_t object
// }
// },
// ["u","v"] : {
// ["x","y"] : {
// "corr" : C stats2_corr_t object,
// "cov" : C stats2_cov_t object
// "corr" : stats2_corr_t object,
// "cov" : stats2_cov_t object
// }
// },
// ["u","w"] : {
// ["x","y"] : {
// "corr" : C stats2_corr_t object,
// "cov" : C stats2_cov_t object
// "corr" : stats2_corr_t object,
// "cov" : stats2_cov_t object
// }
// },
// }
@ -209,12 +209,13 @@ static void mapper_stats2_free(void* pvstate) {
static sllv_t* mapper_stats2_process(lrec_t* pinrec, context_t* pctx, void* pvstate) {
mapper_stats2_state_t* pstate = pvstate;
if (pinrec != NULL) {
lrec_t* poutrec = mapper_stats2_ingest(pinrec, pctx, pstate);
if (poutrec == NULL) {
mapper_stats2_ingest(pinrec, pctx, pstate);
if (pstate->do_iterative_stats) {
// The input record will be modified in this case, with new fields appended
return sllv_single(pinrec);
} else {
lrec_free(pinrec);
return NULL;
} else {
return sllv_single(poutrec);
}
} else if (!pstate->do_iterative_stats) {
return mapper_stats2_emit_all(pstate);
@ -224,12 +225,12 @@ static sllv_t* mapper_stats2_process(lrec_t* pinrec, context_t* pctx, void* pvst
}
// ----------------------------------------------------------------
static lrec_t* mapper_stats2_ingest(lrec_t* pinrec, context_t* pctx, mapper_stats2_state_t* pstate) {
static void mapper_stats2_ingest(lrec_t* pinrec, context_t* pctx, mapper_stats2_state_t* pstate) {
// ["s", "t"]
slls_t* pgroup_by_field_values = mlr_selected_values_from_record(pinrec, pstate->pgroup_by_field_names);
if (pgroup_by_field_values->length != pstate->pgroup_by_field_names->length) {
slls_free(pgroup_by_field_values);
return pstate->do_iterative_stats ? pinrec : NULL;
return;
}
lhms2v_t* group_to_acc_field = lhmslv_get(pstate->groups, pgroup_by_field_values);
@ -283,7 +284,6 @@ static lrec_t* mapper_stats2_ingest(lrec_t* pinrec, context_t* pctx, mapper_stat
}
slls_free(pgroup_by_field_values);
return pstate->do_iterative_stats ? pinrec : NULL;
}
// ----------------------------------------------------------------

1
c/todo.txt
View file

@ -23,6 +23,7 @@ MINOR: mld examples of rename (key-sed) & put/sub (value-sed) @ cover x 2
MAJOR: statsn covar, ols, logistic: port material from my stats_m/sackmat_m for much of that
MAJOR: uni/multivariate logistic for ternary & above
MINOR: RFC "there may be a header" -- ?!? use nidx-style integer-numbered columns?? --no-header?
MINOR: expand sort null-handling to include field not present in given record (sort to end)
MINOR: --mmap @ mlr -h
MINOR: ctype ff @ bld.out