Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix HARK GUI issue #444

Merged
merged 4 commits into from
Dec 10, 2019
Merged

Fix HARK GUI issue #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fae087
fix matplotlib import in non-GUI environment
MridulS Dec 5, 2019
2012e5b
remove import of BayerLuetticke into namespace
MridulS Dec 5, 2019
da98174
Merge branch 'master' into matplotlib_gui_fix
llorracc Dec 5, 2019
e0b85a0
Merge branch 'master' into matplotlib_gui_fix
Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions HARK/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@
from .core import *

__version__ = '0.10.2'

from .BayerLuetticke import *
14 changes: 8 additions & 6 deletions HARK/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
import warnings
import numpy as np # Python's numeric library, abbreviated "np"
import math
try:
import matplotlib.pyplot as plt # Python's plotting library
except ImportError:
import sys
exception_type, value, traceback = sys.exc_info()
raise ImportError('HARK must be used in a graphical environment.', exception_type, value, traceback)
# try:
# import matplotlib.pyplot as plt # Python's plotting library
# except ImportError:
# import sys
# exception_type, value, traceback = sys.exc_info()
# raise ImportError('HARK must be used in a graphical environment.', exception_type, value, traceback)
import scipy.stats as stats # Python's statistics library
from scipy.interpolate import interp1d
from scipy.special import erf, erfc
Expand Down Expand Up @@ -1226,6 +1226,7 @@ def plotFuncs(functions,bottom,top,N=1000,legend_kwds = None):
-------
none
'''
import matplotlib.pyplot as plt
if type(functions)==list:
function_list = functions
else:
Expand Down Expand Up @@ -1261,6 +1262,7 @@ def plotFuncsDer(functions,bottom,top,N=1000,legend_kwds = None):
-------
none
'''
import matplotlib.pyplot as plt
if type(functions)==list:
function_list = functions
else:
Expand Down