Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
MartinJohannesNilsen committed May 7, 2021
2 parents c1877f2 + be6621c commit f58396d
Showing 5 changed files with 82 additions and 1,290 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -6,4 +6,7 @@ data/*/*_labels.txt
__pycache__
__pycache__*
__pycache__/
/node_modules
/node_modules
model/src/ANN.ipynb
model/src/LSTM.ipynb

1,225 changes: 0 additions & 1,225 deletions model/src/ANN.ipynb

This file was deleted.

128 changes: 73 additions & 55 deletions model/src/RFC.ipynb

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions model/utils/df_utils.py
Original file line number Diff line number Diff line change
@@ -67,15 +67,13 @@ def concat_sensor_data(self, n_sensors):

# Old
#
"""drop_arr = ['SensorId', ' FrameNumber', ' LinAccX (g)', ' LinAccY (g)', ' LinAccZ (g)',
' Pressure (kPa)', ' Altitude (m)', ' Temperature (degC)', ' HeaveMotion (m)',
' MagX (uT)', ' MagY (uT)', ' MagZ (uT)']"""
# drop_arr = ['SensorId', ' FrameNumber', ' LinAccX (g)', ' LinAccY (g)', ' LinAccZ (g)',
# ' Pressure (kPa)', ' Altitude (m)', ' Temperature (degC)', ' HeaveMotion (m)',
# ' MagX (uT)', ' MagY (uT)', ' MagZ (uT)']

# New
drop_arr = ['SensorId', ' FrameNumber', ' EulerX (deg)', ' EulerY (deg)', ' EulerZ (deg)',
' Pressure (kPa)', ' Altitude (m)', ' Temperature (degC)', ' HeaveMotion (m)',
' MagX (uT)', ' MagY (uT)', ' MagZ (uT)']

drop_arr = ['SensorId', ' FrameNumber', ' MagX (uT)', ' MagY (uT)', ' MagZ (uT)' , ' EulerX (deg)', ' EulerY (deg)', ' EulerZ (deg)', ' Pressure (kPa)', ' Altitude (m)', ' Temperature (degC)', ' HeaveMotion (m)']

self.df_arr[0] = self.df_arr[0].drop(drop_arr, axis=1)
drop_arr.append(' TimeStamp (s)')

2 changes: 0 additions & 2 deletions scripts/tests/sensor_bank_test.py
Original file line number Diff line number Diff line change
@@ -87,8 +87,6 @@ def with_server_suite():
suite.addTest(sensor_bank_test("test_remove_unsync_data"))
suite.addTest(sensor_bank_test("test_disconnect_sensor"))

# 69

if __name__ == "__main__":
runner = unittest.TextTestRunner()
runner.run(no_server_suite())

0 comments on commit f58396d

Please sign in to comment.