Fix: review comments

Author: sergeypospelov

utbot-framework/src/main/kotlin/org/utbot/engine/pc/Query.kt

@@ -99,7 +99,7 @@ data class Query(
     private val gts: PersistentMap<UtExpression, Long> = persistentHashMapOf()
 ) : BaseQuery(hard, soft, assumptions, status, lastAdded) {
 
-    val rewriter: Simplificator
+    val simplificator: Simplificator
         get() = Simplificator(eqs, lts, gts)
 
     private fun UtBoolExpression.simplify(visitor: Simplificator): UtBoolExpression =

utbot-framework/src/main/kotlin/org/utbot/engine/pc/UtSolver.kt

@@ -152,7 +152,7 @@ data class UtSolver constructor(
     private var canBeCloned: Boolean = true
 
     val simplificator: Simplificator
-        get() = constraints.let { if (it is Query) it.rewriter else Simplificator() }
+        get() = constraints.let { if (it is Query) it.simplificator else Simplificator() }
 
     /**
      * Returns the current status of the constraints.

utbot-framework/src/main/kotlin/org/utbot/engine/simplificators/MemoryUpdateSimplificator.kt

@@ -41,24 +41,24 @@ typealias SymbolicEnumValuesType = PersistentList<ObjectValue>
 class MemoryUpdateSimplificator(
     private val simplificator: Simplificator
 ) : CachingSimplificatorAdapter<MemoryUpdate>() {
-    override fun simplifyImpl(expression: MemoryUpdate): MemoryUpdate {
-        val stores = simplifyStores(expression.stores)
-        val touchedChunkDescriptors = simplifyTocuhedChunkDescriptors(expression.touchedChunkDescriptors)
-        val concrete = simplifyConcrete(expression.concrete)
-        val mockInfos = simplifyMockInfos(expression.mockInfos)
-        val staticInstanceStorage = simplifyStaticInstanceStorage(expression.staticInstanceStorage)
-        val initializedStaticFields = simplifyInitializedStaticFields(expression.initializedStaticFields)
-        val staticFieldsUpdates = simplifyStaticFieldsUpdates(expression.staticFieldsUpdates)
-        val meaningfulStaticFields = simplifyMeaningfulStaticFields(expression.meaningfulStaticFields)
-        val addrToArrayType = simplifyAddrToArrayType(expression.addrToArrayType)
-        val addrToMockInfo = simplifyAddToMockInfo(expression.addrToMockInfo)
-        val visitedValues = simplifyVisitedValues(expression.visitedValues)
-        val touchedAddresses = simplifyTouchedAddresses(expression.touchedAddresses)
-        val classIdToClearStatics = simplifyClassIdToClearStatics(expression.classIdToClearStatics)
-        val instanceFieldReads = simplifyInstanceFieldReads(expression.instanceFieldReads)
+    override fun simplifyImpl(expression: MemoryUpdate): MemoryUpdate = with(expression) {
+        val stores = simplifyStores(stores)
+        val touchedChunkDescriptors = simplifyTouchedChunkDescriptors(touchedChunkDescriptors)
+        val concrete = simplifyConcrete(concrete)
+        val mockInfos = simplifyMockInfos(mockInfos)
+        val staticInstanceStorage = simplifyStaticInstanceStorage(staticInstanceStorage)
+        val initializedStaticFields = simplifyInitializedStaticFields(initializedStaticFields)
+        val staticFieldsUpdates = simplifyStaticFieldsUpdates(staticFieldsUpdates)
+        val meaningfulStaticFields = simplifyMeaningfulStaticFields(meaningfulStaticFields)
+        val addrToArrayType = simplifyAddrToArrayType(addrToArrayType)
+        val addrToMockInfo = simplifyAddrToMockInfo(addrToMockInfo)
+        val visitedValues = simplifyVisitedValues(visitedValues)
+        val touchedAddresses = simplifyTouchedAddresses(touchedAddresses)
+        val classIdToClearStatics = simplifyClassIdToClearStatics(classIdToClearStatics)
+        val instanceFieldReads = simplifyInstanceFieldReads(instanceFieldReads)
         val speculativelyNotNullAddresses =
-            simplifySpeculativelyNotNullAddresses(expression.speculativelyNotNullAddresses)
-        val symbolicEnumValues = simplifyEnumValues(expression.symbolicEnumValues)
+            simplifySpeculativelyNotNullAddresses(speculativelyNotNullAddresses)
+        val symbolicEnumValues = simplifyEnumValues(symbolicEnumValues)
         return MemoryUpdate(
             stores,
             touchedChunkDescriptors,
@@ -90,7 +90,7 @@ class MemoryUpdateSimplificator(
                 }
             }
 
-    private fun simplifyTocuhedChunkDescriptors(touchedChunkDescriptors: TouchedChunkDescriptorsType): TouchedChunkDescriptorsType =
+    private fun simplifyTouchedChunkDescriptors(touchedChunkDescriptors: TouchedChunkDescriptorsType): TouchedChunkDescriptorsType =
         touchedChunkDescriptors
 
     private fun simplifyConcrete(concrete: ConcreteType): ConcreteType =
@@ -131,7 +131,7 @@ class MemoryUpdateSimplificator(
             .toPersistentMap()
 
 
-    private fun simplifyAddToMockInfo(addrToMockInfo: AddrToMockInfoType): AddrToMockInfoType =
+    private fun simplifyAddrToMockInfo(addrToMockInfo: AddrToMockInfoType): AddrToMockInfoType =
         addrToMockInfo
             .mapKeys { (k, _) -> k.accept(simplificator) as UtAddrExpression }
             .toPersistentMap()

utbot-framework/src/main/kotlin/org/utbot/engine/state/ExecutionStackElement.kt

@@ -6,7 +6,6 @@ import org.utbot.engine.LocalMemoryUpdate
 import org.utbot.engine.LocalVariable
 import org.utbot.engine.Parameter
 import org.utbot.engine.SymbolicValue
-//import org.utbot.engine.symbolic.simplificators.LocalMemoryUpdateSimplificator
 import org.utbot.engine.update
 import soot.SootMethod
 import soot.jimple.Stmt
@@ -32,7 +31,7 @@ data class ExecutionStackElement(
 
 /**
  * Represents a memory associated with a certain method call. For now consists only of local variables mapping.
- * TODO: think on other fields later
+ * TODO: think on other fields later: [#339](https://github.com/UnitTestBot/UTBotJava/issues/339) [#340](https://github.com/UnitTestBot/UTBotJava/issues/340)
  *
  * @param [locals] represents a mapping from [LocalVariable]s of a specific method call to [SymbolicValue]s.
  */
@@ -50,9 +49,4 @@ data class LocalVariableMemory(
 
     val localValues: Set<SymbolicValue>
         get() = locals.values.toSet()
-}
-//
-//context(LocalMemoryUpdateSimplificator)
-//fun updateSimplified(localVariableMemory: LocalVariableMemory, update: LocalMemoryUpdate): LocalVariableMemory {
-//    return localVariableMemory.update(simplify(update))
-//}
+}