@@ -102,12 +102,12 @@ public static void main(String[] args) {
102102 check ("ROUND(3.14159, 2)" , "ROUND(3.14159, 2)" , d ("3.14" ));
103103 check ("FLOOR(3.9)" , "FLOOR(3.9)" , d ("3" ));
104104 check ("CEILING(3.1)" , "CEILING(3.1)" , d ("4" ));
105- check ("LOG(~e)" , "LOG(2.718281828)" , d ("0.9999999993 " ));
105+ check ("LOG(~e)" , "LOG(2.718281828)" , d ("0.9999999998 " ));
106106 check ("LOG10(100)" , "LOG10(100)" , d ("2" ));
107107 check ("SIN(0)" , "SIN(0)" , d ("0" ));
108108 check ("COS(0)" , "COS(0)" , d ("1" ));
109109 check ("TAN(0)" , "TAN(0)" , d ("0" ));
110- check ("EXP(1) " , "EXP(1) " , d ("2.7182818285" ));
110+ check ("e^1 " , "2.718281828459045^1 " , d ("2.7182818285" ));
111111 check ("FACT(5)" , "FACT(5)" , d ("120" ));
112112 check ("MIN" , "MIN(3, 1, 4, 2)" , d ("1" ));
113113 check ("MAX" , "MAX(3, 1, 4, 2)" , d ("4" ));
@@ -116,8 +116,8 @@ public static void main(String[] args) {
116116 check ("IF 1>0" , "IF(1>0, 100, 0)" , d ("100" ));
117117 check ("IF 1==1" , "IF(1==1, 200, 0)" , d ("200" ));
118118 check ("IF 1!=2" , "IF(1!=2, 300, 0)" , d ("300" ));
119- check ("IF AND" , "IF(1<2 AND 2<3, 400, 0)" , d ("400" ));
120- check ("IF OR" , "IF(1>2 OR 2<3, 500, 0)" , d ("500" ));
119+ check ("IF AND" , "IF(1<2 && 2<3, 400, 0)" , d ("400" ));
120+ check ("IF OR" , "IF(1>2 || 2<3, 500, 0)" , d ("500" ));
121121 check ("IF NOT" , "IF(NOT(1>2), 600, 0)" , d ("600" ));
122122
123123 System .out .println ("\n --- SIGMA ---" );
@@ -131,8 +131,8 @@ public static void main(String[] args) {
131131 check ("SIGMA(5,1,\" i\" ) start>end" , "SIGMA(5, 1, \" i\" )" , d ("0" ));
132132
133133 System .out .println ("\n --- SIGMA advanced ---" );
134- check ("SIGMA + EXP " , "SIGMA(1, 5, \" EXP (-0.1*i)\" )" ,
135- d ("4.4959131450 " ));
134+ check ("SIGMA + exponential " , "SIGMA(1, 5, \" 2.718281828459045^ (-0.1*i)\" )" ,
135+ d ("3.7412370975 " ));
136136 check ("SIGMA + SQRT" , "SIGMA(1, 9, \" SQRT(i)\" )" ,
137137 d ("19.3060005260" ));
138138 check ("SIGMA + IF" , "SIGMA(1, 10, \" IF(i%2==0, i, 0)\" )" ,
@@ -141,10 +141,10 @@ public static void main(String[] args) {
141141 d ("1000" ));
142142
143143 System .out .println ("\n --- Article formulas ---" );
144- check ("e^{-lambda*n}" , "EXP (-0.1*10)" , d ("0.3678794412" ));
144+ check ("e^{-lambda*n}" , "2.718281828459045^ (-0.1*10)" , d ("0.3678794412" ));
145145 check ("ROUND(pi,2)" , "ROUND(3.14159, 2)" , d ("3.14" ));
146146 check ("FLOOR" , "FLOOR(3.9)" , d ("3" ));
147- check ("1-e^{-ln}" , "1-EXP (-0.1*5)" , d ("0.3934693403" ));
147+ check ("1-e^{-ln}" , "1-2.718281828459045^ (-0.1*5)" , d ("0.3934693403" ));
148148 check ("(t-u)^6/(2s^2)" ,"(10-5)^6/(2*2^2)" , d ("1953.125" ));
149149
150150 System .out .println ("\n " + "=" .repeat (40 ));
0 commit comments