mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

t-test & F-test Statistics dialog: rename VAR -> VARIABLE

Browse Source 
Change-Id: I51fb7cb025f4dc2bb7f3bf0ba5c9b8ee90298cd8
This commit is contained in:
Tomaž Vajngerl
2014-11-15 18:15:35 +01:00
parent 475c2a0839
commit 84a32aae9f
2 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
sc/source/ui/StatisticsDialogs/FTestDialog.cxx
View File

@@ -28,9 +28,6 @@
#include "FTestDialog.hxx" #include "FTestDialog.hxx"
static const char strWildcardVariable1Range[] = "%VAR1_RANGE%";
static const char strWildcardVariable2Range[] = "%VAR2_RANGE%";
ScFTestDialog::ScFTestDialog( ScFTestDialog::ScFTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
vcl::Window* pParent, ScViewData* pViewData ) : vcl::Window* pParent, ScViewData* pViewData ) :
@@ -72,8 +69,8 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
else else
pVariable2Iterator.reset(new DataRangeByRowIterator(mVariable2Range)); pVariable2Iterator.reset(new DataRangeByRowIterator(mVariable2Range));
aTemplate.autoReplaceRange(strWildcardVariable1Range, pVariable1Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange(strWildcardVariable2Range, pVariable2Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_UNDO_NAME)); aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_UNDO_NAME));
aOutput.newLine(); aOutput.newLine();
@@ -93,63 +90,63 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_MEAN)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_MEAN));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VAR1_RANGE%)"); aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VAR2_RANGE%)"); aTemplate.setTemplate("=AVERAGE(%VARIABLE2_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_VARIANCE)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_VARIANCE));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=VAR(%VAR1_RANGE%)"); aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%VAR1_VARIANCE%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIABLE1_VARIANCE%", aOutput.current());
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=VAR(%VAR2_RANGE%)"); aTemplate.setTemplate("=VAR(%VARIABLE2_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%VAR2_VARIANCE%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIABLE2_VARIANCE%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVATIONS_LABEL)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVATIONS_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VAR1_RANGE%)"); aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%VAR1_OBSERVATIONS%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIABLE1_OBSERVATIONS%", aOutput.current());
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VAR2_RANGE%)"); aTemplate.setTemplate("=COUNT(%VARIABLE2_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%VAR2_OBSERVATIONS%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIABLE2_OBSERVATIONS%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_DF)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_DF));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=%VAR1_OBSERVATIONS% - 1"); aTemplate.setTemplate("=%VARIABLE1_OBSERVATIONS% - 1");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%VAR1_DEGREE_OF_FREEDOM%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIABLE1_DEGREE_OF_FREEDOM%", aOutput.current());
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=%VAR2_OBSERVATIONS% - 1"); aTemplate.setTemplate("=%VARIABLE2_OBSERVATIONS% - 1");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%VAR2_DEGREE_OF_FREEDOM%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIABLE2_DEGREE_OF_FREEDOM%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_F)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_F));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=%VAR1_VARIANCE% / %VAR2_VARIANCE%"); aTemplate.setTemplate("=%VARIABLE1_VARIANCE% / %VARIABLE2_VARIANCE%");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%F_VALUE%", aOutput.current()); aTemplate.autoReplaceAddress("%F_VALUE%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_P_RIGHT_TAIL)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_P_RIGHT_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=FDIST(%F_VALUE%; %VAR1_DEGREE_OF_FREEDOM%; %VAR2_DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=FDIST(%F_VALUE%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%P_RIGHT_TAIL_VALUE%", aOutput.current()); aTemplate.autoReplaceAddress("%P_RIGHT_TAIL_VALUE%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_F_CRITICAL_RIGHT_TAIL)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_F_CRITICAL_RIGHT_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=FINV(%ALPHA%; %VAR1_DEGREE_OF_FREEDOM%; %VAR2_DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=FINV(%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
@@ -162,7 +159,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_F_CRITICAL_LEFT_TAIL)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_F_CRITICAL_LEFT_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=FINV(1-%ALPHA%; %VAR1_DEGREE_OF_FREEDOM%; %VAR2_DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=FINV(1-%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
@@ -174,10 +171,10 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_F_CRITICAL_TWO_TAIL)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_F_CRITICAL_TWO_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=FINV(1-(%ALPHA%/2); %VAR1_DEGREE_OF_FREEDOM%; %VAR2_DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=FINV(1-(%ALPHA%/2); %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=FINV(%ALPHA%/2; %VAR1_DEGREE_OF_FREEDOM%; %VAR2_DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=FINV(%ALPHA%/2; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
return ScRange(aOutput.mMinimumAddress, aOutput.mMaximumAddress); return ScRange(aOutput.mMinimumAddress, aOutput.mMaximumAddress);

29
sc/source/ui/StatisticsDialogs/TTestDialog.cxx
View File

@@ -28,9 +28,6 @@
#include "TTestDialog.hxx" #include "TTestDialog.hxx"
static const char strWildcardVariable1Range[] = "%VAR1_RANGE%";
static const char strWildcardVariable2Range[] = "%VAR2_RANGE%";
ScTTestDialog::ScTTestDialog( ScTTestDialog::ScTTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
vcl::Window* pParent, ScViewData* pViewData ) : vcl::Window* pParent, ScViewData* pViewData ) :
@@ -72,8 +69,8 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
else else
pVariable2Iterator.reset(new DataRangeByRowIterator(mVariable2Range)); pVariable2Iterator.reset(new DataRangeByRowIterator(mVariable2Range));
aTemplate.autoReplaceRange(strWildcardVariable1Range, pVariable1Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange(strWildcardVariable2Range, pVariable2Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_UNDO_NAME)); aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_UNDO_NAME));
aOutput.newLine(); aOutput.newLine();
@@ -100,43 +97,43 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_MEAN)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_MEAN));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VAR1_RANGE%)"); aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VAR2_RANGE%)"); aTemplate.setTemplate("=AVERAGE(%VARIABLE2_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_VARIANCE)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_VARIANCE));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=VAR(%VAR1_RANGE%)"); aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=VAR(%VAR2_RANGE%)"); aTemplate.setTemplate("=VAR(%VARIABLE2_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// Observations // Observations
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVATIONS_LABEL)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVATIONS_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VAR1_RANGE%)"); aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VAR2_RANGE%)"); aTemplate.setTemplate("=COUNT(%VARIABLE2_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// Pearson Correlation // Pearson Correlation
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_PEARSON_CORRELATION)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_PEARSON_CORRELATION));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=CORREL(%VAR1_RANGE%;%VAR2_RANGE%)"); aTemplate.setTemplate("=CORREL(%VARIABLE1_RANGE%;%VARIABLE2_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// Observed mean difference // Observed mean difference
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_OBSERVED_MEAN_DIFFERENCE)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(IF(ISODD(IF(ISNUMBER(%VAR1_RANGE%); 1; 0) * IF(ISNUMBER(%VAR2_RANGE%); 1; 0)); %VAR1_RANGE% - %VAR2_RANGE%; \"NA\"))"); aTemplate.setTemplate("=AVERAGE(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))");
aOutput.writeMatrixFormula(aTemplate.getTemplate()); aOutput.writeMatrixFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%OBSERVED_MEAN_DIFFERENCE%", aOutput.current()); aTemplate.autoReplaceAddress("%OBSERVED_MEAN_DIFFERENCE%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
@@ -144,7 +141,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
// Variance of the Differences // Variance of the Differences
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_VARIANCE_OF_THE_DIFFERENCES)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_VARIANCE_OF_THE_DIFFERENCES));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=VAR(IF(ISODD(IF(ISNUMBER(%VAR1_RANGE%); 1; 0) * IF(ISNUMBER(%VAR2_RANGE%); 1; 0)); %VAR1_RANGE% - %VAR2_RANGE%; \"NA\"))"); aTemplate.setTemplate("=VAR(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))");
aOutput.writeMatrixFormula(aTemplate.getTemplate()); aOutput.writeMatrixFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%VARIANCE_OF_DIFFERENCES%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIANCE_OF_DIFFERENCES%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
@@ -152,7 +149,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
// df // df
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_DF)); aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_DF));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=SUM(IF(ISNUMBER(%VAR1_RANGE%); 1; 0) * IF(ISNUMBER(%VAR2_RANGE%); 1; 0)) - 1"); aTemplate.setTemplate("=SUM(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)) - 1");
aOutput.writeMatrixFormula(aTemplate.getTemplate()); aOutput.writeMatrixFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%DEGREE_OF_FREEDOM%", aOutput.current()); aTemplate.autoReplaceAddress("%DEGREE_OF_FREEDOM%", aOutput.current());
aOutput.newLine(); aOutput.newLine();