From 2ea0e5acf978e6f462c46b1d403dfe2cbacaadd8 Mon Sep 17 00:00:00 2001
From: Insaf <insafanas@mail.ru>
Date: Sun, 19 Sep 2021 13:54:31 +0300
Subject: [PATCH] created a calculator blank

---
 .../com/itis/androidlabproject/Calculator.kt  | 31 +++++++++++++++++++
 .../itis/androidlabproject/Engineerable.kt    |  7 +++++
 .../EngineeringCalculator.kt                  | 23 ++++++++++++++
 .../com/itis/androidlabproject/Graphable.kt   |  5 +++
 .../androidlabproject/GraphingCalculator.kt   |  9 ++++++
 .../itis/androidlabproject/MainActivity.kt    |  8 ++++-
 6 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/itis/androidlabproject/Calculator.kt
 create mode 100644 app/src/main/java/com/itis/androidlabproject/Engineerable.kt
 create mode 100644 app/src/main/java/com/itis/androidlabproject/EngineeringCalculator.kt
 create mode 100644 app/src/main/java/com/itis/androidlabproject/Graphable.kt
 create mode 100644 app/src/main/java/com/itis/androidlabproject/GraphingCalculator.kt

diff --git a/app/src/main/java/com/itis/androidlabproject/Calculator.kt b/app/src/main/java/com/itis/androidlabproject/Calculator.kt
new file mode 100644
index 0000000..11f93b3
--- /dev/null
+++ b/app/src/main/java/com/itis/androidlabproject/Calculator.kt
@@ -0,0 +1,31 @@
+package com.itis.androidlabproject
+
+import java.util.*
+
+open class Calculator(
+    var expression: String
+) {
+    private val Pi = 3.14
+    private val E = 2.71
+    private var expTree: TreeSet<Double>? = null
+
+    open fun calculate () {
+
+    }
+
+    private fun plus (a: Double, b: Double) : Double {
+        TODO()
+    }
+
+    private fun minus (a: Double, b: Double) : Double {
+        TODO()
+    }
+
+    private fun divide (a: Double, b: Double) : Double {
+        TODO()
+    }
+
+    private fun multiply (a: Double, b: Double) : Double {
+        TODO()
+    }
+}
diff --git a/app/src/main/java/com/itis/androidlabproject/Engineerable.kt b/app/src/main/java/com/itis/androidlabproject/Engineerable.kt
new file mode 100644
index 0000000..4e2c480
--- /dev/null
+++ b/app/src/main/java/com/itis/androidlabproject/Engineerable.kt
@@ -0,0 +1,7 @@
+package com.itis.androidlabproject
+
+interface Engineerable {
+    fun calcLog (a: Double, b: Double) : Double
+    fun sin(a: Double) : Double
+    fun cos(a: Double) : Double
+}
diff --git a/app/src/main/java/com/itis/androidlabproject/EngineeringCalculator.kt b/app/src/main/java/com/itis/androidlabproject/EngineeringCalculator.kt
new file mode 100644
index 0000000..800e5a4
--- /dev/null
+++ b/app/src/main/java/com/itis/androidlabproject/EngineeringCalculator.kt
@@ -0,0 +1,23 @@
+package com.itis.androidlabproject
+
+class EngineeringCalculator (
+    expression: String
+) : Calculator(expression), Engineerable {
+    override fun calculate () {
+
+    }
+
+    override fun calcLog(a: Double, b: Double): Double {
+        TODO("Not yet implemented")
+    }
+
+    override fun sin(a: Double): Double {
+        TODO("Not yet implemented")
+    }
+
+    override fun cos(a: Double): Double {
+        TODO("Not yet implemented")
+    }
+
+
+}
diff --git a/app/src/main/java/com/itis/androidlabproject/Graphable.kt b/app/src/main/java/com/itis/androidlabproject/Graphable.kt
new file mode 100644
index 0000000..7a41a85
--- /dev/null
+++ b/app/src/main/java/com/itis/androidlabproject/Graphable.kt
@@ -0,0 +1,5 @@
+package com.itis.androidlabproject
+
+interface Graphable {
+    fun buildGraph()
+}
diff --git a/app/src/main/java/com/itis/androidlabproject/GraphingCalculator.kt b/app/src/main/java/com/itis/androidlabproject/GraphingCalculator.kt
new file mode 100644
index 0000000..04a6777
--- /dev/null
+++ b/app/src/main/java/com/itis/androidlabproject/GraphingCalculator.kt
@@ -0,0 +1,9 @@
+package com.itis.androidlabproject
+
+class GraphingCalculator(
+    expression: String
+) : Calculator(expression), Graphable {
+    override fun buildGraph() {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/app/src/main/java/com/itis/androidlabproject/MainActivity.kt b/app/src/main/java/com/itis/androidlabproject/MainActivity.kt
index d85e6eb..729b023 100644
--- a/app/src/main/java/com/itis/androidlabproject/MainActivity.kt
+++ b/app/src/main/java/com/itis/androidlabproject/MainActivity.kt
@@ -7,5 +7,11 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        var simpleCalculator = Calculator("5.2+4")
+        var gCalculator = GraphingCalculator("y=5*x")
+        var engineeringCalculator = EngineeringCalculator("")
+
+        println(simpleCalculator.calculate())
     }
-}
\ No newline at end of file
+}