TAChart: Better usage of compiler directives in TFitSeries. Some cleanup.

git-svn-id: trunk@49573 -
This commit is contained in:
wp 2015-07-27 17:23:45 +00:00
parent 03e9e040af
commit ac26993488

View File

@ -1329,10 +1329,9 @@ type
var var
yave, ycalc, SStot, SSres: Double; yave, ycalc, SStot, SSres: Double;
i, j: Integer; i, j: Integer;
na: Integer;
begin begin
{$IFOPT R+}{$DEFINE RANGE_CHECK_ON}{$ENDIF} {$PUSH}
{$IFDEF RANGE_CHECK_ON}{$R-}{$ENDIF} {$R-}
yave := 0; yave := 0;
for i:=0 to n-1 do for i:=0 to n-1 do
yave := yave + TArbFloatArray(y)[i]; yave := yave + TArbFloatArray(y)[i];
@ -1348,7 +1347,7 @@ begin
SSres := SSres + sqr(TArbFloatArray(y)[i] - ycalc); SSres := SSres + sqr(TArbFloatArray(y)[i] - ycalc);
end; end;
Result := 1.0 - SSres / SStot; Result := 1.0 - SSres / SStot;
{$IFDEF RANGE_CHECK_ON}{$R+}{$ENDIF} {$POP}
end; end;
function TFitSeries.Calculate(AX: Double): Double; function TFitSeries.Calculate(AX: Double): Double;
@ -1454,8 +1453,6 @@ var
var var
i, j, term, ns, np, n: Integer; i, j, term, ns, np, n: Integer;
xv, yv, fp: array of ArbFloat; xv, yv, fp: array of ArbFloat;
ssTot, ssRes: Double;
ycalc, yave: Double;
begin begin
np := ParamCount; np := ParamCount;
ns := Source.Count; ns := Source.Count;