update OOD

Author: rambasnet

Makefile

@@ -3,44 +3,44 @@ TEST_ARGS = -s --verbose --color=yes
 TYPE_CHECK = mypy --strict --allow-untyped-decorators --ignore-missing-imports
 STYLE_CHECK = flake8
 COVERAGE = python -m pytest
-ASSIGNMENT = 'demo-assignments'
+DEMO = './demo-assignments'
 
 .PHONY: all
 all: check-style check-type run-test-coverage clean
 	@echo "All checks passed"
 
 .PHONY: check-type
 check-type:
-	$(TYPE_CHECK) $(ASSIGNMENT)/A0/hello
-	$(TYPE_CHECK) $(ASSIGNMENT)/A0-OOP/hello
-	$(TYPE_CHECK) $(ASSIGNMENT)/A1/cold
-	$(TYPE_CHECK) $(ASSIGNMENT)/A1-OOP/cold
-	$(TYPE_CHECK) $(ASSIGNMENT)/A2-ABC/egypt
+	$(TYPE_CHECK) $(DEMO)/A0/hello
+	$(TYPE_CHECK) $(DEMO)/A0-OOP/hello
+	$(TYPE_CHECK) $(DEMO)/A1/cold
+	$(TYPE_CHECK) $(DEMO)/A1-OOP/cold
+	$(TYPE_CHECK) $(DEMO)/A2-ABC/egypt
 
 .PHONY: check-style
 check-style:
-	$(STYLE_CHECK) $(ASSIGNMENT)/A0/hello
-	$(STYLE_CHECK) $(ASSIGNMENT)/A0-OOP/hello
-	$(STYLE_CHECK) $(ASSIGNMENT)/A1/cold
-	$(STYLE_CHECK) $(ASSIGNMENT)/A1-OOP/cold
-	$(STYLE_CHECK) $(ASSIGNMENT)/A2-ABC/egypt
+	$(STYLE_CHECK) $(DEMO)/A0/hello
+	$(STYLE_CHECK) $(DEMO)/A0-OOP/hello
+	$(STYLE_CHECK) $(DEMO)/A1/cold
+	$(STYLE_CHECK) $(DEMO)/A1-OOP/cold
+	$(STYLE_CHECK) $(DEMO)/A2-ABC/egypt
 
 # discover and run all tests
 .PHONY: run-test
 run-test:
-	$(TEST) $(TEST_ARGS) $(ASSIGNMENT)/A0/hello/tests
-	$(TEST) $(TEST_ARGS) $(ASSIGNMENT)/A0-OOP/hello/tests
-	$(TEST) $(TEST_ARGS) $(ASSIGNMENT)/A1/cold/tests
-	$(TEST) $(TEST_ARGS) $(ASSIGNMENT)/A1-OOP/cold/tests
-	$(TEST) $(TEST_ARGS) $(ASSIGNMENT)/A2-ABC/egypt/tests
+	$(TEST) $(TEST_ARGS) $(DEMO)/A0/hello/tests
+	$(TEST) $(TEST_ARGS) $(DEMO)/A0-OOP/hello/tests
+	$(TEST) $(TEST_ARGS) $(DEMO)/A1/cold/tests
+	$(TEST) $(TEST_ARGS) $(DEMO)/A1-OOP/cold/tests
+	$(TEST) $(TEST_ARGS) $(DEMO)/A2-ABC/egypt/tests
 
 .PHONY: run-test-coverage
 run-test-coverage:
-	$(COVERAGE) -v --cov-report=html:$(ASSIGNMENT)/A0/hello/htmlcov --cov-report=term --cov=$(ASSIGNMENT)/A0/hello $(ASSIGNMENT)/A0/hello/tests
-	$(COVERAGE) -v --cov-report=html:$(ASSIGNMENT)/A0-OOP/hello/htmlcov --cov-report=term --cov=$(ASSIGNMENT)/A0-OOP/hello $(ASSIGNMENT)/A0-OOP/hello/tests
-	$(COVERAGE) -v --cov-report=html:$(ASSIGNMENT)/A1/cold/htmlcov --cov-report=term --cov=$(ASSIGNMENT)/A1/cold $(ASSIGNMENT)/A1/cold/tests
-	$(COVERAGE) -v --cov-report=html:$(ASSIGNMENT)/A1-OOP/cold/htmlcov --cov-report=term --cov=$(ASSIGNMENT)/A1-OOP/cold $(ASSIGNMENT)/A1-OOP/cold/tests
-	$(COVERAGE) -v --cov-report=html:$(ASSIGNMENT)/A2-ABC/egypt/htmlcov --cov-report=term --cov=$(ASSIGNMENT)/A2-ABC/egypt $(ASSIGNMENT)/A2-ABC/egypt/tests
+	$(COVERAGE) -v --cov-report=html:$(DEMO)/A0/hello/htmlcov --cov-report=term --cov=$(DEMO)/A0/hello $(DEMO)/A0/hello/tests
+	$(COVERAGE) -v --cov-report=html:$(DEMO)/A0-OOP/hello/htmlcov --cov-report=term --cov=$(DEMO)/A0-OOP/hello $(DEMO)/A0-OOP/hello/tests
+	$(COVERAGE) -v --cov-report=html:$(DEMO)/A1/cold/htmlcov --cov-report=term --cov=$(DEMO)/A1/cold $(DEMO)/A1/cold/tests
+	$(COVERAGE) -v --cov-report=html:$(DEMO)/A1-OOP/cold/htmlcov --cov-report=term --cov=$(DEMO)/A1-OOP/cold $(DEMO)/A1-OOP/cold/tests
+	$(COVERAGE) -v --cov-report=html:$(DEMO)/A2-ABC/egypt/htmlcov --cov-report=term --cov=$(DEMO)/A2-ABC/egypt $(DEMO)/A2-ABC/egypt/tests
 
 .PHONY: clean
 clean:

demo-assignments/A1-OOP/cold/Makefile

@@ -21,4 +21,3 @@ clean:
 	rm -rf `find . -type d -name __pycache__`
 	rm -rf `find . -type d -name .pytest_cache`
 	rm -rf `find . -type d -name .mypy_cache`
-

notebooks/ObjectOrientedDesign.ipynb

@@ -34,9 +34,12 @@
     "\n",
     "## Object-oriented programming (OOP)\n",
     "- process of converting a design into a working program that does what the product owner originally requested\n",
-    "- some popular development models are: **waterfall** and **iterative**\n",
-    "- **iterative** is more popular in modern software engineering\n",
-    "\n",
+    "- some popular development models are: **waterfall**, **iterative**, **agile**, etc.\n",
+    "- **waterfall** is the traditional model where each phase is completed before the next phase begins\n",
+    "- **agile** is a more modern model where focus is on delivering working software in short iterations\n",
+    "    - ci-cd (continuous integration, continuous deployment) is a popular agile model\n",
+    "    - scrum, kanban, pair programming, etc. are popular agile methodologies\n",
+    "    - focus is on delivering working software quickly and frequently as a team effort with high customer satisfaction\n",
     "\n",
     "## Objects and Classes\n",
     "- *object* is a collection of data with associated behaviors\n",