From 36e2e5faa770e66d3f67b107465968f0e15d50d9 Mon Sep 17 00:00:00 2001
From: RossTheRoss <msattr@gmail.com>
Date: Mon, 4 Feb 2019 18:45:07 +0000
Subject: Fix things

---
 ee1301/wk1/hw1_directory/strap012_1A.cpp |  1 -
 ee1301/wk1/hw1_directory/strap012_1B.cpp | 19 ++++++++++---------
 ee1301/wk1/lab1/strap012_lab1_w_1.cpp    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'ee1301')

diff --git a/ee1301/wk1/hw1_directory/strap012_1A.cpp b/ee1301/wk1/hw1_directory/strap012_1A.cpp
index 650bf7a..6b8e8c9 100644
--- a/ee1301/wk1/hw1_directory/strap012_1A.cpp
+++ b/ee1301/wk1/hw1_directory/strap012_1A.cpp
@@ -10,7 +10,6 @@ int main()
   
   cout << "Input the radius of the sphere: ";
    cin >> r;
-  
   cout << "Input the height of the fluid: ";
    cin >> h;
   
diff --git a/ee1301/wk1/hw1_directory/strap012_1B.cpp b/ee1301/wk1/hw1_directory/strap012_1B.cpp
index f5a00da..b635950 100644
--- a/ee1301/wk1/hw1_directory/strap012_1B.cpp
+++ b/ee1301/wk1/hw1_directory/strap012_1B.cpp
@@ -5,28 +5,29 @@ using namespace std;
 
 int main()
 {
-  string option;
+  string opt;
   cout << "Are input components int or float (i/f)? ";
-  cin >> option;
+  cin >> opt;
   
-  if (option == "i") {
+  if (opt == "i") {
     int r;
     int g;
     int b;
     cout << "Input r, g, b: ";
     cin >> r >> g >> b;
     cout << fixed << setprecision(2) << "Float representation: " << r / 255.0 << ", " << g / 255.0 << ", " << b / 255.0;
-    }else{ if (option == "f") {
+  }
+    else{ if (opt == "f") {
        double r;
        double g;
        double b;
        cout << "Input r, g, b: ";
        cin >> r >> g >> b;
        cout << fixed << setprecision(0) << "Integer representation: " << r * 255 << ", " << g * 255 << ", " << b * 255;
-      }else{
+    }
+       else{
         cout << "Invalid option." << endl;
-        return 0;
-      }
-  }
-    cout << endl; 
+        return 0;}
+    }
+    cout << endl;
 }
\ No newline at end of file
diff --git a/ee1301/wk1/lab1/strap012_lab1_w_1.cpp b/ee1301/wk1/lab1/strap012_lab1_w_1.cpp
index 9f70b87..1d50ec3 100644
--- a/ee1301/wk1/lab1/strap012_lab1_w_1.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_w_1.cpp
@@ -5,5 +5,5 @@ using namespace std;
 int main()
 {
     int x = 5;
-    cout << x << "! = " << x * (x / x + x / x + x / x + x / x) * (x / x + x / x + x / x) * (x / x + x / x) * (x / x) << endl;
+    cout << x << "! = " << x * (x - x / x) * (x - x / x - x / x) * (x / x + x / x) * (x / x) << endl;
 }
\ No newline at end of file
-- 
cgit v1.2.3