QuizGenerator 0.3.0__tar.gz → 0.4.0__tar.gz

{quizgenerator-0.3.0 → quizgenerator-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuizGenerator
-Version: 0.3.0
+Version: 0.4.0
 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.3.0 → quizgenerator-0.4.0}/QuizGenerator/misc.py

@@ -564,9 +564,9 @@ class MatrixAnswer(Answer):
             value=self.value[i,j]
           )
         )
-        for i in range(self.value.shape[0])
+        for j in range(self.value.shape[1])
       ]
-      for j in range(self.value.shape[1])
+      for i in range(self.value.shape[0])
     ]
     table = ContentAST.Table(data)
     

{quizgenerator-0.3.0 → quizgenerator-0.4.0}/QuizGenerator/premade_questions/cst334/languages.py

@@ -60,11 +60,9 @@ class BNF:
         
     def get_grammar_string(self):
       lines = []
-      lines.append('```')
       for symbol in self.symbols:
         lines.append(f"{symbol.get_full_str()}")
-      
-      lines.append('```')
+
       return '\n'.join(lines)
       
   class Symbol:
@@ -342,25 +340,23 @@ class ValidStringsInLanguageQuestion(LanguageQuestion):
   def get_body(self, *args, **kwargs) -> ContentAST.Section:
     body = ContentAST.Section()
     
-    body.add_element(
+    body.add_elements([
       ContentAST.Paragraph([
-        ContentAST.OnlyHtml(
+        ContentAST.OnlyHtml([
           ContentAST.Text("Given the following grammar, which of the below strings are part of the language?")
-        ),
-        ContentAST.OnlyLatex(
+        ]),
+        ContentAST.OnlyLatex([
           ContentAST.Text(
             "Given the following grammar "
             "please circle any provided strings that are part of the language (or indicate clearly if there are none), "
             "and on each blank line provide generate a new, unique string that is part of the language."
           )
-        )
+        ])
       ])
-    )
+    ])
     
     body.add_element(
-      ContentAST.Paragraph([
-        self.grammar_good.get_grammar_string()
-      ])
+      ContentAST.Code(self.grammar_good.get_grammar_string())
     )
     
     # Add in some answers as latex-only options to be circled
@@ -374,7 +370,7 @@ class ValidStringsInLanguageQuestion(LanguageQuestion):
     # For Latex-only, ask students to generate some more.
     body.add_element(
       ContentAST.OnlyLatex([
-        ContentAST.AnswerBlock([ContentAST.Answer() for _ in range(self.num_answer_blanks)])
+        ContentAST.AnswerBlock([ContentAST.Answer(Answer.string(f"blank_line_{i}", f"blank_line_{i}"), label=f"blank_line_{i}") for i in range(self.num_answer_blanks)])
       ])
     )
     

{quizgenerator-0.3.0 → quizgenerator-0.4.0}/QuizGenerator/premade_questions/cst334/persistence_questions.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import abc
+import difflib
 import logging
 
 from QuizGenerator.question import Question, Answer, QuestionRegistry
@@ -365,31 +366,85 @@ class VSFS_states(IOQuestion):
   def get_explanation(self) -> ContentAST.Section:
     explanation = ContentAST.Section()
     
-    explanation.add_element(
+    log.debug(f"self.start_state: {self.start_state}")
+    log.debug(f"self.end_state: {self.end_state}")
+    
+    explanation.add_elements([
       ContentAST.Paragraph([
-        "These questions are based on the VSFS simulator that our book mentions.  "
-        "We will be discussing the interpretation of this in class, but you can also find information "
-        "<a href=\"https://github.com/chyyuu/os_tutorial_lab/blob/master/ostep/ostep13-vsfs.md\">here</a>, "
-        "as well as simulator code.  Please note that the code uses python 2.",
-        "",
-        "In general, I recommend looking for differences between the two outputs.  Recommended steps would be:",
-        "<ol>"
-        
-        "<li> Check to see if there are differences between the bitmaps "
-        "that could indicate a file/directroy were created or removed.</li>",
-        
-        "<li>Check the listed inodes to see if any entries have changed.  "
-        "This might be a new entry entirely or a reference count changing.  "
-        "If the references increased then this was likely a link or creation, "
-        "and if it decreased then it is likely an unlink.</li>",
-        
-        "<li>Look at the data blocks to see if a new entry has "
-        "been added to a directory or a new block has been mapped.</li>",
-        
-        "</ol>",
-        "These steps can usually help you quickly identify "
-        "what has occured in the simulation and key you in to the right answer."
+        "The key thing to pay attention to when solving these problems is where there are differences between the start state and the end state.",
+        "In this particular problem, we can see that these lines are different:"
       ])
+    ])
+    
+    chunk_to_add = []
+    lines_that_changed = []
+    for start_line, end_line in zip(self.start_state.split('\n'), self.end_state.split('\n')):
+      if start_line == end_line:
+        continue
+      lines_that_changed.append((start_line, end_line))
+      chunk_to_add.append(
+        f" - `{start_line}` -> `{end_line}`"
+      )
+    
+    explanation.add_element(
+      ContentAST.Paragraph(chunk_to_add)
+    )
+    
+    chunk_to_add = [
+      "A great place to start is to check to see if the bitmaps have changed as this can quickly tell us a lot of information"
+    ]
+    
+    inode_bitmap_lines = list(filter(lambda s: "inode bitmap" in s[0], lines_that_changed))
+    data_bitmap_lines = list(filter(lambda s: "data bitmap" in s[0], lines_that_changed))
+    
+    def get_bitmap(line: str) -> str:
+      log.debug(f"line: {line}")
+      return line.split()[-1]
+    
+    def highlight_changes(a: str, b: str) -> str:
+      matcher = difflib.SequenceMatcher(None, a, b)
+      result = []
+      
+      for tag, i1, i2, j1, j2 in matcher.get_opcodes():
+        if tag == "equal":
+          result.append(b[j1:j2])
+        elif tag in ("insert", "replace"):
+          result.append(f"***{b[j1:j2]}***")
+        # for "delete", do nothing since text is removed
+      
+      return "".join(result)
+    
+    if len(inode_bitmap_lines) > 0:
+      inode_bitmap_lines = inode_bitmap_lines[0]
+      chunk_to_add.append(f"The inode bitmap lines have changed from {get_bitmap(inode_bitmap_lines[0])} to {get_bitmap(inode_bitmap_lines[1])}.")
+      if get_bitmap(inode_bitmap_lines[0]).count('1') < get_bitmap(inode_bitmap_lines[1]).count('1'):
+        chunk_to_add.append("We can see that we have added an inode, so we have either called `creat` or `mkdir`.")
+      else:
+        chunk_to_add.append("We can see that we have removed an inode, so we have called `unlink`.")
+    
+    if len(data_bitmap_lines) > 0:
+      data_bitmap_lines = data_bitmap_lines[0]
+      chunk_to_add.append(f"The inode bitmap lines have changed from {get_bitmap(data_bitmap_lines[0])} to {get_bitmap(data_bitmap_lines[1])}.")
+      if get_bitmap(data_bitmap_lines[0]).count('1') < get_bitmap(data_bitmap_lines[1]).count('1'):
+        chunk_to_add.append("We can see that we have added a data block, so we have either called `mkdir` or `write`.")
+      else:
+        chunk_to_add.append("We can see that we have removed a data block, so we have `unlink`ed a file.")
+    
+    if len(data_bitmap_lines) == 0 and len(inode_bitmap_lines) == 0:
+      chunk_to_add.append("If they have not changed, then we know we must have eithered called `link` or `unlink` and must check the references.")
+      
+    explanation.add_element(
+      ContentAST.Paragraph(chunk_to_add)
+    )
+    
+    explanation.add_elements([
+      ContentAST.Paragraph(["The overall changes are highlighted with `*` symbols below"])
+    ])
+    
+    explanation.add_element(
+      ContentAST.Code(
+        highlight_changes(self.start_state, self.end_state)
+      )
     )
     
     return explanation

{quizgenerator-0.3.0 → quizgenerator-0.4.0}/QuizGenerator/premade_questions/cst463/models/cnns.py

@@ -28,7 +28,7 @@ class ConvolutionCalculation(MatrixQuestion):
     
     # Add padding
     if padding > 0:
-      image = np.pad(image, ((padding, padding), (padding, padding), (0, 0)), mode='constant')
+      image = np.pad(image, ((padding, padding), (padding, padding)), mode='constant')
       H, W = H + 2 * padding, W + 2 * padding
     
     # Output dimensions

{quizgenerator-0.3.0 → quizgenerator-0.4.0}/QuizGenerator/premade_questions/cst463/models/text.py

@@ -60,7 +60,9 @@ class word2vec__skipgram(MatrixQuestion, TableQuestionMixin):
     ## Answers:
     # center_word, center_emb, context_words, context_embs, logits, probs
     self.answers["logits"] = Answer.vector_value(key="logits", value=self.logits)
-    self.answers["center_word"] = Answer.string(key="center_word", value=self.center_word)
+    most_likely_idx = np.argmax(self.probs)
+    most_likely_word = self.context_words[most_likely_idx]
+    self.answers["center_word"] = Answer.string(key="center_word", value=most_likely_word)
     
     
     return True
@@ -81,7 +83,7 @@ class word2vec__skipgram(MatrixQuestion, TableQuestionMixin):
       ContentAST.LineBreak(),
       self.answers["logits"].get_ast_element("Logits"),
       ContentAST.LineBreak(),
-      self.answers["center_word"].get_ast_element("Center word")
+      self.answers["center_word"].get_ast_element("Most likely context word")
     ])
     
     

{quizgenerator-0.3.0 → quizgenerator-0.4.0}/QuizGenerator/premade_questions/cst463/models/weight_counting.py

@@ -194,7 +194,7 @@ class WeightCounting_CNN(WeightCounting):
         )
       ]
     )
-    return model, ["filters", "kernel_size", "strides", "padding", "pool_size"]
+    return model, ["units", "filters", "kernel_size", "strides", "padding", "pool_size"]
 
 
 @QuestionRegistry.register("cst463.WeightCounting-RNN")

{quizgenerator-0.3.0 → quizgenerator-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "QuizGenerator"
-version = "0.3.0"
+version = "0.4.0"
 description = "Generate randomized quiz questions for Canvas LMS and PDF exams"
 readme = "README.md"
 license = {text = "GPL-3.0-or-later"}
@@ -51,6 +51,7 @@ Repository = "https://github.com/OtterDen-Lab/QuizGenerator"
 
 [project.scripts]
 quizgen = "QuizGenerator.generate:main"
+quizregen = "QuizGenerator.regenerate:main"
 
 [project.optional-dependencies]
 grading = [

{quizgenerator-0.3.0 → quizgenerator-0.4.0}/pyproject_prev.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "QuizGenerator"
-version = "0.1.4"
+version = "0.3.1"
 description = "Generate randomized quiz questions for Canvas LMS and PDF exams"
 readme = "README.md"
 license = {text = "GPL-3.0-or-later"}

{quizgenerator-0.3.0 → quizgenerator-0.4.0}/uv.lock

@@ -1214,7 +1214,7 @@ wheels = [
 
 [[package]]
 name = "quizgenerator"
-version = "0.3.0"
+version = "0.4.0"
 source = { editable = "." }
 dependencies = [
     { name = "canvasapi" },