Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#306 - Create wrapper struct for double #360

Merged
merged 11 commits into from
Oct 5, 2020
Merged

#306 - Create wrapper struct for double #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4cf3d5f
#306 - Initial implementation
sys27 Oct 4, 2020
e0eec56
#306 - Part of functions
sys27 Oct 4, 2020
d0a6e65
#306 - Part of functions
sys27 Oct 4, 2020
deb6e5a
#306 - Part of functions
sys27 Oct 4, 2020
dcf380a
#306 - Part of functions
sys27 Oct 4, 2020
c40a09b
Remove private protected
sys27 Oct 4, 2020
98c695d
#306 - Trigonometric/Hyperbolic
sys27 Oct 4, 2020
0ebc680
#306 - Rename
sys27 Oct 4, 2020
f91618c
#306 - Tests
sys27 Oct 4, 2020
e1e583b
.
sys27 Oct 5, 2020
fc6317b
Tests
sys27 Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion xFunc.Benchmark/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class Program
{
public static void Main(string[] args)
{
if (args == null || args.Length == 0)
if (args is null || args.Length == 0)
args = new[] { "--filter", "*" };

BenchmarkSwitcher
Expand Down
2 changes: 1 addition & 1 deletion xFunc.DotnetTool/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private static void Interactive(InteractiveOptions options)
Console.Write("> ");

var stringExpression = Console.ReadLine()?.ToLower();
if (stringExpression == null ||
if (stringExpression is null ||
stringExpression == "#quit" ||
stringExpression == "#exit")
{
Expand Down
2 changes: 1 addition & 1 deletion xFunc.Maths/Analyzers/Differentiator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ public override IExpression Analyze(UserFunction exp, DifferentiatorContext cont
{
ValidateArguments(exp, context);

if (context.Parameters == null)
if (context.Parameters is null)
throw new InvalidOperationException();

return context.Parameters.Functions[exp].Analyze(this, context);
Expand Down
2 changes: 1 addition & 1 deletion xFunc.Maths/Analyzers/Formatters/CommonFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public virtual string Analyze(Mul exp)

/// <inheritdoc />
public virtual string Analyze(Number exp)
=> exp.Value.ToString(CultureInfo.InvariantCulture);
=> exp.Value.ToString();

/// <inheritdoc />
public virtual string Analyze(Angle exp)
Expand Down
51 changes: 25 additions & 26 deletions xFunc.Maths/Analyzers/Simplifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,14 @@ public override IExpression Analyze(Add exp)
return result switch
{
// plus zero
(Number(var number), _) when MathExtensions.Equals(number, 0)
(Number(var number), _) when number == 0
=> exp.Right,
(_, Number(var number)) when MathExtensions.Equals(number, 0)
(_, Number(var number)) when number == 0
=> exp.Left,

// const + const
(Number left, Number right)
=> new Number(left + right),
=> new Number(left.Value + right.Value),
(Number left, Angle right)
=> (left.Value + right.Value).AsExpression(),
(Angle left, Number right)
Expand Down Expand Up @@ -312,20 +312,19 @@ public override IExpression Analyze(Div exp)
return result switch
{
// 0 / 0
(Number(var left), Number(var right))
when MathExtensions.Equals(left, 0) && MathExtensions.Equals(right, 0)
(Number(var left), Number(var right)) when left == 0 && right == 0
=> new Number(double.NaN),

// 0 / x
(Number(var number), _) when MathExtensions.Equals(number, 0)
(Number(var number), _) when number == 0
=> Number.Zero,

// x / 0
(_, Number(var number)) when MathExtensions.Equals(number, 0)
(_, Number(var number)) when number == 0
=> throw new DivideByZeroException(),

// x / 1
(var left, Number(var number)) when MathExtensions.Equals(number, 1)
(var left, Number(var number)) when number == 1
=> left,

// const / const
Expand Down Expand Up @@ -422,7 +421,7 @@ public override IExpression Analyze(Lb exp)
return argument switch
{
// lb(2)
Number(var number) when MathExtensions.Equals(number, 2) => Number.One,
Number(var number) when number == 2 => Number.One,
var arg when IsChanged(exp, arg) => new Lb(arg),
_ => exp,
};
Expand All @@ -440,7 +439,7 @@ public override IExpression Analyze(Lg exp)
return result switch
{
// lg(10)
Number(var number) when MathExtensions.Equals(number, 10) => Number.One,
Number(var number) when number == 10 => Number.One,
var arg when IsChanged(exp, arg) => new Lg(arg),
_ => exp,
};
Expand Down Expand Up @@ -486,21 +485,21 @@ public override IExpression Analyze(Mul exp)
return result switch
{
// mul by zero
(Number(var number), _) when MathExtensions.Equals(number, 0)
(Number(var number), _) when number == 0
=> Number.Zero,
(_, Number(var number)) when MathExtensions.Equals(number, 0)
(_, Number(var number)) when number == 0
=> Number.Zero,

// mul by 1
(Number(var number), var right) when MathExtensions.Equals(number, 1)
(Number(var number), var right) when number == 1
=> right,
(var left, Number(var number)) when MathExtensions.Equals(number, 1)
(var left, Number(var number)) when number == 1
=> left,

// mul by -1
(Number(var number), var right) when MathExtensions.Equals(number, -1)
(Number(var number), var right) when number == -1
=> new UnaryMinus(right),
(var left, Number(var number)) when MathExtensions.Equals(number, -1)
(var left, Number(var number)) when number == -1
=> new UnaryMinus(left),

// const * const
Expand Down Expand Up @@ -658,7 +657,7 @@ public override IExpression Analyze(ToNumber exp)

return argument switch
{
Angle(var angle) => new Number(angle.Value),
Angle(var angle) => new Number(angle.Angle),
var arg when IsChanged(exp, arg) => new ToNumber(arg),
_ => exp,
};
Expand All @@ -672,15 +671,15 @@ public override IExpression Analyze(Pow exp)
return result switch
{
// x^0
(_, Number(var number)) when MathExtensions.Equals(number, 0)
(_, Number(var number)) when number == 0
=> Number.One,

// 0^x
(Number(var number), _) when MathExtensions.Equals(number, 0)
(Number(var number), _) when number == 0
=> Number.Zero,

// x^1
(var left, Number(var number)) when MathExtensions.Equals(number, 1)
(var left, Number(var number)) when number == 1
=> left,

// x ^ log(x, y) -> y
Expand All @@ -692,11 +691,11 @@ public override IExpression Analyze(Pow exp)
=> ln.Argument,

// 10 ^ lg(y) -> y
(Number number, Lg lg) when MathExtensions.Equals(number.Value, 10)
(Number number, Lg lg) when number.Value == 10
=> lg.Argument,

// 2 ^ lb(y) -> y
(Number number, Lb lb) when MathExtensions.Equals(number.Value, 2)
(Number number, Lb lb) when number.Value == 2
=> lb.Argument,

var (left, right) when IsChanged(exp, left, right)
Expand All @@ -714,7 +713,7 @@ public override IExpression Analyze(Root exp)
return result switch
{
// root(x, 1)
(var left, Number(var number)) when MathExtensions.Equals(number, 1)
(var left, Number(var number)) when number == 1
=> left,

var (left, right) when IsChanged(exp, left, right)
Expand Down Expand Up @@ -744,14 +743,14 @@ public override IExpression Analyze(Sub exp)
return result switch
{
// plus zero
(Number(var number), var right) when MathExtensions.Equals(number, 0)
(Number(var number), var right) when number == 0
=> Analyze(new UnaryMinus(right)),
(var left, Number(var number)) when MathExtensions.Equals(number, 0)
(var left, Number(var number)) when number == 0
=> left,

// const - const
(Number left, Number right)
=> new Number(left - right),
=> new Number(left.Value - right.Value),
(Number left, Angle right)
=> (left.Value - right.Value).AsExpression(),
(Angle left, Number right)
Expand Down