paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 15:32:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* intmean, patch by Bart. Bug #32661

Browse Source 
git-svn-id: trunk@37688 -
This commit is contained in:
marco 2017-12-06 10:30:02 +00:00
parent 919cc7f307
commit a5487d327f
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
rtl/objpas/math.pp
View File

@ -417,6 +417,13 @@ function sum(const data : PExtended; Const N : Longint) : float;
function sumInt(const data : PInt64;Const N : longint) : Int64; function sumInt(const data : PInt64;Const N : longint) : Int64;
function sumInt(const data : array of Int64) : Int64;inline; function sumInt(const data : array of Int64) : Int64;inline;
function mean(const data : PInt64; const N : Longint):Float;
function mean(const data: array of Int64):Float;
function sumInt(const data : PInteger; Const N : longint) : Int64;
function sumInt(const data : array of Integer) : Int64;inline;
function mean(const data : PInteger; const N : Longint):Float;
function mean(const data: array of Integer):Float;
{$ifdef FPC_HAS_TYPE_SINGLE} {$ifdef FPC_HAS_TYPE_SINGLE}
function sumofsquares(const data : array of Single) : float;inline; function sumofsquares(const data : array of Single) : float;inline;
@ -1198,7 +1205,43 @@ function sumInt(const data : PInt64;Const N : longint) : Int64;
function sumInt(const data : array of Int64) : Int64; inline; function sumInt(const data : array of Int64) : Int64; inline;
begin begin
Result:=SumInt(@Data[0],High(Data)+1); Result:=SumInt(PInt64(@Data[0]),High(Data)+1);
end;
function mean(const data : PInt64; const N : Longint):Float;
begin
mean:=sumInt(Data,N);
mean:=mean/N;
end;
function mean(const data: array of Int64):Float;
begin
mean:=mean(PInt64(@data[0]),High(Data)+1);
end;
function sumInt(const data : PInteger; Const N : longint) : Int64;
var
i : longint;
begin
sumInt:=0;
for i:=0 to N-1 do
sumInt:=sumInt+data[i];
end;
function sumInt(const data : array of Integer) : Int64;inline;
begin
Result:=sumInt(PInteger(@Data[0]),High(Data)+1);
end;
function mean(const data : PInteger; const N : Longint):Float;
begin
mean:=sumInt(Data,N);
mean:=mean/N;
end;
function mean(const data: array of Integer):Float;
begin
mean:=mean(PInteger(@data[0]),High(Data)+1);
end; end;
{$ifdef FPC_HAS_TYPE_SINGLE} {$ifdef FPC_HAS_TYPE_SINGLE}