@@ -490,7 +490,7 @@ namespace MathNet.Numerics public static Complex InverseCosecant(this Complex value) { var inv = 1 / value; - return -Complex.I * ((Complex.I * inv) + (1 - inv.Square()).SquareRoot()).NaturalLogarithm(); + return -Complex.ImaginaryOne * ((Complex.ImaginaryOne * inv) + (1 - inv.Square()).SquareRoot()).NaturalLogarithm(); } /// <summary> @@ -521,7 +521,7 @@ namespace MathNet.Numerics /// </returns> public static Complex InverseCosine(this Complex value) { - return -Complex.I * (value + (Complex.I * (1 - value.Square()).SquareRoot())).NaturalLogarithm(); + return -Complex.ImaginaryOne * (value + (Complex.ImaginaryOne * (1 - value.Square()).SquareRoot())).NaturalLogarithm(); } /// <summary> @@ -554,8 +554,8 @@ namespace MathNet.Numerics return Math.PI / 2.0; } - var inv = Complex.I / value; - return (Complex.I * 0.5) * ((1.0 - inv).NaturalLogarithm() - (1.0 + inv).NaturalLogarithm()); + var inv = Complex.ImaginaryOne / value; + return (Complex.ImaginaryOne * 0.5) * ((1.0 - inv).NaturalLogarithm() - (1.0 + inv).NaturalLogarithm()); } /// <summary> @@ -755,7 +755,7 @@ namespace MathNet.Numerics public static Complex InverseSecant(this Complex value) { var inv = 1 / value; - return -Complex.I * (inv + (Complex.I * (1 - inv.Square()).SquareRoot())).NaturalLogarithm(); + return -Complex.ImaginaryOne * (inv + (Complex.ImaginaryOne * (1 - inv.Square()).SquareRoot())).NaturalLogarithm(); } /// <summary> @@ -783,7 +783,7 @@ namespace MathNet.Numerics /// </returns> public static Complex InverseSine(this Complex value) { - return -Complex.I * ((1 - value.Square()).SquareRoot() + (Complex.I * value)).NaturalLogarithm(); + return -Complex.ImaginaryOne * ((1 - value.Square()).SquareRoot() + (Complex.ImaginaryOne * value)).NaturalLogarithm(); } /// <summary> src/Numerics/Trigonometry.cs @@ -265,7 +265,7 @@ namespace MathNet.Numerics.UnitTests.ComplexTests public void CanDetermineIfImaginaryUnit() { var complex = new Complex(0, 1); - Assert.IsTrue(complex.IsI, "Imaginary unit"); + Assert.IsTrue(complex.IsImaginaryOne, "Imaginary unit"); } [Test] @@ -458,9 +458,9 @@ namespace MathNet.Numerics.UnitTests.ComplexTests [Row(0.0, 1.0, 1.0)] [Row(-1.0, 1.0, 1.4142135623730951)] [Row(-111.1, 111.1, 157.11912677965086)] - public void CanComputeModulus(double real, double imag, double expected) + public void CanComputeMagnitude(double real, double imag, double expected) { - Assert.AreEqual(expected, new Complex(real, imag).Modulus); + Assert.AreEqual(expected, new Complex(real, imag).Magnitude); } [Test] src/UnitTests/ComplexTests/ComplexTest.cs @@ -48,7 +48,7 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests { var samples = Sample.Random((u, v) => new Complex(u, v), _uniform, count); - var timeSpaceEnergy = (from s in samples select s.ModulusSquared).Mean(); + var timeSpaceEnergy = (from s in samples select s.MagnitudeSquared).Mean(); var work = new Complex[samples.Length]; samples.CopyTo(work, 0); @@ -56,7 +56,7 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests // Default -> Symmetric Scaling Transform.FourierForward(work); - var frequencySpaceEnergy = (from s in work select s.ModulusSquared).Mean(); + var frequencySpaceEnergy = (from s in work select s.MagnitudeSquared).Mean(); Assert.AreApproximatelyEqual(timeSpaceEnergy, frequencySpaceEnergy, 1e-12); } src/UnitTests/IntegralTransformsTests/ParsevalTheoremTest.cs eae7ecc91aa9ee40e8c9caad65f88924b00132df 797ba1d4e4d40009fd6757db5c0e2c04bae9c3da Marcus Cuda marcus@cuda.net http://github.com/cuda/mathnet-numerics/commit/c835adba9e163483efaf4ee549ae869888e31943 c835adba9e163483efaf4ee549ae869888e31943 2009-10-31T22:22:23-07:00 2009-10-31T22:22:23-07:00 Merge branch 'complex' of git@github.com:cuda/mathnet-numerics 0f291974d5e63ab5e144d712551123d5a3d53c1a Marcus Cuda marcus@cuda.net