Mercurial > hg > nsaunier > traffic-intelligence

comparison python/utils.py @ 675:ab3fdff42624

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected old format for Point.__str__
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 26 May 2015 23:55:22 +0200
parents 01b89182891a
children 58b9ac2f262f
comparison
equal deleted inserted replaced
674:01b89182891a 675:ab3fdff42624
319 return newVariables 319 return newVariables
320 320
321 def frenchify(s, displayNames): 321 def frenchify(s, displayNames):
322 return s 322 return s
323 323
324 def kruskalWallis(data, dependentVariable, independentVariable, plotFigure = False, filenamePrefix = None, figureFileType = 'pdf', saveLatex = False): 324 def kruskalWallis(data, dependentVariable, independentVariable, plotFigure = False, filenamePrefix = None, figureFileType = 'pdf', saveLatex = False, displayNames = {}):
325 '''Studies the influence of (nominal) independent variable over the dependent variable 325 '''Studies the influence of (nominal) independent variable over the dependent variable
326 326
327 Makes tests if the conditional distributions are normal 327 Makes tests if the conditional distributions are normal
328 using the Shapiro-Wilk test (in which case ANOVA could be used) 328 using the Shapiro-Wilk test (in which case ANOVA could be used)
329 Implements uses the non-parametric Kruskal Wallis test''' 329 Implements uses the non-parametric Kruskal Wallis test'''
346 plt.title('{} vs {}'.format(dependentVariable, independentVariable)) 346 plt.title('{} vs {}'.format(dependentVariable, independentVariable))
347 if filenamePrefix is not None: 347 if filenamePrefix is not None:
348 plt.savefig(filenamePrefix+'-{}-{}.{}'.format(dependentVariable, independentVariable, figureFileType)) 348 plt.savefig(filenamePrefix+'-{}-{}.{}'.format(dependentVariable, independentVariable, figureFileType))
349 table = tmp.groupby([independentVariable])[dependentVariable].describe().unstack().sort(['50%'], ascending = False) 349 table = tmp.groupby([independentVariable])[dependentVariable].describe().unstack().sort(['50%'], ascending = False)
350 if saveLatex: 350 if saveLatex:
351 out.write('\begin{table}[htp!]') 351 out.write('\\begin{table}[htp!]\n')
352 out.write(frenchify(table.to_latex(), displayNames)) 352 out.write(frenchify(table.to_latex(), displayNames))
353 out.write('\end{table}[htp!]') 353 out.write('\caption{Test}\n'
354 +'\end{table}[htp!]')
354 else: 355 else:
355 print table 356 print table
356 return kruskal(*[tmp.loc[tmp[independentVariable] == x, dependentVariable] for x in independentVariableValues]) 357 return kruskal(*[tmp.loc[tmp[independentVariable] == x, dependentVariable] for x in independentVariableValues])
357 else: 358 else:
358 return None 359 return None