Exercise Completed!! Committing fix as instructed. Hope the files reach ya.develop2

2 files changed, 42 insertions, 66 deletions

diff --git a/In Class Exercise 8/In Class Exercise 8/NestedLoops.cpp b/In Class Exercise 8/In Class Exercise 8/NestedLoops.cpp
index 64fc96d..0d3189c 100644
--- a/In Class Exercise 8/In Class Exercise 8/NestedLoops.cpp
+++ b/In Class Exercise 8/In Class Exercise 8/NestedLoops.cpp
@@ -1,20 +1,48 @@
 #include <iostream>
 #include "NestedLoops.h"
 
-void NestedForLoop(size_t n, size_t m)
-{
 
+void NestedForLoop(size_t n, size_t m) 
+{
+    for (size_t i = 0; i < n; ++i) 
+    {
+        for (size_t j = 0; j < m; ++j) 
+        {
+            std::cout << i * j << std::endl;
+        }
+    }
 }
 
-void NestedWhileLoop(size_t n, size_t m)
+void NestedWhileLoop(size_t n, size_t m) 
 {
-
+    size_t i = 0;
+    while (i < n) 
+    {
+        size_t j = 0;
+        while (j < m) 
+        {
+            std::cout << i * j << std::endl;
+            ++j;
+        }
+        ++i;
+    }
 }
 
-void NestedDoWhileLoop(size_t n, size_t m)
+void NestedDoWhileLoop(size_t n, size_t m) 
 {
-
+    size_t i = 0;
+    do {
+        size_t j = 0;
+        do {
+            if (i == 0 && j == 0)
+            {
+                ++j;
+                continue;
+            }
+            std::cout << i * j << std::endl;
+            ++j;
+        } while (j <= m);
+        ++i;
+    } while (i <= n);
 }
 
-
-// NOTE: As instructed in class. Not sure why it's not all working together.
\ No newline at end of file
diff --git a/In Class Exercise 8/In Class Exercise 8/program.cpp b/In Class Exercise 8/In Class Exercise 8/program.cpp
index bb93475..138e6fc 100644
--- a/In Class Exercise 8/In Class Exercise 8/program.cpp
+++ b/In Class Exercise 8/In Class Exercise 8/program.cpp
@@ -3,69 +3,17 @@
 // Class: CST 116
 // Assignment: In Class Exercise 8
 
-
-#include <iostream>
 #include "NestedLoops.h"
 
-using std::cout;
-using std::cin;
-using std::endl;
-
-void NestedForLoop();
-void NestedWhileLoop();
-void NestedDoWhileLoop();
 
-
-int main()
+int main() 
 {
+    size_t n = 5, m = 5; // Just two example values
 
-	//NestedForLoop();
-	//NestedWhileLoop();
-	//NestedDoWhileLoop();
-
-    NestedForLoop(0, 20);
-    NestedWhileLoop(0, 50);
-    NestedDoWhileLoop(0, 100);
+    NestedForLoop(n, m);
+    NestedWhileLoop(n, m);
+    NestedDoWhileLoop(n, m);
 
-	return 0;
-}
-
-void NestedForLoop(size_t n, size_t m)
-{
-    for (size_t i = 0; i < n; ++i) 
-    {
-        for (size_t j = 0; j < m; ++j) 
-        {
-            cout << i * j << endl;
-        }
-    }
-}
-
-void NestedWhileLoop(size_t n, size_t m)
-{
-    size_t i = 0;
-    while (i < n) 
-    {
-        size_t j = 0;
-        while (j < m) 
-        {
-            cout << i * j << endl;
-            ++j;
-        }
-        ++i;
-    }
-}
-
-void NestedDoWhileLoop(size_t n, size_t m)
-{
-    size_t i = 0;
-    do {
-        size_t j = 0;
-        do {
-            cout << i * j << endl;
-            ++j;
-        } while (j < m);
-        ++i;
-    } while (i < n);
+    return 0;
 }