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
3cfa07da
Commit
3cfa07da
authored
Mar 21, 2012
by
Taddeus Kroes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added unit tests for earliers added logarithmic rules.
parent
68ce57a9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
4 deletions
+34
-4
src/rules/logarithmic.py
src/rules/logarithmic.py
+4
-2
tests/test_rules_logarithmic.py
tests/test_rules_logarithmic.py
+30
-2
No files found.
src/rules/logarithmic.py
View file @
3cfa07da
...
@@ -34,9 +34,11 @@ def match_constant_logarithm(node):
...
@@ -34,9 +34,11 @@ def match_constant_logarithm(node):
p
=
[]
p
=
[]
if
raised
==
1
:
if
raised
==
1
:
# log(1) -> 0
p
.
append
(
P
(
node
,
logarithm_of_one
))
p
.
append
(
P
(
node
,
logarithm_of_one
))
if
raised
==
base
:
if
raised
==
base
:
# log(a, a) -> log(a) / log(a) # -> 1
p
.
append
(
P
(
node
,
divide_same_base
))
p
.
append
(
P
(
node
,
divide_same_base
))
return
p
return
p
...
@@ -48,7 +50,7 @@ def logarithm_of_one(root, args):
...
@@ -48,7 +50,7 @@ def logarithm_of_one(root, args):
"""
"""
raised
,
base
=
root
raised
,
base
=
root
return
log
(
raised
)
/
log
(
base
)
return
L
(
0
)
MESSAGES
[
logarithm_of_one
]
=
_
(
'Logarithm of one reduces to zero.'
)
MESSAGES
[
logarithm_of_one
]
=
_
(
'Logarithm of one reduces to zero.'
)
...
@@ -63,7 +65,7 @@ def divide_same_base(root, args):
...
@@ -63,7 +65,7 @@ def divide_same_base(root, args):
return
log
(
raised
)
/
log
(
base
)
return
log
(
raised
)
/
log
(
base
)
MESSAGES
[
divide_same_base
]
=
_
(
'Apply log_b(a) -> log(a) / log(b).'
)
MESSAGES
[
divide_same_base
]
=
_
(
'Apply log_b(a) -> log(a) / log(b)
on {0}
.'
)
def
match_add_logarithms
(
node
):
def
match_add_logarithms
(
node
):
...
...
tests/test_rules_logarithmic.py
View file @
3cfa07da
...
@@ -23,7 +23,18 @@ class TestRulesLogarithmic(RulesTestCase):
...
@@ -23,7 +23,18 @@ class TestRulesLogarithmic(RulesTestCase):
self
.
assertEqualPos
(
match_constant_logarithm
(
root
),
self
.
assertEqualPos
(
match_constant_logarithm
(
root
),
[
P
(
root
,
divide_same_base
)])
[
P
(
root
,
divide_same_base
)])
def
test_logarithm_of_one
(
self
):
root
=
tree
(
'log 1'
)
self
.
assertEqual
(
logarithm_of_one
(
root
,
()),
0
)
def
test_divide_same_base
(
self
):
root
,
l5
,
l6
=
tree
(
'log(5, 6), 5, 6'
)
self
.
assertEqual
(
divide_same_base
(
root
,
()),
log
(
l5
)
/
log
(
l6
))
def
test_match_add_logarithms
(
self
):
def
test_match_add_logarithms
(
self
):
root
=
tree
(
'log a + ln b'
)
self
.
assertEqualPos
(
match_add_logarithms
(
root
),
[])
log_a
,
log_b
=
root
=
tree
(
'log a + log b'
)
log_a
,
log_b
=
root
=
tree
(
'log a + log b'
)
self
.
assertEqualPos
(
match_add_logarithms
(
root
),
self
.
assertEqualPos
(
match_add_logarithms
(
root
),
[
P
(
root
,
add_logarithms
,
(
Scope
(
root
),
log_a
,
log_b
))])
[
P
(
root
,
add_logarithms
,
(
Scope
(
root
),
log_a
,
log_b
))])
...
@@ -41,7 +52,24 @@ class TestRulesLogarithmic(RulesTestCase):
...
@@ -41,7 +52,24 @@ class TestRulesLogarithmic(RulesTestCase):
[
P
(
root
,
subtract_logarithms
,
(
Scope
(
root
),
log_b
,
log_a
))])
[
P
(
root
,
subtract_logarithms
,
(
Scope
(
root
),
log_b
,
log_a
))])
def
test_add_logarithms
(
self
):
def
test_add_logarithms
(
self
):
root
,
a
,
b
=
tree
(
'log a + log b, a, b
'
)
root
,
expect
=
tree
(
'log a + log b, log(ab)
'
)
log_a
,
log_b
=
root
log_a
,
log_b
=
root
self
.
assertEqual
(
add_logarithms
(
root
,
(
Scope
(
root
),
log_a
,
log_b
)),
self
.
assertEqual
(
add_logarithms
(
root
,
(
Scope
(
root
),
log_a
,
log_b
)),
log
(
a
*
b
))
expect
)
def
test_expand_negations
(
self
):
root
,
expect
=
tree
(
'-log(a) - log(b), -(log(a) + log(b))'
)
log_a
,
log_b
=
root
self
.
assertEqual
(
expand_negations
(
root
,
(
Scope
(
root
),
log_a
,
log_b
)),
expect
)
def
test_subtract_logarithms
(
self
):
root
,
expect
=
tree
(
'log(a) - log(b), log(a / b)'
)
loga
,
logb
=
root
self
.
assertEqual
(
subtract_logarithms
(
root
,
(
Scope
(
root
),
loga
,
logb
)),
expect
)
root
,
expect
=
tree
(
'-log(a) + log(b), log(b / a)'
)
loga
,
logb
=
root
self
.
assertEqual
(
subtract_logarithms
(
root
,
(
Scope
(
root
),
logb
,
loga
)),
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