modifies ma to np.ma

quaquel · quaquel · commit f58443c5aa5f · 2022-09-25T10:51:27.000+02:00
diff --git a/ema_workbench/em_framework/callbacks.py b/ema_workbench/em_framework/callbacks.py
@@ -18,7 +18,6 @@
 import shutil
 
 import numpy as np
-import numpy.ma as ma
 import pandas as pd
 
 from .parameters import CategoricalParameter, IntegerParameter, BooleanParameter
@@ -305,7 +304,7 @@ def __call__(self, experiment, outcomes):
     def get_results(self):
         results = {}
         for k, v in self.results.items():
-            if not ma.is_masked(v):
+            if not np.ma.is_masked(v):
                 results[k] = v.data
             else:
                 _logger.warning("some experiments have failed, returning masked result arrays")
@@ -314,7 +313,7 @@ def get_results(self):
         return self.cases, results
 
     def _setup_outcomes_array(self, shape, dtype):
-        array = ma.empty(shape, dtype=dtype)
+        array = np.ma.empty(shape, dtype=dtype)
         array.mask = True
         return array
 
diff --git a/test/test_em_framework/test_callback.py b/test/test_em_framework/test_callback.py
@@ -7,7 +7,6 @@
 import pytest
 
 import numpy as np
-import numpy.ma as ma
 
 import ema_workbench.em_framework.callbacks as callbacks
 from ema_workbench.em_framework.callbacks import DefaultCallback, FileBasedCallback
@@ -100,7 +99,7 @@ def test_init():
     assert "scalar" not in callback.results
     assert "timeseries" not in callback.results
     assert "array" in callback.results
-    assert ma.is_masked(callback.results["array"])
+    assert np.ma.is_masked(callback.results["array"])
 
     # with levers
     levers = [RealParameter("c", 0, 10)]
@@ -127,7 +126,7 @@ def test_init():
     assert "scalar" not in callback.results
     assert "timeseries" not in callback.results
     assert "array" in callback.results
-    assert ma.is_masked(callback.results["array"])
+    assert np.ma.is_masked(callback.results["array"])
 
 
 #         # KeyError
