diff --git a/index.html b/index.html new file mode 100644 index 0000000..4b9f085 --- /dev/null +++ b/index.html @@ -0,0 +1,148 @@ + + + + + + + + + +
+
+ + + diff --git a/merge.py b/merge.py new file mode 100644 index 0000000..3c603d5 --- /dev/null +++ b/merge.py @@ -0,0 +1,28 @@ +#!/usr/bin/python + +import csv + +result = [] +for i in [1,2,4,8,11,12,13,14,15,16,17,18,19,20]: + no = str(i) + r1 = csv.DictReader(file(no+".csv"), fieldnames=["datetime", "temp-"+no, "humid-"+no]) + result+=list(r1) + +#result = sum(result,[]) #flatten list of list +for i in range(len(result)): + result[i]["datetime"] = result[i]["datetime"][:-1]+"0" + +result.sort(key=lambda x: x["datetime"]) +prev="" +fa = [] +for entry in result: + if entry["datetime"] == prev: + fa[-1] = {k: v for dic in [entry, fa[-1]] + for k, v in dic.items()} + else: + fa.append(entry) + prev = entry["datetime"] + + +print "var data = " +print fa