missed a conflict in test_simulation.py

functions/test_simulation.py

@@ -101,11 +101,9 @@ sim_bda = SimulationManager('sim')
 state_recorder_bda= StatesRecorder('bda',dataset_labels)
 sim_bda.sim_process_naive(dataset_labels, testing_dataset, robot_bda, state_recorder_bda)
 '''
-<<<<<<< HEAD
 #loc_algo = EKF_LS_CI2('algo')
 loc_algo = Centralized_EKF('cent_ekf')
 robot = RobotSystem('robot me', dataset_labels, loc_algo, distr_sys = False)
->>>>>>> caa3398ca773a598bfbaedd0e32f33e92280c52c
 
 
 #ud_t = state_recorder.get_updata_type_in_time_order()
@@ -114,7 +112,6 @@ analyzer = Analyzer('analyzer', dataset_labels)
 #loc_err_per_run, trace_per_run, t_arr = analyzer.calculate_loc_err_and_trace_state_variance_per_run(state_recorder_bound)
 analyzer.algos_comparison([state_recorder, state_recorder1, state_recorder_n], only_trace=['gs ci bound'])
 
-<<<<<<< HEAD
 sim.sim_process_naive(dataset_labels, testing_dataset, robot, state_recorder, simple_plot = True)
 loc_err_per_run, trace_per_run, t_arr = analyzer.calculate_loc_err_and_trace_state_variance_per_run(state_recorder)
 #robot_location_at_unit_time_interval
@@ -134,7 +131,6 @@ get_robot_time_func = state_recorder.get_time_arr
 # print(data_sim)
 
 animate_plot(dataset_labels, state_recorder, analyzer, get_robot_time_func, le, t_S)
->>>>>>> caa3398ca773a598bfbaedd0e32f33e92280c52c
 
 
 
@@ -143,9 +139,7 @@ data_sim = state_recorder.get_recorded_data()
 le = state_recorder.get_loc_err_arr()
 ud = state_recorder.get_update_type_arr()
 t_S = state_recorder.get_trace_sigma_s_arr()
-<<<<<<< HEAD
 
 ud_t = state_recorder.get_updata_type_in_time_order()
 data_sim_t = state_recorder.get_data_in_time_order()
 '''
->>>>>>> caa3398ca773a598bfbaedd0e32f33e92280c52c