projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8229318
)
Fix warnings
author
John Darrington
<john@darrington.wattle.id.au>
Tue, 23 Aug 2011 19:26:20 +0000
(21:26 +0200)
committer
John Darrington
<john@darrington.wattle.id.au>
Tue, 23 Aug 2011 19:26:20 +0000
(21:26 +0200)
src/language/stats/ks-one-sample.c
patch
|
blob
|
history
src/language/stats/ks-one-sample.h
patch
|
blob
|
history
src/language/stats/npar.c
patch
|
blob
|
history
src/language/stats/oneway.c
patch
|
blob
|
history
src/math/categoricals.c
patch
|
blob
|
history
src/ui/gui/runs-dialog.c
patch
|
blob
|
history
diff --git
a/src/language/stats/ks-one-sample.c
b/src/language/stats/ks-one-sample.c
index aba2cbdef4cb5d0db99ccdc1bf5516e76000c3a4..a4a2792f7eb0fd1b4ec2225de16bd76ac7b6aa5f 100644
(file)
--- a/
src/language/stats/ks-one-sample.c
+++ b/
src/language/stats/ks-one-sample.c
@@
-130,9
+130,10
@@
static void show_results (const struct ks *, const struct ks_one_sample_test *,
void
ks_one_sample_execute (const struct dataset *ds,
void
ks_one_sample_execute (const struct dataset *ds,
- struct casereader *input,
- enum mv_class exclude,
- const struct npar_test *test)
+ struct casereader *input,
+ enum mv_class exclude,
+ const struct npar_test *test,
+ bool x UNUSED, double y UNUSED)
{
const struct dictionary *dict = dataset_dict (ds);
const struct ks_one_sample_test *kst = UP_CAST (test, const struct ks_one_sample_test, parent.parent);
{
const struct dictionary *dict = dataset_dict (ds);
const struct ks_one_sample_test *kst = UP_CAST (test, const struct ks_one_sample_test, parent.parent);
@@
-142,6
+143,7
@@
ks_one_sample_execute (const struct dataset *ds,
const struct fmt_spec *wfmt = wvar ? var_get_print_format (wvar) : & F_8_0;
bool warn = true;
int v;
const struct fmt_spec *wfmt = wvar ? var_get_print_format (wvar) : & F_8_0;
bool warn = true;
int v;
+ struct casereader *r = casereader_clone (input);
struct ks *ks = xcalloc (sizeof *ks, ost->n_vars);
struct ks *ks = xcalloc (sizeof *ks, ost->n_vars);
@@
-156,8
+158,6
@@
ks_one_sample_execute (const struct dataset *ds,
ks[v].ssq = 0;
}
ks[v].ssq = 0;
}
- struct casereader *r = casereader_clone (input);
-
for (; (c = casereader_read (r)) != NULL; case_unref (c))
{
const double weight = dict_get_case_weight (dict, c, &warn);
for (; (c = casereader_read (r)) != NULL; case_unref (c))
{
const double weight = dict_get_case_weight (dict, c, &warn);
@@
-182,6
+182,10
@@
ks_one_sample_execute (const struct dataset *ds,
for (v = 0; v < ost->n_vars; ++v)
{
for (v = 0; v < ost->n_vars; ++v)
{
+ const struct variable *var = ost->vars[v];
+ double cc = 0;
+ double prev_empirical = 0;
+
switch (kst->dist)
{
case KS_UNIFORM:
switch (kst->dist)
{
case KS_UNIFORM:
@@
-218,9
+222,6
@@
ks_one_sample_execute (const struct dataset *ds,
NOT_REACHED ();
}
NOT_REACHED ();
}
- const struct variable *var = ost->vars[v];
- double cc = 0;
- double prev_empirical = 0;
r = sort_execute_1var (casereader_clone (input), var);
for (; (c = casereader_read (r)) != NULL; case_unref (c))
{
r = sort_execute_1var (casereader_clone (input), var);
for (; (c = casereader_read (r)) != NULL; case_unref (c))
{
diff --git
a/src/language/stats/ks-one-sample.h
b/src/language/stats/ks-one-sample.h
index 054cce41e37c47bbe765b5684b4a9fd7ccdbcc95..e1ab07a94ede3105d4d4fc3982ea2b05e318142b 100644
(file)
--- a/
src/language/stats/ks-one-sample.h
+++ b/
src/language/stats/ks-one-sample.h
@@
-44,6
+44,7
@@
struct dataset;
void ks_one_sample_execute (const struct dataset *ds,
struct casereader *input,
enum mv_class exclude,
void ks_one_sample_execute (const struct dataset *ds,
struct casereader *input,
enum mv_class exclude,
- const struct npar_test *test);
+ const struct npar_test *test,
+ bool, double);
#endif
#endif
diff --git
a/src/language/stats/npar.c
b/src/language/stats/npar.c
index bfeaf8f76fd67c90efb75390fca1bd9f1bb6311b..fda7b0c6b27c79453435e463abe72fda6efbc185 100644
(file)
--- a/
src/language/stats/npar.c
+++ b/
src/language/stats/npar.c
@@
-1007,7
+1007,7
@@
npar_ks_one_sample (struct lexer *lexer, struct dataset *ds, struct npar_specs *
specs->test,
sizeof (*specs->test) * specs->n_tests);
specs->test,
sizeof (*specs->test) * specs->n_tests);
- specs->test[specs->n_tests - 1] =
ks
t;
+ specs->test[specs->n_tests - 1] =
n
t;
return 1;
}
return 1;
}
diff --git
a/src/language/stats/oneway.c
b/src/language/stats/oneway.c
index 8182d51780abf1e501bbd6374ed3a9f52d5842da..1c80c2ba98e7f5f8aa41674e8601a4db2be35cdb 100644
(file)
--- a/
src/language/stats/oneway.c
+++ b/
src/language/stats/oneway.c
@@
-755,11
+755,12
@@
run_oneway (const struct oneway_spec *cmd,
for (v = 0; v < cmd->n_vars; ++v)
{
for (v = 0; v < cmd->n_vars; ++v)
{
+ gsl_matrix *cm;
struct per_var_ws *pvw = &ws.vws[v];
const struct categoricals *cats = covariance_get_categoricals (pvw->cov);
categoricals_done (cats);
struct per_var_ws *pvw = &ws.vws[v];
const struct categoricals *cats = covariance_get_categoricals (pvw->cov);
categoricals_done (cats);
-
gsl_matrix *
cm = covariance_calculate_unnormalized (pvw->cov);
+ cm = covariance_calculate_unnormalized (pvw->cov);
moments1_calculate (ws.dd_total[v]->mom, &pvw->n, NULL, NULL, NULL, NULL);
moments1_calculate (ws.dd_total[v]->mom, &pvw->n, NULL, NULL, NULL, NULL);
diff --git
a/src/math/categoricals.c
b/src/math/categoricals.c
index d3aa372867249807618885cf697d66984a8233fc..9f8215d30eeabd5196252db87605044525529467 100644
(file)
--- a/
src/math/categoricals.c
+++ b/
src/math/categoricals.c
@@
-73,6
+73,7
@@
struct variable_node
struct hmap valmap; /* A map of value nodes */
};
struct hmap valmap; /* A map of value nodes */
};
+#if 0
static void
dump_interaction (const struct interaction *iact)
{
static void
dump_interaction (const struct interaction *iact)
{
@@
-81,6
+82,7
@@
dump_interaction (const struct interaction *iact)
printf ("Interaction: %s\n", ds_cstr (&str));
ds_destroy (&str);
}
printf ("Interaction: %s\n", ds_cstr (&str));
ds_destroy (&str);
}
+#endif
static struct variable_node *
static struct variable_node *
@@
-180,7
+182,7
@@
struct categoricals
void *aux2;
};
void *aux2;
};
-
+#if 0
static void
categoricals_dump (const struct categoricals *cat)
{
static void
categoricals_dump (const struct categoricals *cat)
{
@@
-238,7
+240,7
@@
categoricals_dump (const struct categoricals *cat)
printf (")\n");
}
}
printf (")\n");
}
}
-
+#endif
void
categoricals_destroy (struct categoricals *cat)
void
categoricals_destroy (struct categoricals *cat)
diff --git
a/src/ui/gui/runs-dialog.c
b/src/ui/gui/runs-dialog.c
index 64f50ace64fea99df6ca34a7e8236ed3d9ec5f1a..2e2193730310a12a41dc64e39eb932ee90887584 100644
(file)
--- a/
src/ui/gui/runs-dialog.c
+++ b/
src/ui/gui/runs-dialog.c
@@
-209,7
+209,7
@@
generate_syntax (const struct runs *rd)
if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_CUSTOM])))
{
if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_CUSTOM])))
{
- char *text = gtk_entry_get_text (GTK_ENTRY (rd->entry));
+ c
onst c
har *text = gtk_entry_get_text (GTK_ENTRY (rd->entry));
append_fragment (string, text, PSPPIRE_VAR_VIEW (rd->variables));
}
append_fragment (string, text, PSPPIRE_VAR_VIEW (rd->variables));
}