Rename add_column_from_metadata_to_ensemble function (LLNL#97)

* Rename add_column_from_metadata_to_ensemble function

* Black

* Update function name

thicket/ensemble.py

@@ -176,7 +176,7 @@ def _handle_perfdata():
                 new_profiles = [i for i in range(len(thickets_cp[0].profile))]
                 for i in range(len(thickets_cp)):
                     thickets_cp[i].metadata["new_profiles"] = new_profiles
-                    thickets_cp[i].add_column_from_metadata_to_ensemble(
+                    thickets_cp[i].metadata_column_to_perfdata(
                         "new_profiles", drop=True
                     )
                     thickets_cp[i].dataframe.reset_index(level="profile", inplace=True)
@@ -198,7 +198,7 @@ def _handle_perfdata():
                     )
             else:  # Change second-level index to be from metadata's "metadata_key" column
                 for i in range(len(thickets_cp)):
-                    thickets_cp[i].add_column_from_metadata_to_ensemble(metadata_key)
+                    thickets_cp[i].metadata_column_to_perfdata(metadata_key)
                     thickets_cp[i].dataframe.reset_index(level="profile", inplace=True)
                     new_mappings.update(
                         pd.Series(

thicket/tests/test_thicket.py

@@ -104,7 +104,7 @@ def _test_multiindex():
     assert bool(re.search("1.000.*CalcFBHourglassForceForElems", tree_output))
 
 
-def test_add_column_from_metadata(mpi_scaling_cali):
+def test_metadata_column_to_perfdata(mpi_scaling_cali):
     t_ens = Thicket.from_caliperreader(mpi_scaling_cali)
 
     example_column = "jobsize"
@@ -117,7 +117,7 @@ def test_add_column_from_metadata(mpi_scaling_cali):
     # Assume second level index is profile
     assert t_ens.dataframe.index.names[1] == "profile"
 
-    t_ens.add_column_from_metadata_to_ensemble(example_column)
+    t_ens.metadata_column_to_perfdata(example_column)
 
     # Column should be in performance data table
     assert example_column in t_ens.dataframe

thicket/thicket.py

@@ -378,9 +378,7 @@ def from_json(json_thicket):
         # make and return thicket?
         return th
 
-    def add_column_from_metadata_to_ensemble(
-        self, metadata_key, overwrite=False, drop=False
-    ):
+    def metadata_column_to_perfdata(self, metadata_key, overwrite=False, drop=False):
         """Add a column from the metadata table to the performance data table.
 
         Arguments: