Skip to content

Commit

Permalink
Fixes #1330
Browse files Browse the repository at this point in the history
  • Loading branch information
ShikharJ committed Oct 2, 2017
1 parent 0270ed6 commit 1716ceb
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 0 deletions.
28 changes: 28 additions & 0 deletions symengine/pow.cpp
Expand Up @@ -164,6 +164,34 @@ RCP<const Basic> pow(const RCP<const Basic> &a, const RCP<const Basic> &b)
RCP<const Pow> A = rcp_static_cast<const Pow>(a);
return pow(A->get_base(), mul(A->get_exp(), b));
}
if (eq(*a, *E)) {
if (is_a<Mul>(*b)
and is_a_Complex(*down_cast<const Mul &>(*b).get_coef())) {
const map_basic_basic &dict = down_cast<const Mul &>(*b).get_dict();
if (dict.size() == 1) {
for (const auto &p : dict) {
if (eq(*p.first, *pi) and eq(*p.second, *one)) {
return add(cos(mul(mul(I, minus_one), b)),
mul(I, sin(mul(mul(I, minus_one), b))));
}
}
}
} else if (is_a<Add>(*b)) {
const umap_basic_num &dict = down_cast<const Add &>(*b).get_dict();
umap_basic_num new_dict;
RCP<const Number> coef = down_cast<const Add &>(*b).get_coef();
RCP<const Basic> s = one;
for (const auto &p : dict) {
if (eq(*p.first, *pi) and is_a_Complex(*p.second)) {
s = exp(mul(p.first, p.second));
} else {
Add::dict_add_term(new_dict, p.second, p.first);
}
}
return mul(s, make_rcp<const Pow>(
a, Add::from_dict(coef, std::move(new_dict))));
}
}
return make_rcp<const Pow>(a, b);
}

Expand Down
30 changes: 30 additions & 0 deletions symengine/tests/basic/test_arit.cpp
Expand Up @@ -987,6 +987,36 @@ TEST_CASE("Pow: arit", "[arit]")
r1 = pow(mul(sqrt(mul(y, x)), x), i2);
r2 = mul(pow(x, i3), y);
REQUIRE(eq(*r1, *r2));

r1 = exp(mul(I, x));
r2 = pow(E, mul(I, x));
REQUIRE(eq(*r1, *r2));

r1 = exp(mul(I, pi));
r2 = pow(E, mul(I, pi));
REQUIRE(eq(*r1, *r2));

r1 = exp(mul(I, pi));
REQUIRE(eq(*r1, *minus_one));

r1 = exp(mul(mul(I, minus_one), pi));
REQUIRE(eq(*r1, *minus_one));

r1 = exp(div(mul(I, pi), integer(2)));
REQUIRE(eq(*r1, *I));

r1 = exp(mul(div(mul(I, pi), integer(2)), minus_one));
REQUIRE(eq(*r1, *mul(I, minus_one)));

r1 = div(exp(mul(mul(I, pi), x)), exp(x));
REQUIRE(r1->__str__() == "exp(-x + I*x*pi)");

r1 = exp(add(div(mul(I, pi), integer(2)), x));
r2 = mul(I, exp(x));
REQUIRE(eq(*r1, *r2));

r1 = exp(add(div(mul(I, pi), integer(10)), x));
REQUIRE(r1->__str__() == "exp(x)*(I*sin((1/10)*pi) + cos((1/10)*pi))");
}

TEST_CASE("Log: arit", "[arit]")
Expand Down

0 comments on commit 1716ceb

Please sign in to comment.