Merge pull request #230 from datacamp/feature-custom-eq

func arg for has_expr for custom equality check

Author: machow

pythonwhat/Test.py

@@ -144,16 +144,17 @@ class EqualTest(Test):
         result (bool): True if the test succeed, False if it failed. None if it hasn't been tested yet.
     """
 
-    def __init__(self, obj1, obj2, feedback):
+    def __init__(self, obj1, obj2, feedback, func = None):
         super().__init__(feedback)
         self.obj1 = obj1
         self.obj2 = obj2
+        self.func = func if func is not None else is_equal
 
     def specific_test(self):
         """
         Perform the actual test. result is set to False if the objects differ, True otherwise.
         """
-        self.result = is_equal(self.obj1, self.obj2)
+        self.result = self.func(self.obj1, self.obj2)
 
 
 

pythonwhat/check_funcs.py

@@ -358,6 +358,7 @@ def call(args,
          error_msg=MSG_CALL_ERROR, 
          # TODO kept for backwards compatibility in test_function_definition/lambda
          argstr='',
+         func=None,
          state=None, **kwargs):
     rep = Reporter.active_reporter
     test_type = ('value', 'output', 'error')
@@ -389,7 +390,7 @@ def call(args,
 
     # incorrect result
     _msg = state.build_message(incorrect_msg, fmt_kwargs)
-    rep.do_test(EqualTest(eval_sol, eval_stu, Feedback(_msg, stu_node)))
+    rep.do_test(EqualTest(eval_sol, eval_stu, Feedback(_msg, stu_node), func))
 
     return state
 
@@ -452,6 +453,7 @@ def has_expr(incorrect_msg="__JINJA__:Unexpected expression {{test}}: expected `
              name=None,
              highlight=None,
              copy=True,
+             func=None,
              state=None,
              test=None):
     """Run student and solution code, compare returned value, printed output, or errors.
@@ -483,6 +485,7 @@ def has_expr(incorrect_msg="__JINJA__:Unexpected expression {{test}}: expected `
           student and solution code. This could be thought of as post code.
         copy (bool): whether to try to deep copy objects in the environment, such as lists, that could
           accidentally be mutated. Disable to speed up SCTs. Disabling may lead to cryptic mutation issues.
+        func: custom binary function of form f(stu_result, sol_result), for equality testing.
     """
     rep = Reporter.active_reporter
 
@@ -537,7 +540,7 @@ def has_expr(incorrect_msg="__JINJA__:Unexpected expression {{test}}: expected `
 
     # test equality of results
     _msg = state.build_message(incorrect_msg, fmt_kwargs)
-    rep.do_test(EqualTest(eval_stu, eval_sol, Feedback(_msg, highlight)))
+    rep.do_test(EqualTest(eval_stu, eval_sol, Feedback(_msg, highlight), func))
 
     return state
 

tests/test_test_expression_result.py

@@ -41,5 +41,20 @@ def test_test_expression_result_copy_pass(self):
         sct_payload = helper.run(self.data)
         self.assertTrue(sct_payload['correct'])
 
+    def test_test_custom_equality_func(self):
+        self.data["DC_SOLUTION"] = "a = [1.01]"
+        self.data["DC_CODE"] = "a = [1.011]"
+        self.data["DC_SCT"] = "import numpy as np; Ex().check_object('a').has_equal_value(func = lambda x, y: np.allclose(x, y, atol = .001))"
+        sct_payload = helper.run(self.data)
+        self.assertTrue(sct_payload['correct'])
+
+    def test_test_custom_equality_func_fail(self):
+        self.data["DC_SOLUTION"] = "a = [1.01]"
+        self.data["DC_CODE"] = "a = [1.011]"
+        self.data["DC_SCT"] = "import numpy as np; Ex().check_object('a').has_equal_value(func = lambda x, y: np.allclose(x, y, atol = .0001))"
+        sct_payload = helper.run(self.data)
+        self.assertFalse(sct_payload['correct'])
+
+
 if __name__ == "__main__":
     unittest.main()

tests/test_test_function_definition.py

@@ -27,6 +27,14 @@ def test_step_x_spec2_str_call(self):
         self.data['DC_SCT'] = """
 (Ex().check_function_def('test').call("f(1,2)", 'value').call("f(1,2)", 'output')
                                 .call("f('a','b')", 'error'))
+"""
+        self.test_step_x()
+
+    def test_step_x_spec2_func_arg(self):
+        self.data['DC_SCT'] = """
+import numpy as np
+Ex().check_function_def('test').call("f(1,2)", func = lambda x, y: np.allclose(x, y))
+                                
 """
         self.test_step_x()