Add inmem-fom method to all objects

Also refactor the mixin a bit to remove the confusing
"_get_app_or_mod_inst" method.

Author: linsword13

var/ramble/repos/builtin/base_classes/modifier-base/base_class.py

@@ -66,7 +66,7 @@ def __init__(self, file_path):
         self._on_executables = ["*"]
         self.expander = None
         self._usage_mode = None
-        self._app_inst = None
+        self.app_inst = None
 
         self._verbosity = "short"
 
@@ -81,6 +81,9 @@ def copy(self):
 
         return new_copy
 
+    def satisfy_when(self, when_key):
+        return self.expander.satisfies(when_key, self.object_variants)
+
     def set_usage_mode(self, mode):
         """Set the usage mode for this modifier.
 
@@ -157,7 +160,7 @@ def inherit_from_application(self, app):
         self.object_variants.merge_multi_value_variants(app.object_variants)
         modded_vars = self.modded_variables(app)
         self.expander._variables.update(modded_vars)
-        self._app_inst = app
+        self.app_inst = app
 
     def define_variable(self, var_name, var_value):
         """Define a variable within this modifier's expander instance"""

var/ramble/repos/builtin/base_classes/object_mixin/base_class.py

@@ -12,22 +12,23 @@
 class ObjectMixin:
     """A mixin class for Ramble objects"""
 
-    def _get_app_or_mod_inst(self):
-        # This helper gets the mod_inst for modifier, and the app_inst for others
+    def _get_app_inst(self):
+        # This helper gets the app_inst for different object types
         if hasattr(self, "app_inst"):
             return self.app_inst
         return self
 
+    def satisfy_when(self, when_key):
+        app_inst = self._get_app_inst()
+        return app_inst.expander.satisfies(when_key, app_inst.object_variants)
+
     def get_required_variables(self):
         """Get all the required variables based on the mode and when conditions."""
-        inst = self._get_app_or_mod_inst()
         required_vars = self.required_vars
         filtered_vars = {}
         if required_vars:
             for var_name, var_props in required_vars.items():
-                if inst.expander.satisfies(
-                    var_props["when"], inst.object_variants
-                ):
+                if self.satisfy_when(var_props["when"]):
                     filtered_vars[var_name] = {
                         # Exclude the extra when prop
                         k: var_props[k]
@@ -44,9 +45,8 @@ def selected_variables(self):
         """
 
         selected_vars = {}
-        inst = self._get_app_or_mod_inst()
         for when_key, var_list in self.object_variables.items():
-            if not inst.expander.satisfies(when_key, inst.object_variants):
+            if not self.satisfy_when(when_key):
                 continue
 
             for var in var_list:
@@ -63,12 +63,11 @@ def selected_environment_variables(self):
         """
 
         selected_env_vars = {}
-        inst = self._get_app_or_mod_inst()
         for (
             when_key,
             env_var_list,
         ) in self.object_environment_variables.items():
-            if not inst.expander.satisfies(when_key, inst.object_variants):
+            if not self.satisfy_when(when_key):
                 continue
 
             for env_var in env_var_list:
@@ -77,4 +76,10 @@ def selected_environment_variables(self):
         return selected_env_vars
 
     def format_doc(self, **kwargs):
+        """Doc formatting for Sphinx"""
         return format.format_doc(self.__doc__, **kwargs)
+
+    def add_inmem_fom_value(self, fom_map_key, value):
+        """Add an in-memory FOM value"""
+        app_inst = self._get_app_inst()
+        app_inst.add_inmem_fom_value(fom_map_key, value)

var/ramble/repos/builtin/modifiers/tunables/modifier.py

@@ -107,7 +107,7 @@ def _prepare_analysis(self, workspace):
                 metric = next(iter(sum_dict))
             else:
                 metric = sum_dict
-            self._app_inst.add_inmem_fom_value(n, str(metric))
+            self.add_inmem_fom_value(n, str(metric))
 
     for conf in info_list:
         figure_of_merit(