# HG changeset patch # User Nicolas Saunier # Date 1432677322 -7200 # Node ID ab3fdff42624be02af23ef015e20deff5acf6fa7 # Parent 01b89182891aecf3df24e055471ddc4aaa0dafb7 corrected old format for Point.__str__ diff -r 01b89182891a -r ab3fdff42624 python/moving.py --- a/python/moving.py Tue May 26 18:16:51 2015 +0200 +++ b/python/moving.py Tue May 26 23:55:22 2015 +0200 @@ -168,7 +168,7 @@ self.y = y def __str__(self): - return '(%f,%f)'%(self.x,self.y) + return '({:f},{:f})'.format(self.x,self.y) def __repr__(self): return self.__str__() diff -r 01b89182891a -r ab3fdff42624 python/utils.py --- a/python/utils.py Tue May 26 18:16:51 2015 +0200 +++ b/python/utils.py Tue May 26 23:55:22 2015 +0200 @@ -321,7 +321,7 @@ def frenchify(s, displayNames): return s -def kruskalWallis(data, dependentVariable, independentVariable, plotFigure = False, filenamePrefix = None, figureFileType = 'pdf', saveLatex = False): +def kruskalWallis(data, dependentVariable, independentVariable, plotFigure = False, filenamePrefix = None, figureFileType = 'pdf', saveLatex = False, displayNames = {}): '''Studies the influence of (nominal) independent variable over the dependent variable Makes tests if the conditional distributions are normal @@ -348,9 +348,10 @@ plt.savefig(filenamePrefix+'-{}-{}.{}'.format(dependentVariable, independentVariable, figureFileType)) table = tmp.groupby([independentVariable])[dependentVariable].describe().unstack().sort(['50%'], ascending = False) if saveLatex: - out.write('\begin{table}[htp!]') + out.write('\\begin{table}[htp!]\n') out.write(frenchify(table.to_latex(), displayNames)) - out.write('\end{table}[htp!]') + out.write('\caption{Test}\n' + +'\end{table}[htp!]') else: print table return kruskal(*[tmp.loc[tmp[independentVariable] == x, dependentVariable] for x in independentVariableValues])