Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
trs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Taddeüs Kroes
trs
Commits
4e488c46
Commit
4e488c46
authored
Nov 19, 2012
by
Taddeüs Kroes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed an exception that occured when using a non-numeric logarithmic base
parent
eb08c96e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
src/rules/logarithmic.py
src/rules/logarithmic.py
+5
-3
tests/test_rules_logarithmic.py
tests/test_rules_logarithmic.py
+9
-1
No files found.
src/rules/logarithmic.py
View file @
4e488c46
...
...
@@ -253,10 +253,12 @@ def match_factor_out_exponent(node):
p
.
append
(
P
(
node
,
factor_out_exponent
))
elif
exp
.
is_numeric
()
and
not
exp
.
negated
:
b
,
a
=
exp
.
value
,
base
.
value
y
=
int
(
round
(
math
.
log
(
b
,
a
)))
if
b
==
a
**
y
:
p
.
append
(
P
(
node
,
make_raised_base
,
(
y
,)))
if
not
isinstance
(
a
,
str
)
and
not
isinstance
(
b
,
str
):
y
=
int
(
round
(
math
.
log
(
b
,
a
)))
if
b
==
a
**
y
:
p
.
append
(
P
(
node
,
make_raised_base
,
(
y
,)))
return
p
...
...
tests/test_rules_logarithmic.py
View file @
4e488c46
...
...
@@ -11,7 +11,8 @@
# details.
#
# You should have received a copy of the GNU Affero General Public License
# along with TRS. If not, see <http://www.gnu.org/licenses/>.
import
math
from
src.rules.logarithmic
import
log
,
match_constant_logarithm
,
\
base_equals_raised
,
logarithm_of_one
,
divide_same_base
,
\
match_add_logarithms
,
add_logarithms
,
expand_negations
,
\
...
...
@@ -176,6 +177,13 @@ class TestRulesLogarithmic(RulesTestCase):
root
=
tree
(
'log(99)'
)
self
.
assertEqualPos
(
match_factor_out_exponent
(
root
),
[])
def
test_match_factor_out_exponent_make_raised_base_string
(
self
):
root
=
tree
(
'log_a(2)'
)
self
.
assertEqualPos
(
match_factor_out_exponent
(
root
),
[])
root
=
tree
(
'log_e(%s)'
%
(
math
.
e
**
2
))
self
.
assertEqualPos
(
match_factor_out_exponent
(
root
),
[])
def
test_split_negative_exponent
(
self
):
root
,
expect
=
tree
(
'log(a ^ -b), log((a ^ b) ^ -1)'
)
self
.
assertEqual
(
split_negative_exponent
(
root
,
()),
expect
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment