@@ -14,109 +14,109 @@ class CompareTest : TestBase
1414 [ Test ]
1515 public void TestQuotient ( )
1616 {
17- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 5 ) , Eval ( "(quotient 5 1)" ) ) ;
18- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 3 ) , Eval ( "(quotient 13 4)" ) ) ;
19- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 4 ) , Eval ( "(quotient -13 4)" ) ) ;
17+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 5 ) , Eval ( "(quotient 5 1)" ) ) ;
18+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 3 ) , Eval ( "(quotient 13 4)" ) ) ;
19+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 4 ) , Eval ( "(quotient -13 4)" ) ) ;
2020 }
2121
2222 [ Test ]
2323 public void TestRemainder ( )
2424 {
25- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(remainder 13 4)" ) ) ;
26- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 1 ) , Eval ( "(remainder -13 4)" ) ) ;
27- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(remainder 13 -4)" ) ) ;
28- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 1 ) , Eval ( "(remainder -13 -4)" ) ) ;
25+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(remainder 13 4)" ) ) ;
26+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 1 ) , Eval ( "(remainder -13 4)" ) ) ;
27+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(remainder 13 -4)" ) ) ;
28+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 1 ) , Eval ( "(remainder -13 -4)" ) ) ;
2929 }
3030
3131 [ Test ]
3232 public void TestModulo ( )
3333 {
34- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(modulo 13 4)" ) ) ;
35- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 3 ) , Eval ( "(modulo -13 4)" ) ) ;
36- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 3 ) , Eval ( "(modulo 13 -4)" ) ) ;
37- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 1 ) , Eval ( "(modulo -13 -4)" ) ) ;
34+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(modulo 13 4)" ) ) ;
35+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 3 ) , Eval ( "(modulo -13 4)" ) ) ;
36+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 3 ) , Eval ( "(modulo 13 -4)" ) ) ;
37+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 1 ) , Eval ( "(modulo -13 -4)" ) ) ;
3838 }
3939
4040 [ Test ]
4141 public void TestGcd ( )
4242 {
43- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 4 ) , Eval ( "(gcd 32 -36 32)" ) ) ;
44- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 32 ) , Eval ( "(gcd 32)" ) ) ;
45- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 0 ) , Eval ( "(gcd)" ) ) ;
43+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 4 ) , Eval ( "(gcd 32 -36 32)" ) ) ;
44+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 32 ) , Eval ( "(gcd 32)" ) ) ;
45+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 0 ) , Eval ( "(gcd)" ) ) ;
4646 }
4747
4848 [ Test ]
4949 public void TestLcm ( )
5050 {
51- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 288 ) , Eval ( "(lcm 32 -36)" ) ) ;
52- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 32 ) , Eval ( "(lcm 32)" ) ) ;
53- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(lcm)" ) ) ;
51+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 288 ) , Eval ( "(lcm 32 -36)" ) ) ;
52+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 32 ) , Eval ( "(lcm 32)" ) ) ;
53+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(lcm)" ) ) ;
5454 }
5555
5656 [ Test ]
5757 public void TestFloor ( )
5858 {
59- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(floor 1.5)" ) ) ;
60- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(floor 1)" ) ) ;
61- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 2000 ) , Eval ( "(floor 2000.00001)" ) ) ;
62- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 1 ) , Eval ( "(floor -.9)" ) ) ;
63- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 100 ) , Eval ( "(floor -99.5)" ) ) ;
64- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 100 ) , Eval ( "(floor -100)" ) ) ;
59+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(floor 1.5)" ) ) ;
60+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(floor 1)" ) ) ;
61+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 2000 ) , Eval ( "(floor 2000.00001)" ) ) ;
62+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 1 ) , Eval ( "(floor -0 .9)" ) ) ;
63+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 100 ) , Eval ( "(floor -99.5)" ) ) ;
64+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 100 ) , Eval ( "(floor -100)" ) ) ;
6565 }
6666
6767 [ Test ]
6868 public void TestCeiling ( )
6969 {
70- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 2 ) , Eval ( "(ceiling 1.5)" ) ) ;
71- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(ceiling 1)" ) ) ;
72- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 2001 ) , Eval ( "(ceiling 2000.00001)" ) ) ;
73- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 0 ) , Eval ( "(ceiling -.9)" ) ) ;
74- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 99 ) , Eval ( "(ceiling -99.5)" ) ) ;
75- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 100 ) , Eval ( "(ceiling -100)" ) ) ;
70+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 2 ) , Eval ( "(ceiling 1.5)" ) ) ;
71+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(ceiling 1)" ) ) ;
72+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 2001 ) , Eval ( "(ceiling 2000.00001)" ) ) ;
73+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 0 ) , Eval ( "(ceiling -0 .9)" ) ) ;
74+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 99 ) , Eval ( "(ceiling -99.5)" ) ) ;
75+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 100 ) , Eval ( "(ceiling -100)" ) ) ;
7676 }
7777
7878 [ Test ]
7979 public void TestTruncate ( )
8080 {
81- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(truncate 1.5)" ) ) ;
82- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(truncate 1)" ) ) ;
83- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 2000 ) , Eval ( "(truncate 2000.00001)" ) ) ;
84- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 0 ) , Eval ( "(truncate -.9)" ) ) ;
85- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 99 ) , Eval ( "(truncate -99.5)" ) ) ;
86- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 100 ) , Eval ( "(truncate -100)" ) ) ;
81+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(truncate 1.5)" ) ) ;
82+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(truncate 1)" ) ) ;
83+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 2000 ) , Eval ( "(truncate 2000.00001)" ) ) ;
84+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 0 ) , Eval ( "(truncate -0 .9)" ) ) ;
85+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 99 ) , Eval ( "(truncate -99.5)" ) ) ;
86+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 100 ) , Eval ( "(truncate -100)" ) ) ;
8787 }
8888
8989 [ Test ]
9090 public void TestRound ( )
9191 {
92- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 2 ) , Eval ( "(round 1.5)" ) ) ;
93- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 1 ) , Eval ( "(round 1)" ) ) ;
94- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 2000 ) , Eval ( "(round 2000.00001)" ) ) ;
95- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 1 ) , Eval ( "(round -.9)" ) ) ;
96- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 100 ) , Eval ( "(round -99.5)" ) ) ;
97- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 100 ) , Eval ( "(round -100)" ) ) ;
98- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 4 ) , Eval ( "(round 4.4)" ) ) ;
99- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 5 ) , Eval ( "(round 4.5)" ) ) ;
100- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 5 ) , Eval ( "(round 4.6)" ) ) ;
101- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 4 ) , Eval ( "(round -4.4)" ) ) ;
102- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 5 ) , Eval ( "(round -4.5)" ) ) ;
103- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 5 ) , Eval ( "(round -4.6)" ) ) ;
92+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 2 ) , Eval ( "(round 1.5)" ) ) ;
93+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 1 ) , Eval ( "(round 1)" ) ) ;
94+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 2000 ) , Eval ( "(round 2000.00001)" ) ) ;
95+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 1 ) , Eval ( "(round -0 .9)" ) ) ;
96+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 100 ) , Eval ( "(round -99.5)" ) ) ;
97+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 100 ) , Eval ( "(round -100)" ) ) ;
98+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 4 ) , Eval ( "(round 4.4)" ) ) ;
99+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 4 ) , Eval ( "(round 4.5)" ) ) ;
100+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 5 ) , Eval ( "(round 4.6)" ) ) ;
101+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 4 ) , Eval ( "(round -4.4)" ) ) ;
102+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 4 ) , Eval ( "(round -4.5)" ) ) ;
103+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 5 ) , Eval ( "(round -4.6)" ) ) ;
104104 }
105105
106106 [ Test ]
107107 public void TestMinMax ( )
108108 {
109- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 3 ) , Eval ( "(max 0 1 2 3)" ) ) ;
110- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 3 ) , Eval ( "(max -1 1 2 3)" ) ) ;
111- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 0 ) , Eval ( "(min 0 1 2 3)" ) ) ;
112- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( - 1 ) , Eval ( "(min -1 1 2 3)" ) ) ;
109+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 3 ) , Eval ( "(max 0 1 2 3)" ) ) ;
110+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 3 ) , Eval ( "(max -1 1 2 3)" ) ) ;
111+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 0 ) , Eval ( "(min 0 1 2 3)" ) ) ;
112+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( - 1 ) , Eval ( "(min -1 1 2 3)" ) ) ;
113113 }
114114
115115 [ Test ]
116116 public void TestAbs ( )
117117 {
118- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 3 ) , Eval ( "(abs 3)" ) ) ;
119- Assert . AreEqual ( AtomHelper . NumberFromBigDecimal ( 3 ) , Eval ( "(abs -3)" ) ) ;
118+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 3 ) , Eval ( "(abs 3)" ) ) ;
119+ Assert . AreEqual ( AtomHelper . NumberFromComplex ( 3 ) , Eval ( "(abs -3)" ) ) ;
120120 }
121121
122122 [ Test ]
@@ -139,7 +139,7 @@ public void TestIncreasing()
139139 public void TestDecreasing ( )
140140 {
141141 Assert . AreEqual ( AtomHelper . True , Eval ( "(> 6 5 4 3 2 1)" ) ) ;
142- Assert . AreEqual ( AtomHelper . True , Eval ( "(> 1.111 1.11. 1.1 1.0)" ) ) ;
142+ Assert . AreEqual ( AtomHelper . True , Eval ( "(> 1.111 1.11 1.1 1.0)" ) ) ;
143143 Assert . AreEqual ( AtomHelper . False , Eval ( "(> 2 2 1)" ) ) ;
144144 }
145145
0 commit comments