From e818ba5bcc461af545665c78157be4e52252aa1c Mon Sep 17 00:00:00 2001
From: Miha <miha.fosnaric@fe.uni-lj.si>
Date: Mon, 11 Jul 2016 11:52:30 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-ng
---
python/trisurf/statistics.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/python/trisurf/statistics.py b/python/trisurf/statistics.py
index 5b6d3ff..016e24c 100644
--- a/python/trisurf/statistics.py
+++ b/python/trisurf/statistics.py
@@ -1,17 +1,17 @@
from trisurf import trisurf
import os
-def combine(Runs):
+def combine(Runs,filename="statistics.csv",output="combinedStatistics.csv"):
"""Runs are those runs of which statistics are to be combined"""
data=[]
for run in Runs:
dir=trisurf.Directory(maindir=run.maindir,simdir=run.subdir)
- statfile=os.path.join(dir.fullpath(),"statistics.csv")
+ statfile=os.path.join(dir.fullpath(),filename)
with open (statfile,"r") as myfile:
#lines = [line.rstrip('\n') for line in myfile]
data=data+myfile.readlines()[1:]
- with open ("combinedStatistics.csv","w") as output:
+ with open (output,"w") as output:
output.write("Header line placer... Not yet implemented\n")
for line in data:
output.write(line)
--
Gitblit v1.9.3