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

Precision: RoundAbove decimal places argument should not be optional

v4
Christoph Ruegg 6 years ago
parent
647df8c81e
commit
9c622274e0
1 changed files with 81 additions and 51 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. 74
      src/Numerics/Precision.cs

74
src/Numerics/Precision.cs
View File

@ -752,11 +752,14 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static decimal RoundAboveZero(this decimal number, int powerDigits = 3) public static double RoundAboveZero(this double number, int powerDigits)
{ {
if (powerDigits <= 0) if (powerDigits <= 0)
return Math.Round(number, powerDigits*-1,MidpointRounding.AwayFromZero); {
return Math.Round(number / (decimal) Math.Pow(10, powerDigits),MidpointRounding.AwayFromZero) * (decimal) Math.Pow(10, powerDigits); return Math.Round(number, -powerDigits, MidpointRounding.AwayFromZero);
}
return Math.Round(number / Math.Pow(10, powerDigits), MidpointRounding.AwayFromZero) * Math.Pow(10, powerDigits);
} }
/// <summary> /// <summary>
@ -766,11 +769,9 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static double RoundAboveZero(this double number, int powerDigits = 3) public static float RoundAboveZero(this float number, int powerDigits)
{ {
if (powerDigits <= 0) return (float) RoundAboveZero((decimal) number, powerDigits);
return Math.Round(number, powerDigits*-1,MidpointRounding.AwayFromZero);
return Math.Round(number / Math.Pow(10, powerDigits),MidpointRounding.AwayFromZero) * Math.Pow(10, powerDigits);
} }
/// <summary> /// <summary>
@ -780,11 +781,14 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static int RoundAboveZero(this int number, int powerDigits = 3) public static decimal RoundAboveZero(this decimal number, int powerDigits)
{ {
if (powerDigits <= 0) if (powerDigits <= 0)
return number; {
return (int) RoundAboveZero((decimal) number, powerDigits); return Math.Round(number, -powerDigits, MidpointRounding.AwayFromZero);
}
return Math.Round(number / (decimal) Math.Pow(10, powerDigits), MidpointRounding.AwayFromZero) * (decimal) Math.Pow(10, powerDigits);
} }
/// <summary> /// <summary>
@ -794,11 +798,14 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static uint RoundAboveZero(this uint number, int powerDigits = 3) public static int RoundAboveZero(this int number, int powerDigits)
{ {
if (powerDigits <= 0) if (powerDigits <= 0)
{
return number; return number;
return (uint) RoundAboveZero((decimal) number, powerDigits); }
return (int) RoundAboveZero((decimal) number, powerDigits);
} }
/// <summary> /// <summary>
@ -808,11 +815,15 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static ulong RoundAboveZero(this ulong number, int powerDigits = 3) [CLSCompliant(false)]
public static uint RoundAboveZero(this uint number, int powerDigits)
{ {
if (powerDigits <= 0) if (powerDigits <= 0)
{
return number; return number;
return (ulong) RoundAboveZero((decimal) number, powerDigits); }
return (uint) RoundAboveZero((decimal) number, powerDigits);
} }
/// <summary> /// <summary>
@ -822,10 +833,13 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static long RoundAboveZero(this long number, int powerDigits = 3) public static long RoundAboveZero(this long number, int powerDigits)
{ {
if (powerDigits <= 0) if (powerDigits <= 0)
{
return number; return number;
}
return (long) RoundAboveZero((decimal) number, powerDigits); return (long) RoundAboveZero((decimal) number, powerDigits);
} }
@ -836,13 +850,16 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static short RoundAboveZero(this short number, int powerDigits = 3) [CLSCompliant(false)]
public static ulong RoundAboveZero(this ulong number, int powerDigits)
{ {
if (powerDigits <= 0) if (powerDigits <= 0)
{
return number; return number;
return (short) RoundAboveZero((decimal) number, powerDigits);
} }
return (ulong) RoundAboveZero((decimal) number, powerDigits);
}
/// <summary> /// <summary>
/// Round to the number closest to 10^powerDigits. /// Round to the number closest to 10^powerDigits.
/// </summary> /// </summary>
@ -850,13 +867,15 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static ushort RoundAboveZero(this ushort number, int powerDigits = 3) public static short RoundAboveZero(this short number, int powerDigits)
{ {
if (powerDigits <= 0) if (powerDigits <= 0)
{
return number; return number;
return (ushort) RoundAboveZero((decimal) number, powerDigits);
} }
return (short) RoundAboveZero((decimal) number, powerDigits);
}
/// <summary> /// <summary>
/// Round to the number closest to 10^powerDigits. /// Round to the number closest to 10^powerDigits.
@ -865,9 +884,15 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static float RoundAboveZero(this float number, int powerDigits = 3) [CLSCompliant(false)]
public static ushort RoundAboveZero(this ushort number, int powerDigits)
{ {
return (float) RoundAboveZero((decimal) number, powerDigits); if (powerDigits <= 0)
{
return number;
}
return (ushort) RoundAboveZero((decimal) number, powerDigits);
} }
/// <summary> /// <summary>
@ -877,16 +902,21 @@ namespace MathNet.Numerics
/// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param> /// <param name="powerDigits">For closest 1000 enter 3, 10^powerDigits. If lower then zero you will get decimal digits.</param>
/// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example> /// <example>To round 123456789 to hundreds RoundAboveZero(123456789, 2) = 123456800 </example>
/// <returns>Rounded number</returns> /// <returns>Rounded number</returns>
public static BigInteger RoundAboveZero(this BigInteger number, int powerDigits = 3) public static BigInteger RoundAboveZero(this BigInteger number, int powerDigits)
{ {
if (powerDigits <= 0) if (powerDigits <= 0)
{
return number; return number;
}
var onelarger = number / BigInteger.Pow(10, powerDigits-1); var onelarger = number / BigInteger.Pow(10, powerDigits-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)
{
divided += 1; divided += 1;
}
return divided * BigInteger.Pow(10, powerDigits); return divided * BigInteger.Pow(10, powerDigits);
} }

Write Preview
Loading…
Cancel
Save