9 files changed, 161 insertions, 161 deletions
diff --git a/ee1301/wk1/hw1_directory/strap012_1A.cpp b/ee1301/wk1/hw1_directory/strap012_1A.cpp
index 96ffcab..abef32d 100644
--- a/ee1301/wk1/hw1_directory/strap012_1A.cpp
+++ b/ee1301/wk1/hw1_directory/strap012_1A.cpp
@@ -1,21 +1,21 @@
-#include <iostream>
-#include <cmath>
-#include <iomanip>
-using namespace std;
-
-int main()
-{
-  float r; //Radius
-  float h; //Height
-  
-  cout << "Input the radius of the sphere: ";
-   cin >> r;
-  cout << "Input the height of the fluid: ";
-   cin >> h;
-  
-  cout << fixed << setprecision(2) //Set rounding to 2 decimal places
-    << "Volume of the entire tank: " << ((4.0/3) * M_PI * pow(r, 3)) << endl
-    << "Surface area of the entire tank: " << (4 * M_PI * pow(r, 2)) << endl
-    << "Volume of the fluid: " << (1.0/3) * (M_PI * pow(h, 2) * (3 * r - h )) << endl
-    << "Surface area covered by the fluid: " << (2 * M_PI * r * h) << endl << endl;
+#include <iostream>
+#include <cmath>
+#include <iomanip>
+using namespace std;
+
+int main()
+{
+  float r; //Radius
+  float h; //Height
+  
+  cout << "Input the radius of the sphere: ";
+   cin >> r;
+  cout << "Input the height of the fluid: ";
+   cin >> h;
+  
+  cout << fixed << setprecision(2) //Set rounding to 2 decimal places
+    << "Volume of the entire tank: " << ((4.0/3) * M_PI * pow(r, 3)) << endl
+    << "Surface area of the entire tank: " << (4 * M_PI * pow(r, 2)) << endl
+    << "Volume of the fluid: " << (1.0/3) * (M_PI * pow(h, 2) * (3 * r - h )) << endl
+    << "Surface area covered by the fluid: " << (2 * M_PI * r * h) << endl << endl;
 }
 \ No newline at end of file
diff --git a/ee1301/wk1/hw1_directory/strap012_1B.cpp b/ee1301/wk1/hw1_directory/strap012_1B.cpp
index b635950..7f5a487 100644
--- a/ee1301/wk1/hw1_directory/strap012_1B.cpp
+++ b/ee1301/wk1/hw1_directory/strap012_1B.cpp
@@ -1,33 +1,33 @@
-#include <iostream>
-#include <string>
-#include <iomanip>
-using namespace std;
-
-int main()
-{
-  string opt;
-  cout << "Are input components int or float (i/f)? ";
-  cin >> opt;
-  
-  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 (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{
-        cout << "Invalid option." << endl;
-        return 0;}
-    }
-    cout << endl;
+#include <iostream>
+#include <string>
+#include <iomanip>
+using namespace std;
+
+int main()
+{
+  string opt;
+  cout << "Are input components int or float (i/f)? ";
+  cin >> opt;
+  
+  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 (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{
+        cout << "Invalid option." << endl;
+        return 0;}
+    }
+    cout << endl;
 }
 \ No newline at end of file
diff --git a/ee1301/wk1/lab1/strap012_lab1_c_1.cpp b/ee1301/wk1/lab1/strap012_lab1_c_1.cpp
index e3cdcdb..362110f 100644
--- a/ee1301/wk1/lab1/strap012_lab1_c_1.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_c_1.cpp
@@ -1,24 +1,24 @@
-#include <iostream>
-#include <string>
-using namespace std;
-
-int main()
-{
-    string name1;
-    string name2;
-    int h1, h2;
-    
-    cout << "Enter your name: ";
-    getline (cin,name1);
-    cout << "Enter your height: ";
-    cin >> h1;
-    cout << "Enter your comrade's name: ";
-    cin.ignore();
-    getline (cin,name2);
-    cout << "Enter your comrade's height: ";
-    cin >> h2;
-    
-    cout << name1 << " and " << name2 << " standing on top of each other are " << h1+h2 << " feet tall!" << endl;
-  
-  
-}
+#include <iostream>
+#include <string>
+using namespace std;
+
+int main()
+{
+    string name1;
+    string name2;
+    int h1, h2;
+    
+    cout << "Enter your name: ";
+    getline (cin,name1);
+    cout << "Enter your height: ";
+    cin >> h1;
+    cout << "Enter your comrade's name: ";
+    cin.ignore();
+    getline (cin,name2);
+    cout << "Enter your comrade's height: ";
+    cin >> h2;
+    
+    cout << name1 << " and " << name2 << " standing on top of each other are " << h1+h2 << " feet tall!" << endl;
+  
+  
+}
diff --git a/ee1301/wk1/lab1/strap012_lab1_c_2.cpp b/ee1301/wk1/lab1/strap012_lab1_c_2.cpp
index c2b3893..40d13fe 100644
--- a/ee1301/wk1/lab1/strap012_lab1_c_2.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_c_2.cpp
@@ -1,13 +1,13 @@
-#include <iostream>
-#include <string>
-using namespace std;
-
-int main()
-{
-    string first, last;
-    cout << "What is your full name?" << endl;
-    getline (cin,first);
-    //cin.ignore();
-    getline (cin,last);
-    cout << last << ", " << first << endl;
-}
+#include <iostream>
+#include <string>
+using namespace std;
+
+int main()
+{
+    string first, last;
+    cout << "What is your full name?" << endl;
+    getline (cin,first);
+    //cin.ignore();
+    getline (cin,last);
+    cout << last << ", " << first << endl;
+}
diff --git a/ee1301/wk1/lab1/strap012_lab1_s_1.cpp b/ee1301/wk1/lab1/strap012_lab1_s_1.cpp
index db5c6aa..32176b5 100644
--- a/ee1301/wk1/lab1/strap012_lab1_s_1.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_s_1.cpp
@@ -1,10 +1,10 @@
-#include <iostream>
-#include <math.h>
-using namespace std;
-
-int main()
-{
-    int x=20;
-    double h = 1e-14;
-    cout << (pow(x+h, 3)-pow(x,3))/h << endl;
+#include <iostream>
+#include <math.h>
+using namespace std;
+
+int main()
+{
+    int x=20;
+    double h = 1e-14;
+    cout << (pow(x+h, 3)-pow(x,3))/h << endl;
 }
 \ No newline at end of file
diff --git a/ee1301/wk1/lab1/strap012_lab1_s_2.cpp b/ee1301/wk1/lab1/strap012_lab1_s_2.cpp
index 4b63f5c..0178f67 100644
--- a/ee1301/wk1/lab1/strap012_lab1_s_2.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_s_2.cpp
@@ -1,14 +1,14 @@
-#include <iostream>
-using namespace std;
-
-int main()
-{
-    double tf;
-    cout << "Enter temperature in degrees Celsius: ";
-    cin >> tf;
-    char c = 'F';
-    double tc = tf;
-    char f = 'C';
-    cout << tc << " degrees " << f << " = " << tf * (9/5.0) + 32 <<" degrees " << c << endl;
-}
-
+#include <iostream>
+using namespace std;
+
+int main()
+{
+    double tf;
+    cout << "Enter temperature in degrees Celsius: ";
+    cin >> tf;
+    char c = 'F';
+    double tc = tf;
+    char f = 'C';
+    cout << tc << " degrees " << f << " = " << tf * (9/5.0) + 32 <<" degrees " << c << endl;
+}
+
diff --git a/ee1301/wk1/lab1/strap012_lab1_s_3.cpp b/ee1301/wk1/lab1/strap012_lab1_s_3.cpp
index 346f8c9..b9a68b1 100644
--- a/ee1301/wk1/lab1/strap012_lab1_s_3.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_s_3.cpp
@@ -1,29 +1,29 @@
-#include <iostream>
-#include <string>
-#include <stdlib.h>
-using namespace std;
-
-int main () {
-	string name, quest, color, assyria, swallowSpeed;
-	cout << "Before you cross this bridge, answer the questions three." << endl << endl << "Question the first: what is your name? ";
-	cin >> name;
-	cout << "What is your quest? ";
-	cin >> quest;
-	int a = rand() % 3 + 1;
-	if (a == 1) {
-		cout << "What is your favorite color? ";
-		cin >> color; }
-	if (a == 2) {
-		cout << "What is the captial of Assyria? ";
-		cin >> assyria; }
-	if (a == 3) {
-		cout << "What is the air speed of an unladen swallow?";
-		getline(cin,swallowSpeed); }
-
-	if (color == "null" || assyria == "Nineveh" || swallowSpeed == "African or European?") {
-		cout << endl << "Go on." << endl; }
-		else {
-			cout << "BEGONE" << endl;
-			return 100; }
-
-}
+#include <iostream>
+#include <string>
+#include <stdlib.h>
+using namespace std;
+
+int main () {
+	string name, quest, color, assyria, swallowSpeed;
+	cout << "Before you cross this bridge, answer the questions three." << endl << endl << "Question the first: what is your name? ";
+	cin >> name;
+	cout << "What is your quest? ";
+	cin >> quest;
+	int a = rand() % 3 + 1;
+	if (a == 1) {
+		cout << "What is your favorite color? ";
+		cin >> color; }
+	if (a == 2) {
+		cout << "What is the captial of Assyria? ";
+		cin >> assyria; }
+	if (a == 3) {
+		cout << "What is the air speed of an unladen swallow?";
+		getline(cin,swallowSpeed); }
+
+	if (color == "null" || assyria == "Nineveh" || swallowSpeed == "African or European?") {
+		cout << endl << "Go on." << endl; }
+		else {
+			cout << "BEGONE" << endl;
+			return 100; }
+
+}
diff --git a/ee1301/wk1/lab1/strap012_lab1_w_0.cpp b/ee1301/wk1/lab1/strap012_lab1_w_0.cpp
index 2ea9134..af1582a 100644
--- a/ee1301/wk1/lab1/strap012_lab1_w_0.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_w_0.cpp
@@ -1,13 +1,13 @@
-#include <iostream>
-using namespace std;
-
-int main()
-{
-   int students;
-   int section;
-    cout << "Number of students: ";
-    cin >> students;
-    cout << "Number of sections: ";
-    cin >> section;
-    cout << "The lecture to lab ratio is " << students/section << ":1." << endl;
+#include <iostream>
+using namespace std;
+
+int main()
+{
+   int students;
+   int section;
+    cout << "Number of students: ";
+    cin >> students;
+    cout << "Number of sections: ";
+    cin >> section;
+    cout << "The lecture to lab ratio is " << students/section << ":1." << 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 1d50ec3..77780c5 100644
--- a/ee1301/wk1/lab1/strap012_lab1_w_1.cpp
+++ b/ee1301/wk1/lab1/strap012_lab1_w_1.cpp
@@ -1,9 +1,9 @@
-#include <iostream>
-#include <string>
-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) << endl;
+#include <iostream>
+#include <string>
+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) << endl;
 }
 \ No newline at end of file