From 01dd60772a47a73e4c4c2e6e23f4b9b7bca562e8 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Wed, 5 Sep 2018 14:01:15 +0800
Subject: [PATCH] a little bit fixes

---
 .../domain/entities/operations/Operation.kt   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/entities/operations/Operation.kt b/src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/entities/operations/Operation.kt
index d08c1b5..88dc30f 100644
--- a/src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/entities/operations/Operation.kt
+++ b/src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/entities/operations/Operation.kt
@@ -16,6 +16,9 @@ class ConverterException: IOException("This converter can't convert input number
 val List<Operation>.canGrowSimpleWay: Boolean
     get() = contains(SixGrowSeven)
 
+val List<Operation>.containsSimpleGrows: Boolean
+    get() = firstOrNull { it == FiveGrowNine || it == NineGrowFive || it is GrowCustom } != null
+
 private val operations = listOf(
     TwoGrowFour,
     FourGrowTwo,
@@ -152,16 +155,15 @@ object OneGrowEight : Operation() {
 
 object SixGrowSeven : Operation() {
     override suspend fun canConvert(numbers: MutableList<Byte>, changesHistory: List<Operation>): Boolean {
-        return numbers.contains(sixAsByte) && OneGrowEight.canConvert(numbers, changesHistory)
+        return numbers.contains(sixAsByte)
     }
     override suspend fun canInvert(numbers: MutableList<Byte>, changesHistory: List<Operation>): Boolean {
-        return numbers.contains(sevenAsByte) && EightGrowOne.canConvert(numbers, changesHistory) && changesHistory.contains(this)
-            && !changesHistory.contains(FiveGrowNine) && !changesHistory.contains(NineGrowFive)
+        return numbers.contains(sevenAsByte) && changesHistory.contains(this)
+            && !changesHistory.containsSimpleGrows
     }
 
     override suspend fun doConvert(numbers: MutableList<Byte>, changesHistory: MutableList<Operation>?) {
         numbers.apply {
-            OneGrowEight.convert(numbers, changesHistory)
             remove(sixAsByte)
             add(sevenAsByte)
         }
@@ -169,7 +171,6 @@ object SixGrowSeven : Operation() {
 
     override suspend fun doInvert(numbers: MutableList<Byte>, changesHistory: MutableList<Operation>?) {
         numbers.apply {
-            OneGrowEight.invert(numbers, changesHistory)
             add(sixAsByte)
             remove(sevenAsByte)
         }
@@ -178,20 +179,18 @@ object SixGrowSeven : Operation() {
 
 object SevenGrowSix : Operation() {
     override suspend fun canConvert(numbers: MutableList<Byte>, changesHistory: List<Operation>): Boolean {
-        return numbers.contains(sevenAsByte) && EightGrowOne.canConvert(numbers, changesHistory)
-            && !changesHistory.contains(FiveGrowNine) && !changesHistory.contains(NineGrowFive)
+        return numbers.contains(sevenAsByte)
+            && !changesHistory.containsSimpleGrows
     }
     override suspend fun canInvert(numbers: MutableList<Byte>, changesHistory: List<Operation>): Boolean {
-        return numbers.contains(sixAsByte) && OneGrowEight.canConvert(numbers, changesHistory) && changesHistory.contains(this)
+        return numbers.contains(sixAsByte) && changesHistory.contains(this)
     }
 
     override suspend fun doConvert(numbers: MutableList<Byte>, changesHistory: MutableList<Operation>?) {
-        EightGrowOne.convert(numbers, changesHistory)
         SixGrowSeven.invert(numbers)
     }
 
     override suspend fun doInvert(numbers: MutableList<Byte>, changesHistory: MutableList<Operation>?) {
-        EightGrowOne.invert(numbers, changesHistory)
         SixGrowSeven.convert(numbers)
     }
 }