QuizGenerator 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

QuizGenerator/contentast.py

@@ -2338,6 +2338,23 @@ class ContentAST:
           d = decimal.Decimal(f.numerator).quantize(q, rounding=decimal.ROUND_HALF_UP)
           outs.add(format(d, 'f'))
 
+      # Simple fraction
+      if allow_simple_fraction:
+        fr = f.limit_denominator(max_denominator)
+        if fr == f:
+          a, b = fr.numerator, fr.denominator
+          if fr.denominator > 1:
+            outs.add(f"{a}/{b}")
+            if include_spaces:
+              outs.add(f"{a} / {b}")
+            if allow_mixed and b != 1 and abs(a) > b:
+              sign = '-' if a < 0 else ''
+              A = abs(a)
+              whole, rem = divmod(A, b)
+              outs.add(f"{sign}{whole} {rem}/{b}")
+          else:
+            return sorted(outs, key=lambda s: (len(s), s))
+
       # Fixed-decimal form
       q = decimal.Decimal(1).scaleb(-ContentAST.Answer.DEFAULT_ROUNDING_DIGITS)
       d = (decimal.Decimal(f.numerator) / decimal.Decimal(f.denominator)).quantize(q, rounding=decimal.ROUND_HALF_UP)
@@ -2354,20 +2371,6 @@ class ContentAST:
           s = '0'
         outs.add(s)
 
-      # Simple fraction
-      if allow_simple_fraction:
-        fr = f.limit_denominator(max_denominator)
-        if fr == f:
-          a, b = fr.numerator, fr.denominator
-          outs.add(f"{a}/{b}")
-          if include_spaces:
-            outs.add(f"{a} / {b}")
-          if allow_mixed and b != 1 and abs(a) > b:
-            sign = '-' if a < 0 else ''
-            A = abs(a)
-            whole, rem = divmod(A, b)
-            outs.add(f"{sign}{whole} {rem}/{b}")
-
       return sorted(outs, key=lambda s: (len(s), s))
     
     @staticmethod

{quizgenerator-0.6.0.dist-info → quizgenerator-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuizGenerator
-Version: 0.6.0
+Version: 0.6.1
 Summary: Generate randomized quiz questions for Canvas LMS and PDF exams
 Project-URL: Homepage, https://github.com/OtterDen-Lab/QuizGenerator
 Project-URL: Documentation, https://github.com/OtterDen-Lab/QuizGenerator/tree/main/documentation

{quizgenerator-0.6.0.dist-info → quizgenerator-0.6.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 QuizGenerator/__init__.py,sha256=8EV-k90A3PNC8Cm2-ZquwNyVyvnwW1gs6u-nGictyhs,840
 QuizGenerator/__main__.py,sha256=Dd9w4R0Unm3RiXztvR4Y_g9-lkWp6FHg-4VN50JbKxU,151
 QuizGenerator/constants.py,sha256=AO-UWwsWPLb1k2JW6KP8rl9fxTcdT0rW-6XC6zfnDOs,4386
-QuizGenerator/contentast.py,sha256=lK92FlRfKnNU-9AhG8RJbCkpQixo5n7bmwvggyPazpM,93664
+QuizGenerator/contentast.py,sha256=MzM5yaQ1XVLIMh9ag-KYWJ9qrD539aQZkgDp8v7At_E,93788
 QuizGenerator/generate.py,sha256=bOkR6JhGQE0r4zbRWhC_3Dsj5hOEk6-jzFLcjk-qwKg,14811
 QuizGenerator/misc.py,sha256=wtlrEpmEpoE6vNRmgjNUmuWnRdQKSCYfrqeoTagNaxg,464
 QuizGenerator/mixins.py,sha256=HEhdGdeghqGWoajADTAIdUjkzwDSYl1b65LAkUdV50U,19211
@@ -43,8 +43,8 @@ QuizGenerator/premade_questions/cst463/neural-network-basics/__init__.py,sha256=
 QuizGenerator/premade_questions/cst463/neural-network-basics/neural_network_questions.py,sha256=luWlTfj1UM1yQDQzs_tNzTV67qXhRUBwNt8QrV74XHs,46115
 QuizGenerator/premade_questions/cst463/tensorflow-intro/__init__.py,sha256=G1gEHtG4KakYgi8ZXSYYhX6bQRtnm2tZVGx36d63Nmo,173
 QuizGenerator/premade_questions/cst463/tensorflow-intro/tensorflow_questions.py,sha256=8Wo38kTd_n0Oau2ERpvcudB9uJiOVDYYQNeWu9v4Tyo,33516
-quizgenerator-0.6.0.dist-info/METADATA,sha256=F6pWRrq1r55-tR5-lLyLpegiV26GxCeP4X7Y1w_NK8k,7212
-quizgenerator-0.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-quizgenerator-0.6.0.dist-info/entry_points.txt,sha256=aOIdRdw26xY8HkxOoKHBnUPe2mwGv5Ti3U1zojb6zxQ,98
-quizgenerator-0.6.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-quizgenerator-0.6.0.dist-info/RECORD,,
+quizgenerator-0.6.1.dist-info/METADATA,sha256=2Odb3SpBU-voYkEMehqtzhjU1K_Tn4OZo5vmY88HM9I,7212
+quizgenerator-0.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+quizgenerator-0.6.1.dist-info/entry_points.txt,sha256=aOIdRdw26xY8HkxOoKHBnUPe2mwGv5Ti3U1zojb6zxQ,98
+quizgenerator-0.6.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+quizgenerator-0.6.1.dist-info/RECORD,,