Lazstats: Minor layout changes and cleanup in ABRAnovaUnit

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7802 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-10-25 17:45:52 +00:00
parent c022ad9edf
commit 832551eb29

View File

@ -733,25 +733,24 @@ procedure TABRAnovaForm.Summarize(const AData: TABRAnovaData; AReport: TStrings)
begin begin
with AData do with AData do
begin begin
AReport.Add(DIVIDER_AUTO);
AReport.Add('SOURCE DF SS MS F PROB.');
AReport.Add(DIVIDER_SMALL_AUTO); AReport.Add(DIVIDER_SMALL_AUTO);
AReport.Add('SOURCE DF SS MS F PROB.'); AReport.Add('Between Subjects %5.0f%14.3f', [DFBetween, SSBetweenSubjects]);
AReport.Add(' A Effects %5.0f%14.3f%12.3f%10.3f%10.3f', [DFA, SSA, MSA, FA, ProbA]);
AReport.Add(' B Effects %5.0f%14.3f%12.3f%10.3f%10.3f', [DFB, SSB, MSB, FB, ProbB]);
AReport.Add(' AB Effects %5.0f%14.3f%12.3f%10.3f%10.3f', [DFAB, SSAB, MSAB, FAB, ProbAB]);
AReport.Add(' Error Between %5.0f%14.3f%12.3f', [DFerrorBetween, SSerrorBetween, MSerrorBetween]);
AReport.Add(DIVIDER_SMALL_AUTO); AReport.Add(DIVIDER_SMALL_AUTO);
AReport.Add('Between Subjects %5.0f%10.3f', [DFBetween, SSBetweenSubjects]); AReport.Add('Within Subjects %5.0f%14.3f', [DFWithin, SSWithinSubjects]);
AReport.Add(' A Effects %5.0f%10.3f%10.3f%10.3f%10.3f', [DFA, SSA, MSA, FA, ProbA]); AReport.Add(' C Replications %5.0f%14.3f%12.3f%10.3f%10.3f', [DFC, SSC, MSC, FC, ProbC]);
AReport.Add(' B Effects %5.0f%10.3f%10.3f%10.3f%10.3f', [DFB, SSB, MSB, FB, ProbB]); AReport.Add(' AC Effects %5.0f%14.3f%12.3f%10.3f%10.3f', [DFAC, SSAC, MSAC, FAC, ProbAC]);
AReport.Add(' AB Effects %5.0f%10.3f%10.3f%10.3f%10.3f', [DFAB, SSAB, MSAB, FAB, ProbAB]); AReport.Add(' BC Effects %5.0f%14.3f%12.3f%10.3f%10.3f', [DFBC, SSBC, MSBC, FBC, ProbBC]);
AReport.Add(' Error Between %5.0f%10.3f%10.3f', [DFerrorBetween, SSerrorBetween, MSerrorBetween]); AReport.Add(' ABC Effects %5.0f%14.3f%12.3f%10.3f%10.3f', [DFABC, SSABC, MSABC, FABC, ProbABC]);
AReport.Add(''); AReport.Add(' Error Within %5.0f%14.3f%12.3f', [DFerrorWithin, SSerrorWithin, MSerrorWithin]);
AReport.Add('Within Subjects %5.0f%10.3f', [DFWithin, SSWithinSubjects]);
AReport.Add(' C Replications %5.0f%10.3f%10.3f%10.3f%10.3f', [DFC, SSC, MSC, FC, ProbC]);
AReport.Add(' AC Effects %5.0f%10.3f%10.3f%10.3f%10.3f', [DFAC, SSAC, MSAC, FAC, ProbAC]);
AReport.Add(' BC Effects %5.0f%10.3f%10.3f%10.3f%10.3f', [DFBC, SSBC, MSBC, FBC, ProbBC]);
AReport.Add(' ABC Effects %5.0f%10.3f%10.3f%10.3f%10.3f', [DFABC, SSABC, MSABC, FABC, ProbABC]);
AReport.Add(' Error Within %5.0f%10.3f%10.3f', [DFerrorWithin, SSerrorWithin, MSerrorWithin]);
AReport.Add('');
// AReport.Add(DIVIDER_SMALL_AUTO);
AReport.Add('Total %5.0f%10.3f', [DFBetween + DFWithin, SSBetweenSubjects + SSWithinSubjects]);
AReport.Add(DIVIDER_SMALL_AUTO); AReport.Add(DIVIDER_SMALL_AUTO);
AReport.Add('Total %5.0f%14.3f', [DFBetween + DFWithin, SSBetweenSubjects + SSWithinSubjects]);
AReport.Add(DIVIDER_AUTO);
end; end;
FReportFrame.DisplayReport(AReport); FReportFrame.DisplayReport(AReport);
@ -770,7 +769,6 @@ var
begin begin
AReport.Clear; AReport.Clear;
Title := 'ABR Means Table'; Title := 'ABR Means Table';
ColHeader := 'Repeated Measures'; ColHeader := 'Repeated Measures';
SetLength(AMatrix, MaxRows, NoSelected); SetLength(AMatrix, MaxRows, NoSelected);
@ -854,6 +852,7 @@ procedure TABRAnovaForm.BoxTests(const AData: TABRAnovaData; AReport: TStrings);
const const
EPS = 1E-35; EPS = 1E-35;
var var
errorcode: Boolean = false; // to silence the compiler
XVector: DblDyneVec = nil; XVector: DblDyneVec = nil;
XSums: DblDyneVec = nil; XSums: DblDyneVec = nil;
DetMat: DblDyneMat = nil; DetMat: DblDyneMat = nil;
@ -865,7 +864,6 @@ var
ColHeader, LabelStr: string; ColHeader, LabelStr: string;
Title: string; Title: string;
i, j, k, l, row, SubjA, SubjB, N, p, quad : integer; i, j, k, l, row, SubjA, SubjB, N, p, quad : integer;
errorcode : boolean = false; // to silence the compiler
Det: Double = 0.0; Det: Double = 0.0;
begin begin
AReport.Clear; AReport.Clear;