Merge pull request #1743 from maths/iss1739

Allow Omega as a synonym for Ohm in units.  Fixes #1739

Author: sangwinc

stack/cas/casstring.units.class.php

@@ -91,6 +91,7 @@ class stack_cas_casstring_units {
         ['Wh', '3600*(kg*m^2)/s^2', 'Wh', 'Watts hours'],
         ['A', 'A', 'A', 'Ampere'],
         ['ohm', '(kg*m^2)/(s^3*A^2)', '\Omega', 'ohm'],
+        ['Omega', '(kg*m^2)/(s^3*A^2)', '\Omega', 'ohm'],
         ['C', 's*A', 'C', 'Coulomb'],
         ['V', '(kg*m^2)/(s^3*A)', 'V', 'Volt'],
         ['F', '(s^4*A^2)/(kg*m^2)', 'F', 'Farad'],

tests/ast_filter_998_security_auto_generated_test.php

@@ -873,6 +873,14 @@ public function test_affected_units(): void {
             true
         );
 
+        $this->expect(
+            'omega',
+            'omega',
+            ['unknownUnitsCase'],
+            false,
+            true
+        );
+
         $this->expect(
             'partialdiff(x,y,1)',
             'partialdiff(x,y,1)',
@@ -2406,14 +2414,6 @@ public function test_non_affected_units(): void {
             false
         );
 
-        $this->expect(
-            'omega',
-            'omega',
-            [],
-            true,
-            false
-        );
-
         $this->expect(
             'omicron',
             'omicron',

tests/fixtures/answertestfixtures.class.php

@@ -2989,6 +2989,9 @@ class stack_answertest_test_data {
         ['Units', '3', '-9.81*m/s^2', 'stackunits(-9.815,m/s^2)', 0, 'ATNumSigFigs_Inaccurate. ATUnits_units_match.', ''],
         ['Units', '3', '-9.82*m/s^2', 'stackunits(displaydp(-9.815,3),m/s^2)', 1, 'ATUnits_units_match.', ''],
         ['Units', '3', '-9.82*m/s^2', 'stackunits(displaysf(-9.815,4),m/s^2)', 1, 'ATUnits_units_match.', ''],
+        ['Units', '3', '0.330*kohm', '330*ohm', 1, 'ATUnits_compatible_units (kg*m^2)/(A^2*s^3).', ''],
+        ['Units', '2', '330*Omega', '330*ohm', 1, 'ATUnits_compatible_units (kg*m^2)/(A^2*s^3).', ''],
+        ['Units', '2', "330*\u{03A9}", '330*ohm', 1, 'ATUnits_compatible_units (kg*m^2)/(A^2*s^3).', ''],
 
         ['UnitsStrict', '2', '25*g', '0.025*kg', 0, 'ATUnits_compatible_units kg.', 'Differences from the Units test only'],
         ['UnitsStrict', '1', '1*Mg/10^6', '1*N*s^2/(km)', 0, 'ATUnits_compatible_units kg.', ''],