paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-04 12:00:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Remove deprecated TFitSeries.GoodnessOfFit and related.

Browse Source 
git-svn-id: trunk@60530 -
This commit is contained in:
wp 2019-02-28 12:39:04 +00:00
parent d083286913
commit 6a5cde8d8f
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/tachart/tafuncseries.pas
View File

@ -284,9 +284,6 @@ type
TFitParamsState = (fpsUnknown, fpsInvalid, fpsValid); TFitParamsState = (fpsUnknown, fpsInvalid, fpsValid);
TCalcGoodnessOfFitEvent = procedure (Sender: TObject; var x,y: ArbFloat;
n: Integer; out AResult: Double) of object;
TFitFuncIndex = 1..MaxInt; TFitFuncIndex = 1..MaxInt;
TFitFuncEvent = procedure(AIndex: TFitFuncIndex; AFitFunc: TFitFunc) of object; TFitFuncEvent = procedure(AIndex: TFitFuncIndex; AFitFunc: TFitFunc) of object;
@ -306,8 +303,6 @@ type
FErrCode: TFitErrCode; FErrCode: TFitErrCode;
FFitStatistics: TFitStatistics; FFitStatistics: TFitStatistics;
FConfidenceLevel: Double; FConfidenceLevel: Double;
FGoodnessOfFit: Double;
FOnCalcGoodnessOfFit: TCalcGoodnessOfFitEvent;
function GetParam(AIndex: Integer): Double; function GetParam(AIndex: Integer): Double;
function GetParamCount: Integer; function GetParamCount: Integer;
function GetParamError(AIndex: Integer): Double; function GetParamError(AIndex: Integer): Double;
@ -332,7 +327,6 @@ type
function TransformY(AY: Double): Extended; inline; function TransformY(AY: Double): Extended; inline;
protected protected
procedure AfterAdd; override; procedure AfterAdd; override;
function CalcGoodnessOfFit(var x,y: ArbFloat; n: Integer): Double; virtual; deprecated;
procedure GetLegendItems(AItems: TChartLegendItems); override; procedure GetLegendItems(AItems: TChartLegendItems); override;
procedure InvalidateFitResults; virtual; procedure InvalidateFitResults; virtual;
procedure Loaded; override; procedure Loaded; override;
@ -372,7 +366,6 @@ type
property ConfidenceLevel: Double read FConfidenceLevel write FConfidenceLevel; property ConfidenceLevel: Double read FConfidenceLevel write FConfidenceLevel;
property ErrCode: TFitErrCode read FErrCode; property ErrCode: TFitErrCode read FErrCode;
property State: TFitParamsState read FState; property State: TFitParamsState read FState;
property GoodnessOfFit: Double read FGoodnessOfFit; deprecated 'Use FitStatistics instead';
published published
property AutoFit: Boolean read FAutoFit write FAutoFit default true; property AutoFit: Boolean read FAutoFit write FAutoFit default true;
property AxisIndexX; property AxisIndexX;
@ -395,8 +388,6 @@ type
property ToolTargets default [nptPoint, nptCustom]; property ToolTargets default [nptPoint, nptCustom];
property XErrorBars; property XErrorBars;
property YErrorBars; property YErrorBars;
property OnCalcGoodnessOfFit: TCalcGoodnessOfFitEvent
read FOnCalcGoodnessOfFit write FOnCalcGoodnessOfFit; deprecated 'Use Statistics instead';
property OnCustomDrawPointer; property OnCustomDrawPointer;
property OnFitComplete: TNotifyEvent property OnFitComplete: TNotifyEvent
read FOnFitComplete write FOnFitComplete; read FOnFitComplete write FOnFitComplete;
@ -1568,15 +1559,6 @@ begin
FFitRange.SetOwner(ParentChart); FFitRange.SetOwner(ParentChart);
end; end;
{ Returns the R-squared parameter as a simple measure for the goodness-of-fit.
This function is obsolete since Laz v1.9 and has been replaced by the more
comprehensive property "FitStatistics".}
function TFitSeries.CalcGoodnessOfFit(var x,y: ArbFloat; n: Integer): Double;
begin
Unused(x, y, n);
Result := FFitStatistics.R2;
end;
function TFitSeries.Calculate(AX: Double): Double; function TFitSeries.Calculate(AX: Double): Double;
var var
i: Integer; i: Integer;
@ -2001,7 +1983,6 @@ var
begin begin
FState := fpsUnknown; FState := fpsUnknown;
FreeAndNil(FFitStatistics); FreeAndNil(FFitStatistics);
FGoodnessOfFit := NaN;
for i:=0 to High(FFitParams) do FFitParams[i].Value := NaN; for i:=0 to High(FFitParams) do FFitParams[i].Value := NaN;
end; end;