#2901 coverage

pybamm/parameters/parameter_values.py

@@ -54,7 +54,7 @@ def __init__(self, values, chemistry=None):
             }
         )
 
-        if isinstance(values, dict):
+        if isinstance(values, (dict, ParameterValues)):
             # remove the "chemistry" key if it exists
             values.pop("chemistry", None)
             self.update(values, check_already_exists=False)
@@ -69,13 +69,9 @@ def __init__(self, values, chemistry=None):
         self._processed_symbols = {}
 
         # save citations
-        citations = []
-        if hasattr(self, "citations"):
-            citations = self.citations
-        elif "citations" in self._dict_items:
-            citations = self._dict_items["citations"]
-        for citation in citations:
-            pybamm.citations.register(citation)
+        if "citations" in self._dict_items:
+            for citation in self._dict_items["citations"]:
+                pybamm.citations.register(citation)
 
     @staticmethod
     def create_from_bpx(filename, target_soc=1):
@@ -145,6 +141,9 @@ def items(self):
         """Get the items of the dictionary"""
         return self._dict_items.items()
 
+    def pop(self, *args, **kwargs):
+        self._dict_items.pop(*args, **kwargs)
+
     def copy(self):
         """Returns a copy of the parameter values. Makes sure to copy the internal
         dictionary."""

tests/unit/test_parameters/test_parameter_values.py

@@ -25,6 +25,11 @@ def test_init(self):
         self.assertEqual(param["a"], 1)
         self.assertIn("a", param.keys())
         self.assertIn(1, param.values())
+        self.assertIn(("a", 1), param.items())
+
+        # from dict with strings
+        param = pybamm.ParameterValues({"a": "1"})
+        self.assertEqual(param["a"], 1)
 
         # from dict "chemistry" key gets removed
         param = pybamm.ParameterValues({"a": 1, "chemistry": "lithium-ion"})
@@ -84,6 +89,10 @@ def test_update(self):
         with self.assertRaisesRegex(KeyError, "Cannot update parameter"):
             param.update({"b": 1})
 
+        # udpate with a ParameterValues object
+        new_param = pybamm.ParameterValues(param)
+        self.assertEqual(new_param["a"], 2)
+
         # test deleting a parameter
         del param["a"]
         self.assertNotIn("a", param.keys())
@@ -384,6 +393,10 @@ def my_func(x):
         self.assertEqual(func1.domains, func2.domains)
         self.assertEqual(func1.domains, func3.domains)
 
+        # [function] is deprecated
+        with self.assertRaisesRegex(ValueError, "[function]"):
+            pybamm.ParameterValues({"func": "[function]something"})
+
     def test_process_inline_function_parameters(self):
         def D(c):
             return c**2