X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Ftests%2Fmoments-test.c;h=65ce6f02384d56372d45fa4828b085e826851040;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=a89b50d1e9e7360e4ff8e20c0c1df5f7db92de9b;hpb=7eee0554f378481faf447e2d2e940f389d6b05ec;p=pspp-builds.git diff --git a/src/language/tests/moments-test.c b/src/language/tests/moments-test.c index a89b50d1..65ce6f02 100644 --- a/src/language/tests/moments-test.c +++ b/src/language/tests/moments-test.c @@ -30,7 +30,7 @@ #define _(msgid) gettext (msgid) static bool -read_values (struct lexer *lexer, double **values, double **weights, size_t *cnt) +read_values (struct lexer *lexer, double **values, double **weights, size_t *cnt) { size_t cap = 0; @@ -53,7 +53,7 @@ read_values (struct lexer *lexer, double **values, double **weights, size_t *cnt lex_get (lexer); } - if (*cnt >= cap) + if (*cnt >= cap) { cap = 2 * (cap + 8); *values = xnrealloc (*values, cap, sizeof **values); @@ -69,7 +69,7 @@ read_values (struct lexer *lexer, double **values, double **weights, size_t *cnt } int -cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED) +cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED) { int retval = CMD_FAILURE; double *values = NULL; @@ -81,7 +81,7 @@ cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED) if (lex_match_id (lexer, "ONEPASS")) two_pass = 0; - if (lex_token (lexer) != '/') + if (lex_token (lexer) != '/') { lex_force_match (lexer, '/'); goto done; @@ -89,41 +89,41 @@ cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED) fprintf (stderr, "%s => ", lex_rest_of_line (lexer)); lex_get (lexer); - if (two_pass) + if (two_pass) { struct moments *m = NULL; - + m = moments_create (MOMENT_KURTOSIS); - if (!read_values (lexer, &values, &weights, &cnt)) + if (!read_values (lexer, &values, &weights, &cnt)) { moments_destroy (m); - goto done; + goto done; } for (i = 0; i < cnt; i++) - moments_pass_one (m, values[i], weights[i]); + moments_pass_one (m, values[i], weights[i]); for (i = 0; i < cnt; i++) moments_pass_two (m, values[i], weights[i]); moments_calculate (m, &weight, &M[0], &M[1], &M[2], &M[3]); moments_destroy (m); } - else + else { struct moments1 *m = NULL; - + m = moments1_create (MOMENT_KURTOSIS); - if (!read_values (lexer, &values, &weights, &cnt)) + if (!read_values (lexer, &values, &weights, &cnt)) { moments1_destroy (m); - goto done; + goto done; } for (i = 0; i < cnt; i++) moments1_add (m, values[i], weights[i]); moments1_calculate (m, &weight, &M[0], &M[1], &M[2], &M[3]); moments1_destroy (m); } - + fprintf (stderr, "W=%.3f", weight); - for (i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { fprintf (stderr, " M%d=", (int) i + 1); if (M[i] == SYSMIS) @@ -136,7 +136,7 @@ cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED) fprintf (stderr, "\n"); retval = lex_end_of_command (lexer); - + done: free (values); free (weights);