Skip to content
Snippets Groups Projects
Commit f5260f04 authored by am0ebe's avatar am0ebe
Browse files

gitignore 'temp' file

parent addf37cc
Branches
Tags
No related merge requests found
ecotrack/out/all/ecotrack-data-20190629-20191016
ecotrack/out/I/ecotrack-data-20190629-20190804
*.csv *.csv
*.txt *.txt
test/* test/*
*# *#
*skyglow.log *skyglow.log
__pycache__ __pycache__
temp
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
["ecotrack","./ecotrack/in","./ecotrack/out/II","2019-08-05","2019-09-27"], ["ecotrack","./ecotrack/in","./ecotrack/out/II","2019-08-05","2019-09-27"],
["ecotrack","./ecotrack/in","./ecotrack/out/III","2019-09-27","2019-11-20"], ["ecotrack","./ecotrack/in","./ecotrack/out/III","2019-09-27","2019-11-20"],
["ecotrack","./ecotrack/in","./ecotrack/out/all","2019-06-29","2019-11-01"], ["ecotrack","./ecotrack/in","./ecotrack/out/all","2019-06-29","2019-11-01"],
["ecotrack","./ecotrack/in","./ecotrack/out/test","2019-09-17","2019-09-30"]
], ],
"blox" : "blox" :
{ {
...@@ -26,4 +27,4 @@ ...@@ -26,4 +27,4 @@
], ],
"schrebatron": [] "schrebatron": []
} }
} }
\ No newline at end of file
...@@ -37,7 +37,7 @@ TAG_LEN=len("04B94A7F7288588022") ...@@ -37,7 +37,7 @@ TAG_LEN=len("04B94A7F7288588022")
RULER=f"{'#'*100}" RULER=f"{'#'*100}"
N_UNITS=12 N_UNITS=12
confFileName="./conf.json" confFileName="./conf.json"
COMPRESSION=True COMPRESSION=False
NO_MERGE=False NO_MERGE=False
# month, sunrise, sunset # month, sunrise, sunset
...@@ -379,6 +379,8 @@ class Data: ...@@ -379,6 +379,8 @@ class Data:
lines = self.clean(lines, C_MIN_LEN, C_MAX_LEN, C_NCOLS, C_DELIM, self.getTempTime, datetime.timedelta(minutes=10)) lines = self.clean(lines, C_MIN_LEN, C_MAX_LEN, C_NCOLS, C_DELIM, self.getTempTime, datetime.timedelta(minutes=10))
lines.sort() lines.sort()
assert len(lines), "No Temperatures left after cleaning. >> too narrow time window?"
self.startTemp = self.getTempTime( lines[0] ) self.startTemp = self.getTempTime( lines[0] )
self.endTemp = self.getTempTime( lines[-1] ) self.endTemp = self.getTempTime( lines[-1] )
self.lenTemp = len(lines) self.lenTemp = len(lines)
...@@ -443,6 +445,12 @@ class Data: ...@@ -443,6 +445,12 @@ class Data:
else: else:
temps = self.meanTemps[0][uid][block] + self.meanTemps[1][uid][block] temps = self.meanTemps[0][uid][block] + self.meanTemps[1][uid][block]
if isDay(time):
temps += "day"
else:
temps += "night"
self.tempData[uid][idx].extend( temps ) self.tempData[uid][idx].extend( temps )
def calc_mean_for_sensor_values_for_uid_and_time(self,uid,prev_time): def calc_mean_for_sensor_values_for_uid_and_time(self,uid,prev_time):
...@@ -671,7 +679,7 @@ class Data: ...@@ -671,7 +679,7 @@ class Data:
if hasLight(): if hasLight():
h+=', moon_real[mLux], moon_eco[mLux], skyglow[Lux]' h+=', moon_real[mLux], moon_eco[mLux], skyglow[Lux]'
if hasTemp(): if hasTemp():
h+=', temp[C°], mean_night_temp[C°], min_night_temp[C°], max_night_temp[C°], mean_day_temp[C°], min_day_temp[C°], max_day_temp[C°]' h+=', temp[C°], mean_night_temp[C°], min_night_temp[C°], max_night_temp[C°], mean_day_temp[C°], min_day_temp[C°], max_day_temp[C°], is_day'
h +="\n" h +="\n"
h += RULER + "\n" h += RULER + "\n"
return h return h
......
#!/bin/bash #!/bin/bash
#TODO: if theres a .tgz dont include unzipped, regardless of size...
maxSize=111 #largest was all/data*tgz maxSize=111 #largest was all/data*tgz
ignore=( ignore=(
...@@ -9,6 +11,7 @@ ignore=( ...@@ -9,6 +11,7 @@ ignore=(
"*#" #ods-tmp-files "*#" #ods-tmp-files
*skyglow.log *skyglow.log
__pycache__ __pycache__
temp
) )
projdir=`git rev-parse --show-toplevel` projdir=`git rev-parse --show-toplevel`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment