Skip to content

Commit c2bd8c4

Browse files
shahriariravanianshahriariravanian
committed
formating
1 parent 9990b50 commit c2bd8c4

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎src/homotopy.jl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ partial_int_rules = [
133133
@rule 𝛷(~x, coth(~u)) => (log(sinh(~u)), ~u)
134134
# 1/trigonometric functions
135135
@rule 𝛷(~x, 1 /
136-
sin(~u)) => (log(csc(~u) + cot(~u)) + log(sin(~u)), ~u)
136+
sin(~u)) => (log(csc(~u) + cot(~u)) + log(sin(~u)), ~u)
137137
@rule 𝛷(~x, 1 /
138-
cos(~u)) => (log(sec(~u) + tan(~u)) + log(cos(~u)), ~u)
138+
cos(~u)) => (log(sec(~u) + tan(~u)) + log(cos(~u)), ~u)
139139
@rule 𝛷(~x, 1 / tan(~u)) => (log(sin(~u)) + log(tan(~u)), ~u)
140140
@rule 𝛷(~x, 1 / csc(~u)) => (cos(~u) + log(csc(~u)), ~u)
141141
@rule 𝛷(~x, 1 / sec(~u)) => (sin(~u) + log(sec(~u)), ~u)
@@ -163,7 +163,7 @@ partial_int_rules = [
163163
@rule 𝛷(~x, acoth(~u)) => (~u * acot(~u) + log(~u + 1), ~u)
164164
# logarithmic and exponential functions
165165
@rule 𝛷(~x,
166-
log(~u)) => (
166+
log(~u)) => (
167167
~u + ~u * log(~u) +
168168
sum(pow_minus_rule(~u, ~x, -1); init = one(~u)),
169169
~u)
@@ -176,18 +176,18 @@ partial_int_rules = [
176176
@rule 𝛷(~x, sqrt(~u)) => (
177177
sum(sqrt_rule(~u, ~x, 0.5); init = one(~u)), ~u)
178178
@rule 𝛷(~x, 1 /
179-
sqrt(~u)) => (
179+
sqrt(~u)) => (
180180
sum(sqrt_rule(~u, ~x, -0.5); init = one(~u)), ~u)
181181
# rational functions
182182
@rule 𝛷(~x,
183-
1 / ^(~u::is_univar_poly, ~k::is_pos_int)) => (
183+
1 / ^(~u::is_univar_poly, ~k::is_pos_int)) => (
184184
sum(pow_minus_rule(~u,
185185
~x,
186186
-~k);
187187
init = one(~u)),
188188
~u)
189189
@rule 𝛷(
190-
~x, 1 / ~u::is_univar_poly) => (
190+
~x, 1 / ~u::is_univar_poly) => (
191191
sum(pow_minus_rule(~u, ~x, -1); init = one(~u)),
192192
~u)
193193
@rule 𝛷(~x, ^(~u, -1)) => (log(~u) + ~u * log(~u), ~u)
@@ -245,7 +245,7 @@ function pow_minus_rule(p, x, k; abstol = 1e-8)
245245
end
246246

247247
function sqrt_rule(p, x, k)
248-
h = Any[p ^ k, p ^ (k + 1)]
248+
h = Any[p^k, p^(k + 1)]
249249

250250
Δ = diff(p, x)
251251
push!(h, log(Δ / 2 + sqrt(p)))

‎src/integral.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function integrate(eq, xx::Tuple; kwargs...)
122122
sol = integrate(eq, x; kwargs...)
123123

124124
if sol isa Tuple
125-
if !isequal(sol, 0) && sol[2] == 0
125+
if !isequal(first(sol), 0) && sol[2] == 0
126126
return substitute(first(sol), Dict(x => hi)) -
127127
substitute(first(sol), Dict(x => lo))
128128
else

‎src/rules.jl‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -110,27 +110,27 @@ trigs_rules = [@rule tan(~x) => sin(~x) / cos(~x)
110110
@rule csc(~x) => one(~x) / sin(~x)
111111
@rule cot(~x) => cos(~x) / sin(~x)
112112
@rule sin(~n::is_int_gt_one *
113-
~x) => sin((~n - 1) * ~x) * cos(~x) +
114-
cos((~n - 1) * ~x) * sin(~x)
113+
~x) => sin((~n - 1) * ~x) * cos(~x) +
114+
cos((~n - 1) * ~x) * sin(~x)
115115
@rule cos(~n::is_int_gt_one *
116-
~x) => cos((~n - 1) * ~x) * cos(~x) -
117-
sin((~n - 1) * ~x) * sin(~x)
116+
~x) => cos((~n - 1) * ~x) * cos(~x) -
117+
sin((~n - 1) * ~x) * sin(~x)
118118
@rule tan(~n::is_int_gt_one *
119-
~x) => (tan((~n - 1) * ~x) + tan(~x)) /
120-
(1 - tan((~n - 1) * ~x) * tan(~x))
119+
~x) => (tan((~n - 1) * ~x) + tan(~x)) /
120+
(1 - tan((~n - 1) * ~x) * tan(~x))
121121
@rule csc(~n::is_int_gt_one *
122-
~x) => sec((~n - 1) * ~x) * sec(~x) *
123-
csc((~n - 1) * ~x) * csc(~x) /
124-
(sec((~n - 1) * ~x) * csc(~x) +
125-
csc((~n - 1) * ~x) * sec(~x))
122+
~x) => sec((~n - 1) * ~x) * sec(~x) *
123+
csc((~n - 1) * ~x) * csc(~x) /
124+
(sec((~n - 1) * ~x) * csc(~x) +
125+
csc((~n - 1) * ~x) * sec(~x))
126126
@rule sec(~n::is_int_gt_one *
127-
~x) => sec((~n - 1) * ~x) * sec(~x) *
128-
csc((~n - 1) * ~x) * csc(~x) /
129-
(csc((~n - 1) * ~x) * csc(~x) -
130-
sec((~n - 1) * ~x) * sec(~x))
127+
~x) => sec((~n - 1) * ~x) * sec(~x) *
128+
csc((~n - 1) * ~x) * csc(~x) /
129+
(csc((~n - 1) * ~x) * csc(~x) -
130+
sec((~n - 1) * ~x) * sec(~x))
131131
@rule cot(~n::is_int_gt_one *
132-
~x) => (cot((~n - 1) * ~x) * cot(~x) - 1) /
133-
(cot((~n - 1) * ~x) + cot(~x))
132+
~x) => (cot((~n - 1) * ~x) * cot(~x) - 1) /
133+
(cot((~n - 1) * ~x) + cot(~x))
134134
@rule 1 / sin(~x) => csc(~x)
135135
@rule 1 / cos(~x) => sec(~x)
136136
@rule 1 / tan(~x) => cot(~x)
@@ -147,21 +147,21 @@ trigs_rules = [@rule tan(~x) => sin(~x) / cos(~x)
147147
@rule cos(~x + ~y) => cos(~x) * cos(~y) - sin(~x) * sin(~y)
148148
@rule tan(~x + ~y) => (tan(~x) + tan(~y)) / (1 - tan(~x) * tan(~y))
149149
@rule csc(~x +
150-
~y) => sec(~x) * sec(~y) * csc(~x) * csc(~y) /
151-
(sec(~x) * csc(~y) + csc(~x) * sec(~y))
150+
~y) => sec(~x) * sec(~y) * csc(~x) * csc(~y) /
151+
(sec(~x) * csc(~y) + csc(~x) * sec(~y))
152152
@rule sec(~x +
153-
~y) => sec(~x) * sec(~y) * csc(~x) * csc(~y) /
154-
(csc(~x) * csc(~y) - sec(~x) * sec(~y))
153+
~y) => sec(~x) * sec(~y) * csc(~x) * csc(~y) /
154+
(csc(~x) * csc(~y) - sec(~x) * sec(~y))
155155
@rule cot(~x + ~y) => (cot(~x) * cot(~y) - 1) / (cot(~x) + cot(~y))
156156
@rule sin(~x - ~y) => sin(~x) * cos(~y) - cos(~x) * sin(~y)
157157
@rule cos(~x - ~y) => cos(~x) * cos(~y) + sin(~x) * sin(~y)
158158
@rule tan(~x - ~y) => (tan(~x) - tan(~y)) / (1 + tan(~x) * tan(~y))
159159
@rule csc(~x -
160-
~y) => sec(~x) * sec(~y) * csc(~x) * csc(~y) /
161-
(sec(~x) * csc(~y) - csc(~x) * sec(~y))
160+
~y) => sec(~x) * sec(~y) * csc(~x) * csc(~y) /
161+
(sec(~x) * csc(~y) - csc(~x) * sec(~y))
162162
@rule sec(~x -
163-
~y) => sec(~x) * sec(~y) * csc(~x) * csc(~y) /
164-
(csc(~x) * csc(~y) + sec(~x) * sec(~y))
163+
~y) => sec(~x) * sec(~y) * csc(~x) * csc(~y) /
164+
(csc(~x) * csc(~y) + sec(~x) * sec(~y))
165165
@rule cot(~x - ~y) => (cot(~x) * cot(~y) + 1) / (cot(~x) - cot(~y))
166166

167167
# @rule sin(2*~x) => 2*sin(~x)*cos(~x)
@@ -250,8 +250,8 @@ rational_rules = [@rule Ω(+(~~xs)) => sum(map(Ω, ~~xs))
250250
decompose_rational(~x),
251251
-~k))
252252
@rule Ω(~x /
253-
^(~y::is_poly, ~k::is_pos_int)) => expand(~x *
254-
^(
253+
^(~y::is_poly, ~k::is_pos_int)) => expand(~x *
254+
^(
255255
decompose_rational(~y),
256256
~k))
257257
@rule Ω(~x / ~y::is_poly) => expand(~x * decompose_rational(~y))

0 commit comments

Comments
 (0)