Merge branch 'master' of https://github.com/AY2324S2-CS2113-T13-1/tp

AY2324S2-CS2113-T13-1 · Apr 10, 2024 · 3be3a28 · 3be3a28
2 parents 04e791f + b445e38
commit 3be3a28
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/docs/AboutUs.md b/docs/AboutUs.md
@@ -2,10 +2,10 @@
 
 Display |    Name     | Github Profile | Portfolio 
 --------|:-----------:|:--------------:|:---------:
-![saber](assets/images/saber.jpg) | Yuhao ZHANG | [Github](https://github.com/yzhanglp) | [Portfolio](https://yzhanglp.com)
+![saber](assets/images/saber.jpg) | Zhang Yuhao  | [Github](https://github.com/yzhanglp) | [Portfolio](https://yzhanglp.com)
 ![bocchi](assets/images/bocchi.jpg) | Yao Chenguang|[Github](https://github.com/classskipper351)|
-![](https://via.placeholder.com/100.png?text=Photo) | Yung Ka Shing | [Github](https://github.com/andy123qq4) | [Portfolio](https://google.com)
-![](../docs/pics/IMG_1918.PNG) | Huang Maodian | [Github](https://github.com/Geinzit) | [Portfolio](../docs/team/heinzhuang.md)
-![](https://via.placeholder.com/100.png?text=Photo) | LIN Siyan | [Github](https://github.com/Celineyaa) | [Portfolio](docs/team/johndoe.md)
+![andy123qq4](assets/images/andy123qq4.jpg) | Yung Ka Shing | [Github](https://github.com/andy123qq4) | [Portfolio](../docs/team/andy123qq4.md)
+![](assets/images/IMG_1918.PNG) | Huang Maodian | [Github](https://github.com/Geinzit) | [Portfolio](../docs/team/heinzhuang.md)
+![](https://via.placeholder.com/100.png?text=Photo) | Lin Siyan | [Github](https://github.com/Celineyaa) | [Portfolio](docs/team/johndoe.md)
 
 
diff --git a/docs/pics/IMG_1918.PNG → docs/assets/images/IMG_1918.PNG b/docs/pics/IMG_1918.PNG → docs/assets/images/IMG_1918.PNG
diff --git a/docs/assets/images/andy123qq4.jpg b/docs/assets/images/andy123qq4.jpg
diff --git a/docs/team/andy123qq4.md b/docs/team/andy123qq4.md
@@ -0,0 +1,5 @@
+# Andy YUNG
+
+GitHub username: andy123qq4
+
+Student from HKUST, studying computer science and business.
diff --git a/docs/team/heinzhuang.md b/docs/team/heinzhuang.md
@@ -1,5 +1,5 @@
 # Heinz Huang
 
-github username: Geinzit
+GitHub username: Geinzit
 
 Professional Gamer. Amateur Coder.
diff --git a/src/main/java/seedu/duke/calculator.puml b/src/main/java/seedu/duke/calculator.puml
@@ -0,0 +1,14 @@
+@startuml
+
+class Calculator {
+    - Stack<Double> numStack
+    - Stack<String> opStack
+    + calculate(sb: StringBuilder): double
+    - calculateTwo(num1: double, num2: double, op: String): double
+    - toSuffix(formula: ArrayList<Object>): ArrayList<Object>
+    - prior(op1: String, op2: String): boolean
+    - getPriority(op: String): int
+    - toFormula(sb: StringBuilder): ArrayList<Object>
+}
+
+@enduml