Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b50ec8a

Browse files
Rename several mean functions
Renamed the following functions: * GeoMean function overloads => GeometricMean. * WeightedGeoMean function overloads => WeightedGeometricMean. * ArithMean function overloads => ArithmeticMean. * WeightedArithMean function overloads => WeightedArithmeticMean. Updated affected source code .dat files. Updated all references to old names in maths.ini meta data file. Regenerated UMathsCatSnippets unit from CodeSnip to rename all references to the renamed functions. Revised TestUMathsCatSnippets to use the new function names. Also renamed the unit test methods to reflect the changed function names.
1 parent a109a8c commit b50ec8a

File tree

15 files changed

+232
-244
lines changed

15 files changed

+232
-244
lines changed

‎collection/650.dat

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
function ArithMean(const A: array of Double): Double; overload;
1+
function ArithmeticMean(const A: array of Double): Double; overload;
22
var
33
X: Double;
44
begin
55
if Length(A) = 0 then
6-
raise SysUtils.EArgumentException.Create(
7-
'ArithMean: array is empty'
8-
);
6+
raise SysUtils.EArgumentException.Create('Array is empty');
97
Result := 0.0;
108
for X in A do
119
Result := Result + X / Length(A);

‎collection/651.dat

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
function ArithMean(const A: array of Integer): Double; overload;
1+
function ArithmeticMean(const A: array of Integer): Double; overload;
22
var
33
X: Integer;
44
begin
55
if Length(A) = 0 then
6-
raise SysUtils.EArgumentException.Create(
7-
'ArithMean: array is empty'
8-
);
6+
raise SysUtils.EArgumentException.Create('Array is empty');
97
Result := 0.0;
108
for X in A do
119
Result := Result + X / Length(A);

‎collection/652.dat

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
function ArithMean(const A: array of Cardinal): Double; overload;
1+
function ArithmeticMean(const A: array of Cardinal): Double; overload;
22
var
33
X: Cardinal;
44
begin
55
if Length(A) = 0 then
6-
raise SysUtils.EArgumentException.Create(
7-
'ArithMean: array is empty'
8-
);
6+
raise SysUtils.EArgumentException.Create('Array is empty');
97
Result := 0.0;
108
for X in A do
119
Result := Result + X / Length(A);

‎collection/653.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function WeightedArithMean(const Values: array of Double;
1+
function WeightedArithmeticMean(const Values: array of Double;
22
const Weights: array of Double): Double; overload;
33
var
44
WeightSum: Double;

‎collection/654.dat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function WeightedArithMean(const Values: array of Integer;
1+
function WeightedArithmeticMean(const Values: array of Integer;
22
const Weights: array of Double): Double; overload;
33
var
44
Idx: Integer;
@@ -7,5 +7,5 @@ begin
77
SetLength(DblVals, Length(Values));
88
for Idx := Low(Values) to High(Values) do
99
DblVals[Idx] := Values[Idx];
10-
Result := WeightedArithMean(DblVals, Weights);
10+
Result := WeightedArithmeticMean(DblVals, Weights);
1111
end;

‎collection/655.dat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function WeightedArithMean(const Values: array of Cardinal;
1+
function WeightedArithmeticMean(const Values: array of Cardinal;
22
const Weights: array of Double): Double; overload;
33
var
44
Idx: Integer;
@@ -7,5 +7,5 @@ begin
77
SetLength(DblVals, Length(Values));
88
for Idx := Low(Values) to High(Values) do
99
DblVals[Idx] := Values[Idx];
10-
Result := WeightedArithMean(DblVals, Weights);
10+
Result := WeightedArithmeticMean(DblVals, Weights);
1111
end;

‎collection/675.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function GeoMean(const A: array of Double): Double; overload;
1+
function GeometricMean(const A: array of Double): Double; overload;
22
begin
33
if System.Length(A) = 0 then
44
raise SysUtils.EArgumentException.Create('Array is empty');

‎collection/676.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function GeoMean(const A: array of Cardinal): Double; overload;
1+
function GeometricMean(const A: array of Cardinal): Double; overload;
22
begin
33
if System.Length(A) = 0 then
44
raise SysUtils.EArgumentException.Create('Array is empty');

‎collection/677.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function GeoMean(const A: array of Integer): Double; overload;
1+
function GeometricMean(const A: array of Integer): Double; overload;
22
begin
33
if System.Length(A) = 0 then
44
raise SysUtils.EArgumentException.Create('Array is empty');

‎collection/678.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function WeightedGeoMean(const Values: array of Double;
1+
function WeightedGeometricMean(const Values: array of Double;
22
const Weights: array of Double): Double; overload;
33
var
44
Sum: Double;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /