pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Lazstats: Avoid pointless subtraction of 1 from array indexes in CompResUnit. Update chm file.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7390 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-04-18 20:58:47 +00:00
parent fe372ec99d
commit 8786e8a9fa
2 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
applications/lazstats/docs/chm/LazStats.chm
View File

Binary file not shown.

56
applications/lazstats/source/forms/analysis/measurement_programs/comprelunit.pas
View File

@ -195,15 +195,15 @@ begin
// get variable col. no.s selected // get variable col. no.s selected
NoVars := ItemList.Items.Count; NoVars := ItemList.Items.Count;
for i := 1 to NoVars do for i := 0 to NoVars-1 do
begin begin
cellstring := ItemList.Items.Strings[i-1]; cellstring := ItemList.Items.Strings[i];
for j := 1 to NoVariables do for j := 1 to NoVariables do
begin begin
if (cellstring = OS3MainFrm.DataGrid.Cells[j,0]) then if (cellstring = OS3MainFrm.DataGrid.Cells[j,0]) then
begin begin
colnoselected[i-1] := j; colnoselected[i] := j;
RowLabels[i-1] := cellstring; RowLabels[i] := cellstring;
end; end;
end; end;
end; end;
@ -234,34 +234,35 @@ begin
DynVectorPrint(stddevs, NoVars, title, RowLabels, count, lReport); DynVectorPrint(stddevs, NoVars, title, RowLabels, count, lReport);
end; end;
for i := 1 to NoVars do for i := 0 to NoVars do
for j := 1 to NoVars do for j := 0 to NoVars do
RelMat[i-1,j-1] := Rmat[i-1,j-1]; RelMat[i, j] := Rmat[i, j];
for i := 1 to NoVars do for i := 0 to NoVars-1 do
begin begin
Reliabilities[i-1] := StrToFloat(RelList.Items.Strings[i-1]); Reliabilities[i] := StrToFloat(RelList.Items.Strings[i]);
RelMat[i-1,i-1] := Reliabilities[i-1]; RelMat[i, i] := Reliabilities[i];
Weights[i-1] := StrToFloat(WeightList.Items.Strings[i-1]); Weights[i] := StrToFloat(WeightList.Items.Strings[i]);
end; end;
// get numerator and denominator of composite reliability // get numerator and denominator of composite reliability
for i := 1 to NoVars do VectProd[i-1] := 0.0; for i := 0 to NoVars-1 do
VectProd[i] := 0.0;
numerator := 0.0; numerator := 0.0;
denominator := 0.0; denominator := 0.0;
for i := 1 to NoVars do for i := 0 to NoVars-1 do
for j := 1 to NoVars do for j := 0 to NoVars-1 do
VectProd[i-1] := VectProd[i-1] + (Weights[i-1] * RelMat[j-1,i-1]); VectProd[i] := VectProd[i] + (Weights[i] * RelMat[j, i]);
for i := 1 to NoVars do for i := 0 to NoVars-1 do
numerator := numerator + (VectProd[i-1] * Weights[i-1]); numerator := numerator + (VectProd[i] * Weights[i]);
for i := 1 to NoVars do for i := 0 to NoVars-1 do
VectProd[i-1] := 0.0; VectProd[i] := 0.0;
for i := 1 to NoVars do for i := 0 to NoVars-1 do
for j := 1 to NoVars do for j := 0 to NoVars-1 do
VectProd[i-1] := VectProd[i-1] + (Weights[i-1] * Rmat[j-1,i-1]); VectProd[i] := VectProd[i] + (Weights[i] * Rmat[j, i]);
for i := 1 to NoVars do for i := 0 to NoVars-1 do
denominator := denominator + VectProd[i-1] * Weights[i-1]; denominator := denominator + VectProd[i] * Weights[i];
CompRel := numerator / denominator; CompRel := numerator / denominator;
title := 'Test Weights'; title := 'Test Weights';
@ -283,10 +284,11 @@ begin
col := NoVariables; col := NoVariables;
for i := 1 to NoCases do for i := 1 to NoCases do
begin begin
if not GoodRecord(i, NoVars, ColNoSelected) then
continue;
compscore := 0.0; compscore := 0.0;
if not GoodRecord(i, NoVars, ColNoSelected) then continue; for j := 0 to NoVars-1 do
for j := 1 to NoVars do compscore := compscore + (Weights[j] * StrToFloat(Trim(OS3MainFrm.DataGrid.Cells[colnoselected[j],i])));
compscore := compscore + (Weights[j-1] * StrToFloat(Trim(OS3MainFrm.DataGrid.Cells[colnoselected[j-1],i])));
OS3MainFrm.DataGrid.Cells[col,i] := FloatToStr(compscore); OS3MainFrm.DataGrid.Cells[col,i] := FloatToStr(compscore);
end; end;
end; end;