Make JcMachine's budget distributing strategy and refactor

Author: IlyaMuravjov

utbot-junit-contest/src/main/kotlin/org/utbot/contest/ContestEstimator.kt

@@ -26,7 +26,7 @@ import org.utbot.contest.Paths.evosuiteReportFile
 import org.utbot.contest.Paths.jarsDir
 import org.utbot.contest.Paths.moduleTestDir
 import org.utbot.contest.Paths.outputDir
-import org.utbot.contest.usvm.executor.UTestRunner
+import org.utbot.contest.usvm.jc.JcContainer
 import org.utbot.contest.usvm.runUsvmGeneration
 import org.utbot.features.FeatureExtractorFactoryImpl
 import org.utbot.features.FeatureProcessorWithStatesRepetitionFactory
@@ -266,8 +266,7 @@ interface Tool {
  )
 
  override fun close() {
- if (UTestRunner.isInitialized())
- UTestRunner.runner.close()
+ JcContainer.close()
  }
  }
 

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/ContestUsvm.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm
+package org.utbot.contest.usvm.converter
 
 import org.jacodb.analysis.library.analyzers.thisInstance
 import org.jacodb.api.JcArrayType

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/EnvironmentStateKind.kt

@@ -0,0 +1,12 @@
+package org.utbot.contest.usvm.converter
+
+fun interface InstructionIdProvider {
+ fun provideInstructionId(methodSignature: String, instIndex: Int): Long
+}
+
+class SimpleInstructionIdProvider : InstructionIdProvider {
+ private val instructionIds = mutableMapOf<Pair<String, Int>, Long>()
+
+ override fun provideInstructionId(methodSignature: String, instIndex: Int): Long =
+ instructionIds.getOrPut(methodSignature to instIndex) { instructionIds.size.toLong() }
+}

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/InstructionIdProvider.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm
+package org.utbot.contest.usvm.converter
 
 import mu.KotlinLogging
 import org.jacodb.api.JcClassOrInterface
@@ -18,7 +18,7 @@ import org.usvm.instrumentation.testcase.descriptor.UTestExceptionDescriptor
 import org.usvm.instrumentation.util.enclosingClass
 import org.usvm.instrumentation.util.enclosingMethod
 import org.utbot.common.isPublic
-import org.utbot.contest.usvm.executor.JcExecution
+import org.utbot.contest.usvm.jc.JcExecution
 import org.utbot.framework.codegen.domain.builtin.UtilMethodProvider
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.Coverage
@@ -58,7 +58,7 @@ class JcToUtExecutionConverter(
  private var jcToUtModelConverter: JcToUtModelConverter
 
  init {
- val instToModelConverter = UTestInst2UtModelConverter(idGenerator, jcClasspath, utilMethodProvider)
+ val instToModelConverter = UTestInstToUtModelConverter(idGenerator, jcClasspath, utilMethodProvider)
 
  instToModelConverter.processUTest(jcExecution.uTest)
  jcToUtModelConverter = JcToUtModelConverter(idGenerator, jcClasspath, instToModelConverter)

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JacoDBContainer.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm
+package org.utbot.contest.usvm.converter
 
 import org.jacodb.api.JcClasspath
 import org.usvm.instrumentation.testcase.api.UTestExpression
@@ -29,10 +29,14 @@ import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.stringClassId
 import org.utbot.fuzzer.IdGenerator
 
+enum class EnvironmentStateKind {
+ INITIAL, FINAL
+}
+
 class JcToUtModelConverter(
  private val idGenerator: IdGenerator<Int>,
  private val jcClasspath: JcClasspath,
- private val instToUtModelConverter: UTestInst2UtModelConverter,
+ private val instToUtModelConverter: UTestInstToUtModelConverter,
 ) {
  private val descriptorToModelCache = mutableMapOf<UTestValueDescriptor, UtModel>()
  private val refIdAndStateKindToDescriptorCache =