Commit 9ac2c216 authored by Andreas J. Guelzow 's avatar Andreas J. Guelzow

Provide progress feedback when generating random numbers.

2011-08-18 Andreas J. Guelzow <aguelzow@pyrshep.ca>

	* src/consolidate.c: add argument to tools engine
	* src/consolidate.h: add argument to tools engine
	* src/commands.c (cmd_analysis_tool_*): adjust calls to tools engine

2011-08-18 Andreas J. Guelzow <aguelzow@pyrshep.ca>

	* src/tools/*.c: add argument to tools engine
	* src/tools/*.h: add argument to tools engine
	* src/tools/random-generator.c: provide progress reporting when
	calculating random numbers
parent a4fed108
2011-08-18 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/consolidate.c: add argument to tools engine
* src/consolidate.h: add argument to tools engine
* src/commands.c (cmd_analysis_tool_*): adjust calls to tools engine
2011-08-17 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/rendered-value.h (_GnmRenderedValue): re-add color field
......
......@@ -9,6 +9,7 @@ Andreas:
* Provide xls file opener permitting encoding specification. [#535473]
* Fix writing of scatter style in xlsx export. [#656799]
* Provide progress feedback for xlsx import. [#634803]
* Provide progress feedback when generating random numbers.
Jean:
* Make things build against gtk+-3.0.
......
......@@ -5264,6 +5264,7 @@ cmd_analysis_tool_redo (GnmCommand *cmd, WorkbookControl *wbc)
{
gpointer continuity = NULL;
CmdAnalysis_Tool *me = CMD_ANALYSIS_TOOL (cmd);
GOCmdContext *cc = GO_CMD_CONTEXT (wbc);
g_return_val_if_fail (me != NULL, TRUE);
......@@ -5274,11 +5275,11 @@ cmd_analysis_tool_redo (GnmCommand *cmd, WorkbookControl *wbc)
me->row_info = colrow_state_list_destroy (me->row_info);
me->row_info = dao_get_colrow_state_list (me->dao, FALSE);
if (me->engine (me->dao, me->specs, TOOL_ENGINE_PREPARE_OUTPUT_RANGE, NULL)
|| me->engine (me->dao, me->specs, TOOL_ENGINE_UPDATE_DESCRIPTOR,
if (me->engine (cc, me->dao, me->specs, TOOL_ENGINE_PREPARE_OUTPUT_RANGE, NULL)
|| me->engine (cc, me->dao, me->specs, TOOL_ENGINE_UPDATE_DESCRIPTOR,
&me->cmd.cmd_descriptor)
|| cmd_dao_is_locked_effective (me->dao, wbc, me->cmd.cmd_descriptor)
|| me->engine (me->dao, me->specs, TOOL_ENGINE_LAST_VALIDITY_CHECK, &continuity))
|| me->engine (cc, me->dao, me->specs, TOOL_ENGINE_LAST_VALIDITY_CHECK, &continuity))
return TRUE;
switch (me->type) {
......@@ -5301,10 +5302,10 @@ cmd_analysis_tool_redo (GnmCommand *cmd, WorkbookControl *wbc)
if (me->newSheetObjects != NULL)
dao_set_omit_so (me->dao, TRUE);
if (me->engine (me->dao, me->specs, TOOL_ENGINE_FORMAT_OUTPUT_RANGE, NULL))
if (me->engine (cc, me->dao, me->specs, TOOL_ENGINE_FORMAT_OUTPUT_RANGE, NULL))
return TRUE;
if (me->engine (me->dao, me->specs, TOOL_ENGINE_PERFORM_CALC, &continuity)) {
if (me->engine (cc, me->dao, me->specs, TOOL_ENGINE_PERFORM_CALC, &continuity)) {
if (me->type == RangeOutput) {
g_warning ("This is too late for failure! The target region has "
"already been formatted!");
......@@ -5344,13 +5345,14 @@ static void
cmd_analysis_tool_finalize (GObject *cmd)
{
CmdAnalysis_Tool *me = CMD_ANALYSIS_TOOL (cmd);
GOCmdContext *cc = GO_CMD_CONTEXT (me->dao->wbc);
if (me->col_info)
me->col_info = colrow_state_list_destroy (me->col_info);
if (me->row_info)
me->row_info = colrow_state_list_destroy (me->row_info);
me->engine (me->dao, me->specs, TOOL_ENGINE_CLEAN_UP, NULL);
me->engine (cc, me->dao, me->specs, TOOL_ENGINE_CLEAN_UP, NULL);
if (me->specs_owned) {
g_free (me->specs);
......@@ -5375,6 +5377,7 @@ cmd_analysis_tool (WorkbookControl *wbc, G_GNUC_UNUSED Sheet *sheet,
{
CmdAnalysis_Tool *me;
gboolean trouble;
GOCmdContext *cc = GO_CMD_CONTEXT (wbc);
g_return_val_if_fail (dao != NULL, TRUE);
g_return_val_if_fail (specs != NULL, TRUE);
......@@ -5390,11 +5393,12 @@ cmd_analysis_tool (WorkbookControl *wbc, G_GNUC_UNUSED Sheet *sheet,
me->dao = dao;
me->engine = engine;
me->cmd.cmd_descriptor = NULL;
if (me->engine (me->dao, me->specs, TOOL_ENGINE_UPDATE_DAO, NULL)) {
if (me->engine (cc, me->dao, me->specs, TOOL_ENGINE_UPDATE_DAO, NULL)) {
g_object_unref (me);
return TRUE;
}
me->engine (me->dao, me->specs, TOOL_ENGINE_UPDATE_DESCRIPTOR, &me->cmd.cmd_descriptor);
me->engine (cc, me->dao, me->specs, TOOL_ENGINE_UPDATE_DESCRIPTOR,
&me->cmd.cmd_descriptor);
me->cmd.sheet = NULL;
me->type = dao->type;
me->row_info = NULL;
......
......@@ -741,7 +741,7 @@ consolidate_apply (GnmConsolidate *cs,
gboolean
tool_consolidate_engine (data_analysis_output_t *dao, gpointer specs,
tool_consolidate_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
GnmConsolidate *cs = specs;
......
......@@ -50,7 +50,7 @@ gboolean consolidate_add_source (GnmConsolidate *cs, GnmValue *range);
gboolean consolidate_check_destination (GnmConsolidate *cs,
data_analysis_output_t *dao);
gboolean tool_consolidate_engine (data_analysis_output_t *dao, gpointer specs,
gboolean tool_consolidate_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
G_END_DECLS
......
2011-08-18 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/tools/*.c: add argument to tools engine
* src/tools/*.h: add argument to tools engine
* src/tools/random-generator.c: provide progress reporting when
calculating random numbers
2011-07-31 Morten Welinder <terra@gnome.org>
* Release 1.10.17
......@@ -17,7 +24,7 @@
2011-05-2 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* analysis-chi-squared.c (analysis_tool_chi_squared_engine_run):
* analysis-chi-squared.c (analysis_tool_chi_squared_engine_run):
no colons in field labels
* analysis-kaplan-meier.c (analysis_tool_kaplan_meier_engine_run): ditto
* analysis-principal-components.c
......
......@@ -824,7 +824,7 @@ analysis_tool_anova_two_factor_engine_clean (G_GNUC_UNUSED data_analysis_output_
}
gboolean
analysis_tool_anova_two_factor_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_anova_two_factor_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_anova_two_factor_t *info = specs;
......
......@@ -49,8 +49,11 @@ typedef struct {
gint n_r;
} analysis_tools_data_anova_two_factor_t;
gboolean analysis_tool_anova_two_factor_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
gboolean analysis_tool_anova_two_factor_engine (GOCmdContext *gcc,
data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
#endif
......@@ -87,7 +87,7 @@ analysis_tool_auto_expression_engine_clean (gpointer specs)
}
gboolean
analysis_tool_auto_expression_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_auto_expression_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_auto_expression_t *info = specs;
......
......@@ -41,7 +41,10 @@ typedef struct {
GnmFunc *func;
} analysis_tools_data_auto_expression_t;
gboolean analysis_tool_auto_expression_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
gboolean analysis_tool_auto_expression_engine (GOCmdContext *gcc,
data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
#endif
......@@ -165,7 +165,7 @@ analysis_tool_chi_squared_clean (gpointer specs)
gboolean
analysis_tool_chi_squared_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_chi_squared_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_chi_squared_t *info = specs;
......
......@@ -44,8 +44,11 @@ typedef struct {
gint n_r;
} analysis_tools_data_chi_squared_t;
gboolean analysis_tool_chi_squared_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
gboolean analysis_tool_chi_squared_engine (GOCmdContext *gcc,
data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
#endif
......@@ -1356,7 +1356,7 @@ analysis_tool_exponential_smoothing_engine_mtes_run (data_analysis_output_t *dao
}
gboolean
analysis_tool_exponential_smoothing_engine (data_analysis_output_t *dao,
analysis_tool_exponential_smoothing_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result)
......
......@@ -55,7 +55,7 @@ typedef struct {
exponential_smoothing_type_t es_type;
} analysis_tools_data_exponential_smoothing_t;
gboolean analysis_tool_exponential_smoothing_engine (data_analysis_output_t *dao,
gboolean analysis_tool_exponential_smoothing_engine (GOCmdContext *gcc, data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
......
......@@ -260,7 +260,7 @@ calc_length (GnmValue *bin)
gboolean
analysis_tool_frequency_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_frequency_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_frequency_t *info = specs;
......
......@@ -52,7 +52,7 @@ typedef struct {
chart_freq_t chart;
} analysis_tools_data_frequency_t;
gboolean analysis_tool_frequency_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_frequency_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
#endif
......@@ -436,7 +436,7 @@ calc_length (GnmValue *bin)
}
gboolean
analysis_tool_histogram_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_histogram_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_histogram_t *info = specs;
......
......@@ -70,7 +70,7 @@ typedef struct {
chart_t chart;
} analysis_tools_data_histogram_t;
gboolean analysis_tool_histogram_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_histogram_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
#endif
......@@ -644,7 +644,7 @@ analysis_tool_kaplan_meier_clear_gl_cb (gpointer data, G_GNUC_UNUSED gpointer us
}
gboolean
analysis_tool_kaplan_meier_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_kaplan_meier_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_kaplan_meier_t *info = specs;
......
......@@ -63,7 +63,7 @@ typedef struct {
} analysis_tools_kaplan_meier_group_t;
gboolean analysis_tool_kaplan_meier_engine (data_analysis_output_t *dao,
gboolean analysis_tool_kaplan_meier_engine (GOCmdContext *gcc, data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
......
......@@ -184,7 +184,7 @@ analysis_tool_normality_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_normality_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_normality_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_normality_t *info = specs;
......
......@@ -49,7 +49,7 @@ typedef struct {
gboolean graph;
} analysis_tools_data_normality_t;
gboolean analysis_tool_normality_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_normality_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
......
......@@ -210,7 +210,7 @@ analysis_tool_principal_components_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_principal_components_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_principal_components_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_generic_t *info = specs;
......
......@@ -34,7 +34,7 @@
#include "analysis-tools.h"
#include "sheet.h"
gboolean analysis_tool_principal_components_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_principal_components_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
......
......@@ -342,7 +342,7 @@ analysis_tool_sign_test_two_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_sign_test_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_sign_test_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_sign_test_t *info = specs;
......@@ -373,7 +373,7 @@ analysis_tool_sign_test_engine (data_analysis_output_t *dao, gpointer specs,
}
gboolean
analysis_tool_sign_test_two_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_sign_test_two_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
switch (selector) {
......
......@@ -45,10 +45,10 @@ typedef struct {
gnm_float median;
} analysis_tools_data_sign_test_two_t;
gboolean analysis_tool_sign_test_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_sign_test_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
gboolean analysis_tool_sign_test_two_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_sign_test_two_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
#endif
......@@ -528,7 +528,7 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_signed_rank_test_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_signed_rank_test_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_sign_test_t *info = specs;
......@@ -559,7 +559,7 @@ analysis_tool_signed_rank_test_engine (data_analysis_output_t *dao, gpointer spe
}
gboolean
analysis_tool_signed_rank_test_two_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_signed_rank_test_two_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
switch (selector) {
......
......@@ -37,14 +37,14 @@
/* note: specs is a pointer to a analysis_tools_data_sign_test_t */
gboolean analysis_tool_signed_rank_test_engine (data_analysis_output_t *dao,
gboolean analysis_tool_signed_rank_test_engine (GOCmdContext *gcc, data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
/* note: specs is a pointer to a analysis_tools_data_sign_test_two_t */
gboolean analysis_tool_signed_rank_test_two_engine (data_analysis_output_t *dao,
gboolean analysis_tool_signed_rank_test_two_engine (GOCmdContext *gcc, data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
......
......@@ -671,7 +671,7 @@ analysis_tool_correlation_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_correlation_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_correlation_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_generic_t *info = specs;
......@@ -726,7 +726,7 @@ analysis_tool_covariance_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_covariance_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_covariance_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_generic_t *info = specs;
......@@ -1117,7 +1117,7 @@ analysis_tool_descriptive_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_descriptive_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_descriptive_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_descriptive_t *info = specs;
......@@ -1312,7 +1312,7 @@ analysis_tool_sampling_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_sampling_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_sampling_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_sampling_t *info = specs;
......@@ -1579,7 +1579,7 @@ analysis_tool_ztest_engine_run (data_analysis_output_t *dao,
gboolean
analysis_tool_ztest_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_ztest_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
switch (selector) {
......@@ -1870,7 +1870,7 @@ analysis_tool_ttest_paired_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_ttest_paired_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_ttest_paired_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector,
gpointer result)
{
......@@ -2171,7 +2171,7 @@ analysis_tool_ttest_eqvar_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_ttest_eqvar_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_ttest_eqvar_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
switch (selector) {
......@@ -2464,7 +2464,7 @@ analysis_tool_ttest_neqvar_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_ttest_neqvar_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_ttest_neqvar_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
switch (selector) {
......@@ -2752,7 +2752,7 @@ analysis_tool_ftest_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_ftest_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_ftest_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
switch (selector) {
......@@ -3589,7 +3589,7 @@ analysis_tool_regression_simple_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_regression_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_regression_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_regression_t *info = specs;
......@@ -4004,7 +4004,7 @@ analysis_tool_moving_average_engine_run (data_analysis_output_t *dao,
gboolean
analysis_tool_moving_average_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_moving_average_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_moving_average_t *info = specs;
......@@ -4167,7 +4167,7 @@ analysis_tool_ranking_engine_run (data_analysis_output_t *dao,
}
gboolean
analysis_tool_ranking_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_ranking_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_ranking_t *info = specs;
......@@ -4504,7 +4504,7 @@ finish_anova_single_factor_tool:
gboolean
analysis_tool_anova_single_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_anova_single_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_anova_single_t *info = specs;
......@@ -4607,7 +4607,7 @@ analysis_tool_fourier_calc_length (analysis_tools_data_fourier_t *info)
gboolean
analysis_tool_fourier_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_fourier_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_fourier_t *info = specs;
......
......@@ -39,14 +39,20 @@ typedef struct {
/**************** Correlation Tool ***************/
gboolean analysis_tool_correlation_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
gboolean analysis_tool_correlation_engine (GOCmdContext *gcc,
data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
/**************** Covariance Tool ***************/
gboolean analysis_tool_covariance_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
gboolean analysis_tool_covariance_engine (GOCmdContext *gcc,
data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
/********************************************************************/
......@@ -60,7 +66,7 @@ typedef struct {
gnm_float alpha;
} analysis_tools_data_anova_single_t;
gboolean analysis_tool_anova_single_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_anova_single_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
/********** Descriptive Statistics Tool **********/
......@@ -77,7 +83,7 @@ typedef struct {
gnm_float c_level;
} analysis_tools_data_descriptive_t;
gboolean analysis_tool_descriptive_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_descriptive_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
......@@ -101,7 +107,7 @@ typedef struct {
moving_average_type_t ma_type;
} analysis_tools_data_moving_average_t;
gboolean analysis_tool_moving_average_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_moving_average_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
......@@ -112,7 +118,7 @@ typedef struct {
gboolean inverse;
} analysis_tools_data_fourier_t;
gboolean analysis_tool_fourier_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_fourier_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
......@@ -128,7 +134,7 @@ typedef struct {
guint number;
} analysis_tools_data_sampling_t;
gboolean analysis_tool_sampling_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_sampling_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
......@@ -139,7 +145,7 @@ typedef struct {
gboolean av_ties;
} analysis_tools_data_ranking_t;
gboolean analysis_tool_ranking_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_ranking_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
......@@ -160,7 +166,7 @@ typedef struct {
gnm_float alpha;
} analysis_tools_data_generic_b_t;
gboolean analysis_tool_ftest_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_ftest_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
/**************** Regression ********************/
......@@ -175,7 +181,7 @@ typedef struct {
GSList *indep_vars;
} analysis_tools_data_regression_t;
gboolean analysis_tool_regression_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_regression_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
/*********************** TTest paired *****************/
......@@ -186,25 +192,25 @@ typedef struct {
gnm_float var2;
} analysis_tools_data_ttests_t;
gboolean analysis_tool_ttest_paired_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_ttest_paired_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
/*********************** TTest equal variances *********/
gboolean analysis_tool_ttest_eqvar_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_ttest_eqvar_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
/*********************** TTest unequal variances *******/
gboolean analysis_tool_ttest_neqvar_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_ttest_neqvar_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
/*********************** ZTest ************************/
gboolean analysis_tool_ztest_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_ztest_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
/**************** Advanced Filter ********************/
......@@ -214,7 +220,7 @@ typedef struct {
gboolean unique_only_flag;
} analysis_tools_data_advanced_filter_t;
gboolean analysis_tool_advanced_filter_engine (data_analysis_output_t *dao, gpointer specs,
gboolean analysis_tool_advanced_filter_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
......
......@@ -368,7 +368,7 @@ fill_series_adjust_variables (data_analysis_output_t *dao, fill_series_t *info)
info->n = length_of_series;
}
gboolean fill_series_engine (data_analysis_output_t *dao, gpointer specs,
gboolean fill_series_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
fill_series_t *info = specs;
......
......@@ -27,7 +27,7 @@ typedef struct {
gint n;
} fill_series_t;
gboolean fill_series_engine (data_analysis_output_t *dao, gpointer specs,
gboolean fill_series_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
#endif
......@@ -260,7 +260,7 @@ finish:
gboolean
analysis_tool_advanced_filter_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_advanced_filter_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
analysis_tools_data_advanced_filter_t *info = specs;
......
......@@ -132,7 +132,7 @@ tool_random_cor_clean (gpointer specs)
gboolean
tool_random_cor_engine (data_analysis_output_t *dao, gpointer specs,
tool_random_cor_engine (G_GNUC_UNUSED GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
tools_data_random_cor_t *data = specs;
......
......@@ -19,7 +19,7 @@ typedef struct {
gint variables;
} tools_data_random_cor_t;
gboolean tool_random_cor_engine (data_analysis_output_t *dao,
gboolean tool_random_cor_engine (GOCmdContext *gcc, data_analysis_output_t *dao,
gpointer specs,
analysis_tool_engine_t selector,
gpointer result);
......
This diff is collapsed.
......@@ -189,7 +189,7 @@ typedef struct {
random_distribution_t distribution;
} tools_data_random_t;
gboolean tool_random_engine (data_analysis_output_t *dao, gpointer specs,
gboolean tool_random_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
#endif
......@@ -30,7 +30,8 @@ typedef enum {
TOOL_ENGINE_CLEAN_UP
} analysis_tool_engine_t;
typedef gboolean (* analysis_tool_engine) (data_analysis_output_t *dao, gpointer specs,
typedef gboolean (* analysis_tool_engine) (GOCmdContext *gcc,
data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!