removed imports of files the are not added to the repo.

This commit is contained in:
James Hensman 2014-04-23 11:03:57 +00:00
parent 90ba9a44eb
commit eca5577260
2 changed files with 16 additions and 17 deletions

View file

@ -7,16 +7,17 @@ from student_t import StudentT
from likelihood import Likelihood from likelihood import Likelihood
from mixed_noise import MixedNoise from mixed_noise import MixedNoise
# TODO need to fix this in a config file. # TODO need to fix this in a config file.
try: # TODO need to add the files to the git repo!
import sympy as sym #try:
sympy_available=True #import sympy as sym
except ImportError: #sympy_available=True
sympy_available=False #except ImportError:
if sympy_available: #sympy_available=False
# These are likelihoods that rely on symbolic. #if sympy_available:
from symbolic import Symbolic ## These are likelihoods that rely on symbolic.
from sstudent_t import SstudentT #from symbolic import Symbolic
from negative_binomial import Negative_binomial #from sstudent_t import SstudentT
from skew_normal import Skew_normal #from negative_binomial import Negative_binomial
from skew_exponential import Skew_exponential ##from skew_normal import Skew_normal
#from skew_exponential import Skew_exponential
#from null_category import Null_category #from null_category import Null_category

View file

@ -16,10 +16,9 @@ def ax_default(fignum, ax):
def meanplot(x, mu, color=Tango.colorsHex['darkBlue'], ax=None, fignum=None, linewidth=2,**kw): def meanplot(x, mu, color=Tango.colorsHex['darkBlue'], ax=None, fignum=None, linewidth=2,**kw):
_, axes = ax_default(fignum, ax) _, axes = ax_default(fignum, ax)
#here's the mean
return axes.plot(x,mu,color=color,linewidth=linewidth,**kw) return axes.plot(x,mu,color=color,linewidth=linewidth,**kw)
def gpplot(x,mu,lower,upper,edgecol=Tango.colorsHex['darkBlue'],fillcol=Tango.colorsHex['lightBlue'],ax=None,fignum=None,xlabel='x',ylabel='y',**kwargs): def gpplot(x, mu, lower, upper, edgecol=Tango.colorsHex['darkBlue'], fillcol=Tango.colorsHex['lightBlue'], ax=None, fignum=None, **kwargs):
_, axes = ax_default(fignum, ax) _, axes = ax_default(fignum, ax)
mu = mu.flatten() mu = mu.flatten()
@ -42,9 +41,6 @@ def gpplot(x,mu,lower,upper,edgecol=Tango.colorsHex['darkBlue'],fillcol=Tango.co
plots.append(meanplot(x, upper,color=edgecol,linewidth=0.2,ax=axes)) plots.append(meanplot(x, upper,color=edgecol,linewidth=0.2,ax=axes))
plots.append(meanplot(x, lower,color=edgecol,linewidth=0.2,ax=axes)) plots.append(meanplot(x, lower,color=edgecol,linewidth=0.2,ax=axes))
axes.set_xlabel(xlabel)
axes.set_ylabel(ylabel)
return plots return plots
@ -53,11 +49,13 @@ def removeRightTicks(ax=None):
for i, line in enumerate(ax.get_yticklines()): for i, line in enumerate(ax.get_yticklines()):
if i%2 == 1: # odd indices if i%2 == 1: # odd indices
line.set_visible(False) line.set_visible(False)
def removeUpperTicks(ax=None): def removeUpperTicks(ax=None):
ax = ax or pb.gca() ax = ax or pb.gca()
for i, line in enumerate(ax.get_xticklines()): for i, line in enumerate(ax.get_xticklines()):
if i%2 == 1: # odd indices if i%2 == 1: # odd indices
line.set_visible(False) line.set_visible(False)
def fewerXticks(ax=None,divideby=2): def fewerXticks(ax=None,divideby=2):
ax = ax or pb.gca() ax = ax or pb.gca()
ax.set_xticks(ax.get_xticks()[::divideby]) ax.set_xticks(ax.get_xticks()[::divideby])