for rnn 4 looks better than 0

Author: smerdov

GameLogProcessing.py

@@ -105,7 +105,7 @@ def get_shootout_times_start_end(
  # gamedata_dict['9']['times_kills']
 
 
- joblib.dump(gamedata_dict, 'data/gamedata_dict')
+ joblib.dump(gamedata_dict, 'data/gamedata_dict_old')
 
 
 

GeneralAnalyser.py

@@ -242,6 +242,7 @@ def plot_measurements(
  alpha=0.9,
  alpha_background=0.5,
  sharex='col',
+ linewidth=1,
 ):
  n_plots = len(analyser_column_pairs_list)
 
@@ -270,11 +271,17 @@ def plot_measurements(
  data2plot = analyser.df[column]
  sensor_name = analyser.sensor_name
 
- ax.plot(times, data2plot.values, label='nothing', color='black', alpha=alpha_background)
- ax.tick_params(axis='both', labelsize=fontsize-12)
- ax.set_ylabel(column, fontsize=fontsize)
+ # ax.plot(times, data2plot.values, label='nothing', color='black', alpha=alpha_background)
+ ax.plot(times, data2plot.values, color='black', alpha=alpha_background)
+ ax.tick_params(axis='both', labelsize=fontsize-8)
+ # ax.set_ylabel(column, fontsize=fontsize)
+ column_text = 'chair ' + column if (column.startswith('acc') or column.startswith('gyro')) else column
+ column_text = 'heart rate' if column_text == 'hrm' else column_text
+ column_text = 'skin resistance' if column_text =='resistance' else column_text
+ column_text = 'muscle activity' if column_text =='muscle_activity' else column_text
+ ax.set_title(column_text, fontsize=fontsize)
  if n_row == n_rows - 1:
- ax.set_xlabel('time, s', fontsize=fontsize)
+ ax.set_xlabel('time, s', fontsize=fontsize + 7)
 
  for event_intervals in event_intervals_list:
  # intervals_list = event_intervals.intervals_list
@@ -292,6 +299,7 @@ def plot_measurements(
  # label=event_label,
  color=color,
  alpha=alpha,
+ linewidth=linewidth,
  )
 
  ax.plot([], [], label=event_label, color=color)
@@ -301,7 +309,8 @@ def plot_measurements(
  suptitle = f'{sensor_name.capitalize()} sensors data, session_id = {session_id}' # TODO: adapt for multiple case
  fig.suptitle(suptitle, fontsize=fontsize + 2)
 
- fig.tight_layout(rect=[0, 0.00, 1, 0.9625])
+ # fig.tight_layout(rect=[0, 0.00, 1, 0.9625])
+ fig.tight_layout(rect=[0, 0.00, 1, 1])
 
  # fig.tight_layout(rect=[0, 0.03, 1, 0.95])
  # fig.subplots_adjust(top=0.5)

GeneralProcessing.py

@@ -4,20 +4,31 @@
 import os
 import joblib
 from utils import normalize_MPU9250_data, split_df, get_intervals_from_moments, EventIntervals
+from GeneralAnalyser import GeneralAnalyser, plot_measurements
 
-# plt.interactive(True)
+plt.interactive(True)
 pd.options.display.max_columns = 15
 pic_prefix = 'pic/'
 
 sessions_dict = joblib.load('data/sessions_dict')
-gamedata_dict = joblib.load('data/gamedata_dict')
+gamedata_dict = joblib.load('data/gamedata_dict_old')
+
+# gamedata_dict.update(gamedata_dict_update)
+
 
 sensors_columns_dict = {
  'hrm': ['hrm'],
- 'envibox': ['als', 'mic', 'humidity', 'temperature', 'co2'],
- 'datalog': ['hrm2', 'resistance', 'muscle_activity']
+ 'datalog': ['resistance', 'muscle_activity'],
+ 'envibox': ['co2', 'temperature', 'humidity'],
+ 'eyetracker': ['gaze_x', 'gaze_y'],
+ 'mxy': ['mouse_dx', 'mouse_dy'],
+ 'schairlog': ['acc_x', 'acc_y', 'acc_z', 'gyro_x', 'gyro_y', 'gyro_z'],
 }
 
+total_len = sum([len(value) for value in sensors_columns_dict.values()])
+
+
+
 sensors_list = list(sensors_columns_dict.keys())
 sensors_columns_list = []
 
@@ -30,9 +41,10 @@
  df_dict = {}
 
  if not set(sensors_list).issubset(set(session_data_dict.keys())):
+ print("not set(sensors_list).issubset(set(session_data_dict.keys()))")
  ### If not all the sensors provided
- # continue # TODO: THIS IS DANGEROUS AND SHOULD BE UNCOMMENTED BACK
- pass
+ continue # TODO: THIS IS DANGEROUS AND SHOULD BE UNCOMMENTED BACK
+ # pass
 
  if session_id not in gamedata_dict:
  continue
@@ -41,16 +53,16 @@
  moments_death = gamedata_dict[session_id]['times_is_killed']
  duration = 1
 
- intervals_shootout = gamedata_dict[session_id]['shootout_times_start_end']
+ # intervals_shootout = gamedata_dict[session_id]['shootout_times_start_end']
  intervals_kills = get_intervals_from_moments(moments_kills, interval_start=-duration, interval_end=duration)
  intervals_death = get_intervals_from_moments(moments_death, interval_start=-duration, interval_end=duration)
 
- event_intervals_shootout = EventIntervals(intervals_list=intervals_shootout, label='shootouts', color='blue')
- event_intervals_kills = EventIntervals(intervals_list=intervals_kills, label='kills', color='green')
+ # event_intervals_shootout = EventIntervals(intervals_list=intervals_shootout, label='shootouts', color='blue')
+ event_intervals_kills = EventIntervals(intervals_list=intervals_kills, label='kills', color='limegreen')
  event_intervals_death = EventIntervals(intervals_list=intervals_death, label='deaths', color='red')
 
- events_intervals_list = [event_intervals_shootout, event_intervals_kills, event_intervals_death]
-
+ # events_intervals_list = [event_intervals_shootout, event_intervals_kills, event_intervals_death]
+ events_intervals_list = [event_intervals_kills, event_intervals_death]
 
  for sensor_name in sensors_columns_dict:
  df = session_data_dict[sensor_name].copy()
@@ -63,22 +75,22 @@
  # # df.values = ss.fit_transform(df.values)
  # df.loc[:, sensors_columns_dict[sensor_name]] = ss.fit_transform(df.loc[:, sensors_columns_dict[sensor_name]])
 
- ### WARNING: it is CUSTOM PART
- if sensor_name == 'schairlog':
- chair_analyser = GeneralAnalyser(
- df,
- pic_prefix=pic_prefix,
- sensor_name='Chair', # Manual assignment
- session_id=session_id,
- events_intervals_list=events_intervals_list,
- interval=interval,
- reaction_multiplier=reaction_multiplier,
- )
- # chair_analyser.get_floating_features() # Need to be refactored
- chair_analyser._append_floating_features(interval=interval)
-
- for column in sensors_columns_dict[sensor_name]:
- analyser_column_pairs_list.append([chair_analyser, column])
+ # ### WARNING: it is CUSTOM PART
+ # if sensor_name == 'schairlog':
+ #  chair_analyser = GeneralAnalyser(
+ #  df,
+ #  pic_prefix=pic_prefix,
+ #  sensor_name='Chair', # Manual assignment
+ #  session_id=session_id,
+ #  events_intervals_list=events_intervals_list,
+ #  interval=interval,
+ #  reaction_multiplier=reaction_multiplier,
+ #  )
+ #  # chair_analyser.get_floating_features() # Need to be refactored
+ #  chair_analyser._append_floating_features(interval=interval)
+ #
+ #  for column in sensors_columns_dict[sensor_name]:
+ #  analyser_column_pairs_list.append([chair_analyser, column])
 
 
  ### VISUALIZATION
@@ -95,10 +107,12 @@
  pic_prefix=pic_prefix,
  session_id=session_id,
  event_intervals_list=events_intervals_list,
- n_rows=3, # TODO: automatically adjust number of rows and cols
- n_cols=3,
+ n_rows=4, # TODO: automatically adjust number of rows and cols
+ n_cols=4,
  figsize=(21, 15),
- plot_suptitle=True,
+ plot_suptitle=False,
+ alpha=0.8,
+ alpha_background=0.5,
  )
  # general_analyser.plot_measurements_timeline(column_name=sensor_name, intervals_dicts_list=intervals_dicts_list, alpha=0.9)