From 594b8c92345dc46a0192e7f51c01bcd118d6e1bd Mon Sep 17 00:00:00 2001
From: Andrew Kemp <andrew@ankemp.com>
Date: Tue, 3 Mar 2020 08:55:19 -0500
Subject: [PATCH] Cleanup + Constructors

---
 .gitignore                                    |   1 +
 out/production/HelloKotlin/AmsKt.class        | Bin 4743 -> 0 bytes
 out/production/HelloKotlin/FortuneKt.class    | Bin 2591 -> 0 bytes
 .../META-INF/HelloKotlin.kotlin_module        | Bin 55 -> 0 bytes
 .../HelloKotlin/WhatToDoTodayKt.class         | Bin 1792 -> 0 bytes
 src/aquarium/Aquarium.kt                      |  19 +++++++++++
 src/aquarium/main.kt                          |  32 ++++++++++++++++++
 7 files changed, 52 insertions(+)
 create mode 100644 .gitignore
 delete mode 100644 out/production/HelloKotlin/AmsKt.class
 delete mode 100644 out/production/HelloKotlin/FortuneKt.class
 delete mode 100644 out/production/HelloKotlin/META-INF/HelloKotlin.kotlin_module
 delete mode 100644 out/production/HelloKotlin/WhatToDoTodayKt.class
 create mode 100644 src/aquarium/Aquarium.kt
 create mode 100644 src/aquarium/main.kt

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6a3417b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/out/
diff --git a/out/production/HelloKotlin/AmsKt.class b/out/production/HelloKotlin/AmsKt.class
deleted file mode 100644
index 5971c78484380dc50c5559eab88a025a3503f530..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4743
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
PZZy$qqQk^hCVur_j4Vf3

diff --git a/out/production/HelloKotlin/FortuneKt.class b/out/production/HelloKotlin/FortuneKt.class
deleted file mode 100644
index c4d19871288019163d0612535d837776b5aa53d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2591
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
Y{V}W<KZ|iP9dE`cqzfY*i!pxw4UP|e6951J

diff --git a/out/production/HelloKotlin/META-INF/HelloKotlin.kotlin_module b/out/production/HelloKotlin/META-INF/HelloKotlin.kotlin_module
deleted file mode 100644
index 826e8816c6f6e759ea1dd0c66cc1a136f204e765..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 55
zcmZQzU|?ooU|@t|0WMW81|e3*++yz%Ax^jaqLR|QR3MW-JR`9rB;O@JBtIpw(z^rz
D%e4#c

diff --git a/out/production/HelloKotlin/WhatToDoTodayKt.class b/out/production/HelloKotlin/WhatToDoTodayKt.class
deleted file mode 100644
index f8177ba11f794373dc0af2aa29e528a3ae0c55e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1792
zcmah}TT|Oc6#iDeNC*>za<vJm8X$n3VoZ{@iAz%&piwb|#ti9{na-^3jV&xoRFa{*
zWb!xi+L!jR?L&v@Lno8R{-{pR%7&PbP6xAl&e6Gi=eB?U^XFdx?&2xK=(84&w*3`<
z+i&or^+*L{F!uNXFS^`o7N6AiM4hAwhGd639>bN{-OAhV)hKYhW_fOhVY1=}&ElSj
zY5^&RMecci#3RQidee_KyRKU%FFa_58Z?F*Z9j4yuef*6DLP&x0*|{z+mjAMryi=%
z8Lrk_qTb%(0q+RXu*1G1hMCy`6g`yX0m&(@3^EweF^mfgsTSYgKhj_@<PItCYRm7s
z4ZENGR6{)HT{mK=4EpYSI`7-I2V{K&a|5EjVFo5H>QHd$Okt}>VI(>#t}rD0E(N{Z
zGj;sp7F8f3Yr#9^46Y$NgsaFgT#U<pRzbye26bOrxYV4>gUC-X?PPERALy8XMNZz+
zJqGi9IT-E_I{WW3yeDTlEWY2+FiqeN1&>-H&@jWG@j$Hp(B<y`Ht+=ecNxqfFB@2(
z28LbFqXvG&Fw*p`=YC*u>yW!`4Mj>VjQEk&@;k!fUc;jLHRd&xD7*7rVHl?J?~8y(
z-9Ruf`)qgOu~zYM29ubQ-TRbbtkR#@4H5AMk2sC9(m6=bE-`t~SShubg=A@ESX&Yb
z$r}ViyndO}U%%89L+M>(L|)JpEk(CRqFmOXLs?*p8AHiwX3|s^k_(A9Kcy8TmAh%A
z>05F!ZK(0BX=HUu4H2ck`6WFpgDo<GgyF}+b^Y~t%P2e9;?qr^Z_~&nANdW+eYE0u
zVzb++iC~-8T#}d-zs}tq9ypTk3#XoTy~ybZ+dFVVhvcVgx%_t1sWH`v*V`L>zi&4F
zuGtxFz3O*^x>$2$*h@WTMbx^@)gL24?|@H3o$Y(r>4hDzM~OO<q!LrLkwpq=;%(w=
zqGjpF^XAYoM$IvnFw*RpmMpRKJH`ut;KSeOvx2Ybl<k#<IWk!%K0~!5Q)swJcZL2{
zY9&-6vT__qO~!aZCNjoM-n>OI3g#@G$eUxwxcv%a1#><oG;`r+q|C)%Ni~5DI#noB
z%PKyJgPVjuLl8!2!l#J3MYIHA^?YL*cZj1X^miu)HbXD>J&L_a(sUn}1UZ`MGd-v<
zhUCjbG70t}xl7TVok+cSg|s<enNTHRTwBT)t{>yRgr~&tl2C@Ufx@Vil}6@IVvWbx
zqWk;m#`2c_?nLRmS<~}X>x5d<3s%WGr}%7e7S|&^U(rjGrQ4-@4@!D|RmV3J<6DCM
zfIydbk+AVu{9D53C)`6DUtrnBmw2=b7GedfyU2v}Mqn+37N10<LrjL44lxtrZY=!j
EU!F;%00000

diff --git a/src/aquarium/Aquarium.kt b/src/aquarium/Aquarium.kt
new file mode 100644
index 0000000..e65e4ab
--- /dev/null
+++ b/src/aquarium/Aquarium.kt
@@ -0,0 +1,19 @@
+package aquarium
+
+class Aquarium(var length: Int = 100, var width: Int = 20, var height: Int = 40) {
+
+    var volume: Int
+        get() = width * height * length / 1000
+        set(value) {
+            height = (value * 1000) / (width * length)
+        }
+
+    var water = volume * 0.9
+
+    constructor(numberOfFish: Int): this() {
+        val water = numberOfFish * 2000 // cm3
+        val tank = water + water * 0.1
+        height = (tank / (length * width)).toInt()
+    }
+
+}
\ No newline at end of file
diff --git a/src/aquarium/main.kt b/src/aquarium/main.kt
new file mode 100644
index 0000000..47a880f
--- /dev/null
+++ b/src/aquarium/main.kt
@@ -0,0 +1,32 @@
+package aquarium
+
+fun main(args: Array<String>) {
+    buildAquarium()
+}
+
+private fun buildAquarium() {
+    val myAquarium = Aquarium()
+
+    println(
+        "Length: ${myAquarium.length}" +
+        "Width: ${myAquarium.width}" +
+        "Height: ${myAquarium.height}"
+    )
+
+    myAquarium.height = 80
+
+    println("Height: ${myAquarium.height} cm")
+
+    println("Volume: ${myAquarium.volume} liters")
+
+    val smallAquarium = Aquarium(length=20, width=15, height=30)
+    println("Small Aquarium Volume: ${smallAquarium.volume} liters")
+
+    val myAquarium2 = Aquarium(numberOfFish = 9)
+    println(
+        "Aquarium 2: ${myAquarium2.volume} liters with " +
+        "length ${myAquarium2.length}" +
+        "width: ${myAquarium2.width}" +
+        "height: ${myAquarium2.height}"
+    )
+}