fix test cosh^2(x)-sinh^2(x)=1

disabled sin(asin(time))=time test Belonging to [master]: - OpenModelica/OMCompiler#2023 - OpenModelica/OpenModelica-testsuite#783
OpenModelica · Nov 16, 2017 · 763095f · 763095f
1 parent 4d95b57
commit 763095f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/flattening/modelica/built-in-functions/TrigIdentity.mo b/flattening/modelica/built-in-functions/TrigIdentity.mo
@@ -10,7 +10,7 @@ end TrigIdentity;
 // Result:
 // class TrigIdentity
 //   Real x = 1.0;
-//   Real y = time;
+//   Real y = sin(asin(time));
 //   Real z = sin(2.0 * time);
 // end TrigIdentity;
 // endResult
diff --git a/openmodelica/bootstrapping/SimplifyTest.mo b/openmodelica/bootstrapping/SimplifyTest.mo
@@ -169,13 +169,13 @@ package SimplifyTest "Run ExpressionSimplify.simplify on some sample expressions
     Exp Exp36_2 = BINARY(cosrx,mulr,sinrx) "sin(2*x) = 2*sin(x)*cos(x)";
 
     Exp Exp37_1 = BINARY(BINARY(sinrx,powr,RCONST(2.0)),addr,BINARY(cosrx,powr,RCONST(2.0))) "sin^2 + cos^2 = 1";
-    Exp Exp37_2 = BINARY(BINARY(cosrx,powr,RCONST(2.0)),addr,BINARY(sinrx,powr,RCONST(2.0))) "sin^2 + cos^2 = 1";
+    Exp Exp37_2 = BINARY(BINARY(cosrx,powr,RCONST(2.0)),addr,BINARY(sinrx,powr,RCONST(2.0))) "cos^2 + sin^2 = 1";
 
     Exp Exp38_1 = BINARY(cosrx, mulr, tanrx) "sin(x)*tan(x)";
     Exp Exp38_2 = BINARY(tanrx, mulr, cosrx) "sin(x)*tan(x)";
 
-    Exp Exp39_1 = BINARY(BINARY(sinhrx,powr,RCONST(2.0)),addr,BINARY(coshrx,powr,RCONST(2.0))) "sinh^2 + cosh^2 = 1";
-    Exp Exp39_2 = BINARY(BINARY(coshrx,powr,RCONST(2.0)),addr,BINARY(sinhrx,powr,RCONST(2.0))) "sinh^2 + cosh^2 = 1";
+    Exp Exp39_1 = BINARY(BINARY(coshrx,powr,RCONST(2.0)),addr,UNARY(usubr,BINARY(sinhrx,powr,RCONST(2.0)))) "cosh^2(x) + (-sinh^2(x)) = 1";
+    Exp Exp39_2 = BINARY(UNARY(usubr,BINARY(sinhrx,powr,RCONST(2.0))),addr,BINARY(coshrx,powr,RCONST(2.0))) "(-sinh^2(x)) + cosh^2(x) = 1";
 
     Exp Exp40_1 = BINARY(cosrx, mulr, tanrx) "tanh(x)*cosh(x) = sinh(x)";
     Exp Exp40_2 = BINARY(tanrx, mulr, cosrx) "tanh(x)*cosh(x) = sinh(x)";

diff --git a/openmodelica/bootstrapping/SimplifyTest.mos b/openmodelica/bootstrapping/SimplifyTest.mos
@@ -121,8 +121,8 @@ getErrorString();
 // simplify(cos(x) ^ 2.0 + sin(x) ^ 2.0) = 1.0
 // simplify(cos(x) * tan(x)) = sin(x)
 // simplify(tan(x) * cos(x)) = sin(x)
-// simplify(sinh(x) ^ 2.0 + cosh(x) ^ 2.0) = 1.0
-// simplify(cosh(x) ^ 2.0 + sinh(x) ^ 2.0) = 1.0
+// simplify(cosh(x) ^ 2.0 + (-sinh(x) ^ 2.0)) = 1.0
+// simplify((-sinh(x) ^ 2.0) + cosh(x) ^ 2.0) = 1.0
 // simplify(cos(x) * tan(x)) = sin(x)
 // simplify(tan(x) * cos(x)) = sin(x)
 // simplify(x + (-y)) = x - y