|
|
@@ -367,8 +367,11 @@ class DataProcess(object):
|
|
|
# 更新df_object的accel列
|
|
|
# 如果使用了suffixes参数，则使用'accel_y'
|
|
|
# 如果没有使用suffixes参数，并且确信没有列名冲突，则直接使用'accel'
|
|
|
- self.object_df['accelX'] = merged['accelX_y'] # 如果使用了suffixes
|
|
|
- self.object_df['accelY'] = merged['accelY_y'] # 如果使用了suffixes
|
|
|
+ self.object_df[self.object_df['playerId'] == 1]['accelX'] = merged[merged['playerId'] == 1]['accelX_y'] # 如果使用了suffixes
|
|
|
+ self.object_df[self.object_df['playerId'] == 1]['accelY'] = merged[merged['playerId'] == 1]['accelY_y'] # 如果使用了suffixes
|
|
|
+
|
|
|
+ # self.object_df['accelX'] = merged['accelX_y'] # 如果使用了suffixes
|
|
|
+ # self.object_df['accelY'] = merged['accelY_y'] # 如果使用了suffixes
|
|
|
|
|
|
def _object_df_process(self):
|
|
|
"""
|
