Merge pull request #680 from dstl/mean_measures

Remove `hasattr` in Measures to avoid calling `mean` twice
dstl · Jul 28, 2022 · c098a63 · c098a63
2 parents f36afad + af1213d
commit c098a63
Showing 1 changed file with 6 additions and 24 deletions.
diff --git a/stonesoup/measures.py b/stonesoup/measures.py
@@ -82,14 +82,8 @@ def __call__(self, state1, state2):
 
         """
         # Calculate Euclidean distance between two state
-        if hasattr(state1, 'mean'):
-            state_vector1 = state1.mean
-        else:
-            state_vector1 = state1.state_vector
-        if hasattr(state2, 'mean'):
-            state_vector2 = state2.mean
-        else:
-            state_vector2 = state2.state_vector
+        state_vector1 = getattr(state1, 'mean', state1.state_vector)
+        state_vector2 = getattr(state2, 'mean', state2.state_vector)
 
         if self.mapping is not None:
             return distance.euclidean(state_vector1[self.mapping, 0],
@@ -136,14 +130,8 @@ def __call__(self, state1, state2):
             :class:`~.State` objects
 
         """
-        if hasattr(state1, 'mean'):
-            state_vector1 = state1.mean
-        else:
-            state_vector1 = state1.state_vector
-        if hasattr(state2, 'mean'):
-            state_vector2 = state2.mean
-        else:
-            state_vector2 = state2.state_vector
+        state_vector1 = getattr(state1, 'mean', state1.state_vector)
+        state_vector2 = getattr(state2, 'mean', state2.state_vector)
 
         if self.mapping is not None:
             return distance.euclidean(state_vector1[self.mapping, 0],
@@ -185,14 +173,8 @@ def __call__(self, state1, state2):
             objects
 
         """
-        if hasattr(state1, 'mean'):
-            state_vector1 = state1.mean
-        else:
-            state_vector1 = state1.state_vector
-        if hasattr(state2, 'mean'):
-            state_vector2 = state2.mean
-        else:
-            state_vector2 = state2.state_vector
+        state_vector1 = getattr(state1, 'mean', state1.state_vector)
+        state_vector2 = getattr(state2, 'mean', state2.state_vector)
 
         if self.mapping is not None:
             u = state_vector1[self.mapping, 0]