Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
c79843c5
Commit
c79843c5
authored
Apr 26, 2013
by
Sarina Canelake
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add factorial as a default function for formula response
parent
72dfd499
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
common/lib/capa/capa/calc.py
+9
-2
No files found.
common/lib/capa/capa/calc.py
View file @
c79843c5
...
...
@@ -24,7 +24,9 @@ default_functions = {'sin': numpy.sin,
'arccos'
:
numpy
.
arccos
,
'arcsin'
:
numpy
.
arcsin
,
'arctan'
:
numpy
.
arctan
,
'abs'
:
numpy
.
abs
'abs'
:
numpy
.
abs
,
'fact'
:
math
.
factorial
,
'factorial'
:
math
.
factorial
}
default_variables
=
{
'j'
:
numpy
.
complex
(
0
,
1
),
'e'
:
numpy
.
e
,
...
...
@@ -246,4 +248,9 @@ if __name__ == '__main__':
print
evaluator
({},
{},
"5+1*j"
)
print
evaluator
({},
{},
"j||1"
)
print
evaluator
({},
{},
"e^(j*pi)"
)
print
evaluator
({},
{},
"5+7 QWSEKO"
)
print
evaluator
({},
{},
"fact(5)"
)
print
evaluator
({},
{},
"factorial(5)"
)
try
:
print
evaluator
({},
{},
"5+7 QWSEKO"
)
except
UndefinedVariable
:
print
"Successfully caught undefined variable"
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