Inheritance addressed

stonesoup/metricgenerator/base.py

@@ -36,14 +36,14 @@ class MetricManager(Base):
     """
 
 
-class MetricTableGenerator(Base):
+class MetricTableGenerator(MetricGenerator):
     """Metric Table base class
 
     Takes a set of :class: `~.Metric` objects and outputs a table of the
     values next to a description and target for each metric"""
 
     @abstractmethod
-    def generate_table(self, **kwargs):
+    def compute_metric(self, **kwargs):
         """Generate table
 
         Parameters
@@ -63,3 +63,17 @@ class PlotGenerator(MetricGenerator):
     PlotGenerators generate metrics that are visualisations. Return
     :class:`~.PlottingMetric` objects.
     """
+
+    @abstractmethod
+    def compute_metric(self, **kwargs):
+        """Generate table
+
+        Parameters
+        ----------
+        : set of :class: `~.Metric` objects
+
+        Returns
+        -------
+        matplotlib.Table object"""
+
+        raise NotImplementedError

stonesoup/metricgenerator/metrictables.py

@@ -22,7 +22,7 @@ def __init__(self, *args, **kwargs):
         self.targets = dict
         self.descriptions = dict
 
-    def generate_table(self, **kwargs):
+    def compute_metric(self, **kwargs):
         """Generate table method
 
         Returns a matplotlib Table of metrics with their descriptions, target

stonesoup/metricgenerator/tests/test_tables.py

@@ -32,5 +32,5 @@ def test_siaptable():
                                 generator=metric_generator))
     # Generate table
     table_generator = SIAPTableGenerator(metrics)
-    table = table_generator.generate_table()
+    table = table_generator.compute_metric()
     assert isinstance(table, Table)