Reformatted

SainsburyWellcomeCentre · Aug 17, 2023 · b7a95e8 · b7a95e8
1 parent 8a520c1
commit b7a95e8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/aeon/schema/social.py b/aeon/schema/social.py
@@ -35,6 +35,7 @@ def read(self, file, ceph_proc_dir="/ceph/aeon/aeon/data/processed"):
         new_data = pd.DataFrame(columns=new_columns)
         part_data_list = [None] * len(parts)
         for i, part in enumerate(parts):
+<<<<<<< Updated upstream
             part_data_list[i] = data[
                 [
                     "class",
@@ -44,6 +45,10 @@ def read(self, file, ceph_proc_dir="/ceph/aeon/aeon/data/processed"):
                     f"{part}_y",
                 ]
             ]
+=======
+            part_columns = ["class", "class_likelihood", f"{part}_x", f"{part}_y", f"{part}_likelihood"]
+            part_data_list[i] = data[part_columns]
+>>>>>>> Stashed changes
             part_data_list[i].insert(2, "part", part)
             part_data_list[i].columns = new_columns
         new_data = pd.concat(part_data_list)