update demo-assignments

Author: rambasnet

demo-assignments/A1-OOP/cold/Makefile

@@ -25,7 +25,7 @@ endif
 
 .PHONY: run-test-coverage
 run-test-coverage: create-doc-folder
-	pytest --verbose --color=yes --cov --cov-report term-missing --cov-report=html:$(DOCS)/test-cov tests/
+	pytest --verbose --color=yes --cov --cov-report term-missing --cov-report=html:$(DOCS)/htmlcov tests/
 	@echo "All unittests passed!"
 
 .PHONY: check-types
@@ -57,6 +57,7 @@ endif
 ifeq ($(wildcard ~/plantuml.jar), )
 	@echo "Downloading plantuml.jar in home folder..."
 	curl -L -o ~/plantuml.jar https://sourceforge.net/projects/plantuml/files/plantuml.jar/download
+	sudo apt install graphviz
 endif
 	$(PLANTUML) ./uml/temperature.plantuml
 	$(PLANTUML) ./uml/solution.plantuml

demo-assignments/A1-OOP/cold/cold_singleton.py

@@ -25,6 +25,13 @@ class Solution():
     _instance: "Solution" | None = None
 
     def __new__(cls) -> "Solution":
+        """Creates a new instance of the class if not already created.
+
+        Enforces Singleton pattern.
+
+        Returns:
+            Solution: class instance
+        """
         if cls._instance is None:
             cls._instance = super().__new__(cls)
         return cls._instance

demo-assignments/A1-OOP/cold/uml/Temperature.png

@@ -6,6 +6,7 @@ class Temperature {
     .. Instance Variables ..
     - _temp: int
     - _unit: str
+    - attribute: float
     + temp: int {get; set;}
     + unit: str {get; set;}
     .. Overloaded Methods ..

demo-assignments/A1-OOP/cold/uml/temperature.plantuml

@@ -19,7 +19,7 @@ check-types:
 
 .PHONY: unittest
 unittest:
-	pytest --verbose  --color=yes --cov --cov-report term --cov-report html tests/
+	pytest --verbose  --color=yes --cov --cov-report term-missing --cov-report html tests/
 	@echo "Unittest done."
 
 .PHONY: create-uml
@@ -41,8 +41,7 @@ endif
 
 .PHONY: cleanall
 localtest:
-	kattis test -m egypt_abc.py
-	kattis test -m egypt_singleton.py
+	kattis test -m egypt.py
 	@echo "Local kattis sample data test done."
 
 

demo-assignments/A2-ABC/egypt/Makefile

@@ -14,16 +14,13 @@
 import unittest
 from unittest.mock import patch
 from io import StringIO
-from egypt_singleton import Solution
+from egypt import Solution
 
 
 class TestSolution(unittest.TestCase):
     """Unittesting Solution class
     """
 
-    def tearDown(self) -> None:
-        return super().tearDown()
-
     @patch('sys.stdout', new_callable=StringIO)
     def test_solve1(self, mock_stdout: StringIO) -> None:
         """Tests solve method
@@ -38,7 +35,6 @@ def test_solve1(self, mock_stdout: StringIO) -> None:
             output_file = path.join(dir_path, '1.ans')
             with open(output_file, 'r', encoding='utf-8') as expected:
                 self.assertEqual(mock_stdout.getvalue(), expected.read())
-            # Solution.reset_instance()
 
     @patch('sys.stdout', new_callable=StringIO)
     def test_solve2(self, mock_stdout: StringIO) -> None:
@@ -52,7 +48,6 @@ def test_solve2(self, mock_stdout: StringIO) -> None:
             sol.print_answer()
             expected: str = 'right\nwrong\nright\n'
             self.assertEqual(mock_stdout.getvalue(), expected)
-            # Solution.reset_instance()
 
     @patch('sys.stdout', new_callable=StringIO)
     def test_solve3(self, mock_stdout: StringIO) -> None:
@@ -66,7 +61,6 @@ def test_solve3(self, mock_stdout: StringIO) -> None:
             sol.print_answer()
             expected: str = 'wrong\nwrong\nwrong\nright\n'
             self.assertEqual(mock_stdout.getvalue(), expected)
-            # Solution.reset_instance()
 
     def test_solve4(self) -> None:
         """Tests solve method
@@ -77,7 +71,6 @@ def test_solve4(self) -> None:
             sol.solve()
             expected: str = 'wrong\nwrong\nwrong\nright\n'
             self.assertEqual(sol.answer, expected)
-            # Solution.reset_instance()
 
     @patch('sys.stdout', new_callable=StringIO)
     def test_main(self, mock_stdout: StringIO) -> None:
@@ -99,7 +92,7 @@ def test_data(self) -> None:
                 sol.data, [[2, 3, 4], [20, 50, 62], [3, 4, 7]])
 
     def test_singleton(self) -> None:
-        """Tests get_instance method
+        """Singleton pattern test
         """
         data1 = '2 3 4\n20 50 62\n3 4 7\n0 0 0\n'
         data2 = '20 30 40\n200 500 620\n30 40 70\n0 0 0\n'