diff --git a/applications/lazstats/source/LazStats.lpi b/applications/lazstats/source/LazStats.lpi
index 484a66c44..e8a531be6 100644
--- a/applications/lazstats/source/LazStats.lpi
+++ b/applications/lazstats/source/LazStats.lpi
@@ -49,7 +49,7 @@
-
+
@@ -744,690 +744,683 @@
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
diff --git a/applications/lazstats/source/LazStats.lpr b/applications/lazstats/source/LazStats.lpr
index 28053d22e..f5503f6f3 100644
--- a/applications/lazstats/source/LazStats.lpr
+++ b/applications/lazstats/source/LazStats.lpr
@@ -8,8 +8,7 @@ uses
{$ENDIF}{$ENDIF}
Interfaces, // this includes the LCL widgetset
Forms, tachartlazaruspkg, tachartprint, lhelpcontrolpkg,
- Globals, LicenseUnit, OptionsUnit, DictionaryUnit, MainDM, MainUnit,
-cumsumunit;
+ Globals, LicenseUnit, OptionsUnit, MainDM, MainUnit;
{$R LazStats.res}
@@ -29,7 +28,6 @@ begin
end;
Application.CreateForm(TMainDataModule, MainDataModule);
Application.CreateForm(TOS3MainFrm, OS3MainFrm);
- Application.CreateForm(TCUSUMChartForm, CUSUMChartForm);
Application.Run;
end.
diff --git a/applications/lazstats/source/forms/analysis/statistical_process_control/cumsumunit.lfm b/applications/lazstats/source/forms/analysis/statistical_process_control/cusumunit.lfm
similarity index 100%
rename from applications/lazstats/source/forms/analysis/statistical_process_control/cumsumunit.lfm
rename to applications/lazstats/source/forms/analysis/statistical_process_control/cusumunit.lfm
diff --git a/applications/lazstats/source/forms/analysis/statistical_process_control/cumsumunit.pas b/applications/lazstats/source/forms/analysis/statistical_process_control/cusumunit.pas
similarity index 95%
rename from applications/lazstats/source/forms/analysis/statistical_process_control/cumsumunit.pas
rename to applications/lazstats/source/forms/analysis/statistical_process_control/cusumunit.pas
index 5ffabf094..95a6468b8 100644
--- a/applications/lazstats/source/forms/analysis/statistical_process_control/cumsumunit.pas
+++ b/applications/lazstats/source/forms/analysis/statistical_process_control/cusumunit.pas
@@ -1,4 +1,4 @@
-unit CUMSUMUnit;
+unit CUSUMUnit;
{$mode objfpc}{$H+}
@@ -58,7 +58,7 @@ var
groups: StrDyneVec = nil;
means: DblDyneVec = nil;
stdDev: DblDyneVec = nil;
- cumSums: DblDyneVec = nil;
+ cuSums: DblDyneVec = nil;
count: IntDyneVec = nil;
ColNoSelected: IntDyneVec = nil;
lReport: TStrings;
@@ -76,7 +76,7 @@ begin
SetLength(means, numGrps);
SetLength(count, numGrps);
SetLength(stdDev, numGrps);
- SetLength(cumSums, numGrps);
+ SetLength(cuSums, numGrps);
SEMean := 0.0;
grandMean := 0.0;
grandSum := 0.0;
@@ -136,11 +136,11 @@ begin
target := StrToFloat(TargetEdit.Text)
else
target := means[numGrps-1];
- cumsums[0] := means[0] - target;
+ cusums[0] := means[0] - target;
grandSum := grandSum + (means[0] - target);
for j := 1 to numGrps-1 do
begin
- cumsums[j] := cumsums[j-1] + (means[j] - target);
+ cusums[j] := cusums[j-1] + (means[j] - target);
grandSum := grandSum + (means[j] - target);
end;
@@ -158,13 +158,13 @@ begin
lReport := TStringList.Create;
try
lReport.Clear;
- lReport.Add('CUMSUM Chart Results');
+ lReport.Add('CUSUM Chart Results');
lReport.Add('');
lReport.Add(' Group Size Mean Std.Dev. Cum.Dev. of' );
lReport.Add(' Mean from Target');
lReport.Add('------- ---- -------- -------- ----------------');
for i := 0 to numGrps - 1 do
- lReport.Add('%7d %4d %8.2f %8.2f %16.2f', [i+1, count[i], means[i], stddev[i], cumsums[i]]);
+ lReport.Add('%7d %4d %8.2f %8.2f %10.2f', [i+1, count[i], means[i], stddev[i], cusums[i]]);
lReport.Add('');
lReport.Add('Mean of group deviations: %8.3f', [grandSum]);
lReport.Add('Mean of all observations: %8.3f', [grandMean]);
@@ -183,10 +183,10 @@ begin
PlotMeans(
Format('Cumulative Sum Chart for "%s"', [GetFileName]), // chart title
GroupEdit.Text, // x title
- 'CUSUM of ' + MeasEdit.Text, // y title
+ 'CUSUM of ' + MeasEdit.Text + ' differences', // y title
'Data', // series title
- 'Mean deviation', // mean label at right
- groups, cumSums,
+ 'Mean', // mean label at right
+ groups, cuSums,
NaN, NaN, grandSum,
NaN, NaN, NaN
);
diff --git a/applications/lazstats/source/forms/mainunit.lfm b/applications/lazstats/source/forms/mainunit.lfm
index 9373fc82e..92be494a6 100644
--- a/applications/lazstats/source/forms/mainunit.lfm
+++ b/applications/lazstats/source/forms/mainunit.lfm
@@ -875,9 +875,9 @@ object OS3MainFrm: TOS3MainFrm
Caption = 'S Control Chart'
OnClick = mnuAnalysisSPC_SChartClick
end
- object mnuAnalysisSPC_CUMSUM: TMenuItem
- Caption = 'CUMSUM Chart'
- OnClick = mnuAnalysisSPC_CUMSUMClick
+ object mnuAnalysisSPC_CUSUM: TMenuItem
+ Caption = 'CUSUM Chart'
+ OnClick = mnuAnalysisSPC_CUSUMClick
end
object mnuAnalysisSPC_CChart: TMenuItem
Caption = 'Defect (nonconformity) c Chart'
diff --git a/applications/lazstats/source/forms/mainunit.pas b/applications/lazstats/source/forms/mainunit.pas
index 7159db56a..3570799a2 100644
--- a/applications/lazstats/source/forms/mainunit.pas
+++ b/applications/lazstats/source/forms/mainunit.pas
@@ -63,7 +63,7 @@ type
mnuAnalysis: TMenuItem;
mnuAnalysisSPC: TMenuItem;
mnuAnalysisSPC_CChart: TMenuItem;
- mnuAnalysisSPC_CUMSUM: TMenuItem;
+ mnuAnalysisSPC_CUSUM: TMenuItem;
mnuAnalysisSPC_PChart: TMenuItem;
mnuAnalysisSPC_Range: TMenuItem;
mnuAnalysisSPC_SChart: TMenuItem;
@@ -286,7 +286,7 @@ type
// Menu 'Analysis" / "Statistical Process Control"
procedure mnuAnalysisSPC_CChartClick(Sender: TObject);
- procedure mnuAnalysisSPC_CUMSUMClick(Sender: TObject);
+ procedure mnuAnalysisSPC_CUSUMClick(Sender: TObject);
procedure mnuAnalysisSPC_PChartClick(Sender: TObject);
procedure mnuAnalysisSPC_RangeClick(Sender: TObject);
procedure mnuAnalysisSPC_SChartClick(Sender: TObject);
@@ -510,7 +510,7 @@ uses
BinomialUnit, KendallTauUnit, KaplanMeierUnit,
// Statistical process control
- XBarChartUnit, RChartUnit, SChartUnit, CUMSUMUnit, CChartUnit,
+ XBarChartUnit, RChartUnit, SChartUnit, CUSUMUnit, CChartUnit,
PChartUnit, UChartUnit,
CorSimUnit,
@@ -2127,12 +2127,12 @@ begin
end;
-// Menu "Analysis" > "Statistical Process Control" > "CUMSUM Chart"
-procedure TOS3MainFrm.mnuAnalysisSPC_CUMSUMClick(Sender: TObject);
+// Menu "Analysis" > "Statistical Process Control" > "CUSUM Chart"
+procedure TOS3MainFrm.mnuAnalysisSPC_CUSUMClick(Sender: TObject);
begin
- if CUMSUMChartForm = nil then
- Application.CreateForm(TCUMSUMChartForm, CUMSUMChartForm);
- CUMSUMChartForm.ShowModal;
+ if CUSUMChartForm = nil then
+ Application.CreateForm(TCUSUMChartForm, CUSUMChartForm);
+ CUSUMChartForm.ShowModal;
end;