Merge pull request #187 from lambda-feedback/tr161-wrong-conversion-factor-for-radians

Added `rad` as a short form for radian and removed `rad` as an altern…

Author: KarlLundengaard

Diff for: app/symbolic_comparison_evaluation_tests.py

@@ -1170,6 +1170,7 @@ def test_no_reserved_keywords_in_old_format_input_symbol_alternatives(self):
                     'symbol_assumptions': "('n','integer')",
                 }
             ),
+            ("-2525", "-2525", "response = a*50 + d*51*25 where a=77; d=-5", True, [], {}),
         ]
     )
     def test_criteria_based_comparison(self, response, answer, criteria, value, feedback_tags, additional_params):

Diff for: app/unit_system_conversions.py

@@ -79,8 +79,8 @@
 This is the subset of common symbols whose short form symbols are allowed
 """
 set_of_very_common_units_in_SI = {
-    ('radian',             'r',   '(1/(2*pi))',                   tuple(),                  ('radians',)),  # Note: here 'r' is used instead of the more common 'rad' to avoid collision
-    ('steradian', 'sr',  '(1)',                                   tuple(),                  ('steradians',)),
+    ('radian',            'rad',   '(1/(2*pi))',                  tuple(),                  ('radians',)),  # Note: here 'r' is used instead of the more common 'rad' to avoid collision
+    ('steradian', 'sr',   '(1)',                                  tuple(),                  ('steradians',)),
     ('minute',            'min', '(60*second)',                   tuple(),                  ('minutes',)),
     ('hour',              'h',   '(3600*second)',                 tuple(),                  ('hours',)),
     ('degree',            'deg', '(pi/180)',                      tuple(),                  ('degrees',)),
@@ -111,7 +111,8 @@
     ('barn',              'b',   '(10**(-28)*metre**2)',               tuple(),                 ('barns',)),
     ('curie',             'Ci',  '(3.7*10**10*becquerel)',             ('Curie',),              ('curies',)),
     ('roentgen',          'R',   '(2.58*10**(-4)*kelvin/(kilogram))', ('Roentgen', 'Röntgen'), ('roentgens', 'Roentgens')),
-    ('rad',               'rad', '(10**(-2)*gray)',                    tuple(),                 ('rads',)),
+    # Removed rad since it collides with the short form for radian.
+    #('rad',               'rad', '(10**(-2)*gray)',                    tuple(),                 ('rads',)),
     ('rem',               'rem', '(10**(-2)*sievert)',                 tuple(),                 ('rems',)),
 }