uo9xpb74
/
mathnet-numerics
forked from tsai/mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Precision: rename decimals to digits

v4
Christoph Ruegg 6 years ago
parent
7cf756e841
commit
127b0d0895
1 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      src/Numerics/Precision.cs

84
src/Numerics/Precision.cs
View File

@ -816,144 +816,144 @@ namespace MathNet.Numerics
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static double Round(this double number, int decimals) public static double Round(this double number, int digits)
{ {
return decimals >= 0 return digits >= 0
? Math.Round(number, decimals, MidpointRounding.AwayFromZero) ? Math.Round(number, digits, MidpointRounding.AwayFromZero)
: RoundToMultiple(number, Math.Pow(10.0, -decimals)); : RoundToMultiple(number, Math.Pow(10.0, -digits));
} }
/// <summary> /// <summary>
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static float Round(this float number, int decimals) public static float Round(this float number, int digits)
{ {
return (float) Round((double) number, decimals); return (float) Round((double) number, digits);
} }
/// <summary> /// <summary>
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static decimal Round(this decimal number, int decimals) public static decimal Round(this decimal number, int digits)
{ {
return decimals >= 0 return digits >= 0
? Math.Round(number, decimals, MidpointRounding.AwayFromZero) ? Math.Round(number, digits, MidpointRounding.AwayFromZero)
: RoundToMultiple(number, (decimal) Math.Pow(10.0, -decimals)); : RoundToMultiple(number, (decimal) Math.Pow(10.0, -digits));
} }
/// <summary> /// <summary>
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static int Round(this int number, int decimals) public static int Round(this int number, int digits)
{ {
return decimals >= 0 return digits >= 0
? number ? number
: (int) Round((decimal) number, decimals); : (int) Round((decimal) number, digits);
} }
/// <summary> /// <summary>
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
[CLSCompliant(false)] [CLSCompliant(false)]
public static uint Round(this uint number, int decimals) public static uint Round(this uint number, int digits)
{ {
return decimals >= 0 return digits >= 0
? number ? number
: (uint) Round((decimal) number, decimals); : (uint) Round((decimal) number, digits);
} }
/// <summary> /// <summary>
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static long Round(this long number, int decimals) public static long Round(this long number, int digits)
{ {
return decimals >= 0 return digits >= 0
? number ? number
: (long) Round((decimal) number, decimals); : (long) Round((decimal) number, digits);
} }
/// <summary> /// <summary>
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
[CLSCompliant(false)] [CLSCompliant(false)]
public static ulong Round(this ulong number, int decimals) public static ulong Round(this ulong number, int digits)
{ {
return decimals >= 0 return digits >= 0
? number ? number
: (ulong) Round((decimal) number, decimals); : (ulong) Round((decimal) number, digits);
} }
/// <summary> /// <summary>
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static short Round(this short number, int decimals) public static short Round(this short number, int digits)
{ {
return decimals >= 0 return digits >= 0
? number ? number
: (short) Round((decimal) number, decimals); : (short) Round((decimal) number, digits);
} }
/// <summary> /// <summary>
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
[CLSCompliant(false)] [CLSCompliant(false)]
public static ushort Round(this ushort number, int decimals) public static ushort Round(this ushort number, int digits)
{ {
return decimals >= 0 return digits >= 0
? number ? number
: (ushort) Round((decimal) number, decimals); : (ushort) Round((decimal) number, digits);
} }
/// <summary> /// <summary>
/// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part. /// Round to the number closest to 10^(-decimals). Negative decimals to round within the integer part.
/// </summary> /// </summary>
/// <param name="number">Number to be rounded</param> /// <param name="number">Number to be rounded</param>
/// <param name="decimals">Number of decimals to round to. Negative to round within the integer part, e.g. -3 will wound to the closes 1000.</param> /// <param name="digits">If positive the number of decimals to round to. If negative the number of digits within the integer part to round, e.g. -3 will wound to the closes 1000.</param>
/// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example> /// <example>To round 123456789 to hundreds Round(123456789, -2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static BigInteger Round(this BigInteger number, int decimals) public static BigInteger Round(this BigInteger number, int digits)
{ {
if (decimals >= 0) if (digits >= 0)
{ {
return number; return number;
} }
var onelarger = number / BigInteger.Pow(10, (-decimals)-1); var onelarger = number / BigInteger.Pow(10, (-digits)-1);
var divided = onelarger / 10; var divided = onelarger / 10;
var lastDigit = onelarger - divided * 10; var lastDigit = onelarger - divided * 10;
if (lastDigit >= 5) if (lastDigit >= 5)
@ -961,7 +961,7 @@ namespace MathNet.Numerics
divided += 1; divided += 1;
} }
return divided * BigInteger.Pow(10, -decimals); return divided * BigInteger.Pow(10, -digits);
} }
[TargetedPatchingOptOut("Performance critical to inline this type of method across NGen image boundaries")] [TargetedPatchingOptOut("Performance critical to inline this type of method across NGen image boundaries")]

Write Preview
Loading…
Cancel
Save