Do a thing:

2 files changed, 52 insertions, 52 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