From: Jeff R. <jef...@us...> - 2005-11-20 20:42:34
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUtil/SharpVectors/Polynomials In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/src/SharpVectorUtil/SharpVectors/Polynomials Modified Files: Polynomial.cs SqrtPolynomial.cs Log Message: Project wide fixes to eliminate obsolete NUnit calls, minor test related fixes Index: SqrtPolynomial.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUtil/SharpVectors/Polynomials/SqrtPolynomial.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SqrtPolynomial.cs 3 Aug 2003 18:29:25 -0000 1.1 +++ SqrtPolynomial.cs 20 Nov 2005 20:42:24 -0000 1.2 @@ -32,7 +32,7 @@ [Test] public override void TestEval() { - Assertion.AssertEquals(7, poly.Evaluate(2)); + Assert.AreEqual(7, poly.Evaluate(2)); } @@ -46,16 +46,16 @@ t[i] = ((SqrtPolynomial) poly).trapezoid(0, 1, i+1); } - Assertion.AssertEquals(2.0811388300841900, t[0]); - Assertion.AssertEquals(1.9419572339080924, t[1]); - Assertion.AssertEquals(1.9076575130141613, t[2]); - Assertion.AssertEquals(1.8991762591629650, t[3]); - Assertion.AssertEquals(1.8970624585984340, t[4]); - Assertion.AssertEquals(1.8965344208416803, t[5]); - Assertion.AssertEquals(1.8964024372601043, t[6]); - Assertion.AssertEquals(1.8963694429821338, t[7]); - Assertion.AssertEquals(1.8963611945137506, t[8]); - Assertion.AssertEquals(1.8963591324029752, t[9]); + Assert.AreEqual(2.0811388300841900, t[0]); + Assert.AreEqual(1.9419572339080924, t[1]); + Assert.AreEqual(1.9076575130141613, t[2]); + Assert.AreEqual(1.8991762591629650, t[3]); + Assert.AreEqual(1.8970624585984340, t[4]); + Assert.AreEqual(1.8965344208416803, t[5]); + Assert.AreEqual(1.8964024372601043, t[6]); + Assert.AreEqual(1.8963694429821338, t[7]); + Assert.AreEqual(1.8963611945137506, t[8]); + Assert.AreEqual(1.8963591324029752, t[9]); } [Test] @@ -69,26 +69,26 @@ t[i] = poly.trapezoid(0, 1, i+1); } - Assertion.AssertEquals(392.72319162647350, t[0]); - Assertion.AssertEquals(342.61159581323676, t[1]); - Assertion.AssertEquals(331.53834637052490, t[2]); - Assertion.AssertEquals(328.79094438739287, t[3]); - Assertion.AssertEquals(328.10605667592347, t[4]); - Assertion.AssertEquals(327.93495792953500, t[5]); - Assertion.AssertEquals(327.89219094488620, t[6]); - Assertion.AssertEquals(327.88149968013374, t[7]); - Assertion.AssertEquals(327.87882689403440, t[8]); - Assertion.AssertEquals(327.87815869939020, t[9]); - Assertion.AssertEquals(327.87799165084670, t[10]); - Assertion.AssertEquals(327.87794988871800, t[11]); - Assertion.AssertEquals(327.87793944818645, t[12]); - Assertion.AssertEquals(327.87793683805364, t[13]); - Assertion.AssertEquals(327.87793618552050, t[14]); - Assertion.AssertEquals(327.87793602238645, t[15]); - Assertion.AssertEquals(327.87793598160340, t[16]); - Assertion.AssertEquals(327.87793597140626, t[17]); - Assertion.AssertEquals(327.87793596885720, t[18]); - Assertion.AssertEquals(327.87793596821960, t[19]); + Assert.AreEqual(392.72319162647350, t[0]); + Assert.AreEqual(342.61159581323676, t[1]); + Assert.AreEqual(331.53834637052490, t[2]); + Assert.AreEqual(328.79094438739287, t[3]); + Assert.AreEqual(328.10605667592347, t[4]); + Assert.AreEqual(327.93495792953500, t[5]); + Assert.AreEqual(327.89219094488620, t[6]); + Assert.AreEqual(327.88149968013374, t[7]); + Assert.AreEqual(327.87882689403440, t[8]); + Assert.AreEqual(327.87815869939020, t[9]); + Assert.AreEqual(327.87799165084670, t[10]); + Assert.AreEqual(327.87794988871800, t[11]); + Assert.AreEqual(327.87793944818645, t[12]); + Assert.AreEqual(327.87793683805364, t[13]); + Assert.AreEqual(327.87793618552050, t[14]); + Assert.AreEqual(327.87793602238645, t[15]); + Assert.AreEqual(327.87793598160340, t[16]); + Assert.AreEqual(327.87793597140626, t[17]); + Assert.AreEqual(327.87793596885720, t[18]); + Assert.AreEqual(327.87793596821960, t[19]); } [Test] @@ -97,7 +97,7 @@ double result = Math.Floor(poly.Simpson(0,1) * 1e7) / 1e7; // This test value was generated from Mathematica 5 - Assertion.AssertEquals(1.8963584, result); + Assert.AreEqual(1.8963584, result); } protected override Polynomial makePoly() Index: Polynomial.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUtil/SharpVectors/Polynomials/Polynomial.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Polynomial.cs 3 Aug 2003 18:29:24 -0000 1.1 +++ Polynomial.cs 20 Nov 2005 20:42:24 -0000 1.2 @@ -252,20 +252,20 @@ { Polynomial poly2 = new Polynomial(1, 2, 3, 0); - Assertion.AssertEquals(2, poly2.Degree); - Assertion.AssertEquals(1, poly2[0]); - Assertion.AssertEquals(2, poly2[1]); - Assertion.AssertEquals(3, poly2[2]); + Assert.AreEqual(2, poly2.Degree); + Assert.AreEqual(1, poly2[0]); + Assert.AreEqual(2, poly2[1]); + Assert.AreEqual(3, poly2[2]); } [Test] public void TestConstructor2() { - Assertion.AssertEquals(3, poly.Degree); - Assertion.AssertEquals(1, poly[0]); - Assertion.AssertEquals(2, poly[1]); - Assertion.AssertEquals(3, poly[2]); - Assertion.AssertEquals(4, poly[3]); + Assert.AreEqual(3, poly.Degree); + Assert.AreEqual(1, poly[0]); + Assert.AreEqual(2, poly[1]); + Assert.AreEqual(3, poly[2]); + Assert.AreEqual(4, poly[3]); } [Test] @@ -273,17 +273,17 @@ { Polynomial poly2 = new Polynomial(poly); - Assertion.AssertEquals(3, poly2.Degree); - Assertion.AssertEquals(1, poly2[0]); - Assertion.AssertEquals(2, poly2[1]); - Assertion.AssertEquals(3, poly2[2]); - Assertion.AssertEquals(4, poly2[3]); + Assert.AreEqual(3, poly2.Degree); + Assert.AreEqual(1, poly2[0]); + Assert.AreEqual(2, poly2[1]); + Assert.AreEqual(3, poly2[2]); + Assert.AreEqual(4, poly2[3]); } [Test] public virtual void TestEval() { - Assertion.AssertEquals(49, poly.Evaluate(2)); + Assert.AreEqual(49, poly.Evaluate(2)); } [Test] @@ -296,23 +296,23 @@ t[i] = poly.trapezoid(0, 1, i+1); } - Assertion.AssertEquals(5.500000000000000, t[0]); - Assertion.AssertEquals(4.375000000000000, t[1]); - Assertion.AssertEquals(4.093750000000000, t[2]); - Assertion.AssertEquals(4.023437500000000, t[3]); - Assertion.AssertEquals(4.005859375000000, t[4]); - Assertion.AssertEquals(4.001464843750000, t[5]); - Assertion.AssertEquals(4.000366210937500, t[6]); - Assertion.AssertEquals(4.000091552734375, t[7]); - Assertion.AssertEquals(4.000022888183594, t[8]); - Assertion.AssertEquals(4.000005722045898, t[9]); + Assert.AreEqual(5.500000000000000, t[0]); + Assert.AreEqual(4.375000000000000, t[1]); + Assert.AreEqual(4.093750000000000, t[2]); + Assert.AreEqual(4.023437500000000, t[3]); + Assert.AreEqual(4.005859375000000, t[4]); + Assert.AreEqual(4.001464843750000, t[5]); + Assert.AreEqual(4.000366210937500, t[6]); + Assert.AreEqual(4.000091552734375, t[7]); + Assert.AreEqual(4.000022888183594, t[8]); + Assert.AreEqual(4.000005722045898, t[9]); } [Test] public virtual void TestSimpson() { // This test value was generated from Mathematica 5 - Assertion.AssertEquals(4, poly.Simpson(0, 1)); + Assert.AreEqual(4, poly.Simpson(0, 1)); } protected virtual Polynomial makePoly() |