Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ecotronData
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
kr69sugu
ecotronData
Commits
f5260f04
Commit
f5260f04
authored
3 years ago
by
am0ebe
Browse files
Options
Downloads
Patches
Plain Diff
gitignore 'temp' file
parent
addf37cc
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitignore
+1
-2
1 addition, 2 deletions
.gitignore
conf.json
+2
-1
2 additions, 1 deletion
conf.json
dataSync.py
+10
-2
10 additions, 2 deletions
dataSync.py
update-gitignore.sh
+3
-0
3 additions, 0 deletions
update-gitignore.sh
with
16 additions
and
5 deletions
.gitignore
+
1
−
2
View file @
f5260f04
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
This diff is collapsed.
Click to expand it.
conf.json
+
2
−
1
View file @
f5260f04
...
@@ -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
This diff is collapsed.
Click to expand it.
dataSync.py
+
10
−
2
View file @
f5260f04
...
@@ -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
=
Tru
e
COMPRESSION
=
Fals
e
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
...
...
This diff is collapsed.
Click to expand it.
update-gitignore.sh
+
3
−
0
View file @
f5260f04
#!/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
`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment