First bit done

2 files changed, 42 insertions, 0 deletions

diff --git a/ee1301/wk1/hw1_directory/strap012_1A.cpp b/ee1301/wk1/hw1_directory/strap012_1A.cpp
index e69de29..c230e00 100644
--- a/ee1301/wk1/hw1_directory/strap012_1A.cpp
+++ b/ee1301/wk1/hw1_directory/strap012_1A.cpp
@@ -0,0 +1,23 @@
+#include <iostream>
+#include <math.h>
+#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 h 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 e69de29..472f96d 100644
--- a/ee1301/wk1/hw1_directory/strap012_1B.cpp
+++ b/ee1301/wk1/hw1_directory/strap012_1B.cpp
@@ -0,0 +1,19 @@
+#include <iostream>
+#include <string>
+using namespace std;
+
+int main()
+{
+  string option;
+  cout << "Are input components int or float (i/f)? ";
+  cin >> option;
+  
+  if (option == "i") {
+    cout << "E";
+    }else{ if (option == "f") {
+      cout << "e";
+      }else{
+          cout << "nah.";
+      }
+  }
+}
\ No newline at end of file