Add types sorting

Author: sergeypospelov

gradle.properties

@@ -101,10 +101,10 @@ commonsLoggingVersion=1.2
 commonsIOVersion=2.11.0
 javaxVersion=2.2
 jakartaVersion=3.1.0
-jacoDbVersion=1.4.1
+jacoDbVersion=1.4.3
 # TODO left outdated here to avoid exceeding GitHub packages drive space,
 # TODO run `gradle publishToMavenLocal -Pversion={usvmVersion}` locally in usvm project and update {usvmVersion} locally
-usvmVersion=comp-231129-22
+usvmVersion=comp-231130-17
 
 # use latest Java 8 compaitable Spring and Spring Boot versions
 springVersion=5.3.28

utbot-junit-contest/build.gradle

@@ -290,6 +290,7 @@ task run(type: JavaExec) {
     def usvmApproximationApiJarPath = configurations.usvmApproximationsApi.resolvedConfiguration.files.find()
     environment "usvm.jvm.api.jar.path", usvmApproximationApiJarPath.absolutePath
     environment "usvm.jvm.approximations.jar.path", usvmApproximationJarPath.absolutePath
+    systemProperty("org.jacodb.impl.storage.defaultBatchSize", 2000)
 
     def usvmInstrumentationCollectorJarPath = configurations.usvmInstrumentationCollector.resolvedConfiguration.files.find()
     environment "usvm-jvm-collectors-jar", usvmInstrumentationCollectorJarPath.absolutePath

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

@@ -20,6 +20,9 @@ import org.usvm.instrumentation.util.jcdbSignature
 import org.usvm.machine.JcMachine
 import org.usvm.machine.state.JcState
 import org.usvm.statistics.collectors.StatesCollector
+import org.usvm.types.ClassScorer
+import org.usvm.types.TypeScorer
+import org.usvm.types.scoreClassNode
 import org.utbot.common.ThreadBasedExecutor
 import org.utbot.common.info
 import org.utbot.common.measureTime
@@ -87,7 +90,7 @@ fun runUsvmGeneration(
 
     val jcContainer by lazy {
         JcContainer(
-            usePersistence = true,
+            usePersistence = false,
             persistenceDir = tmpDir,
             classpath = classpathFiles,
             machineOptions = UMachineOptions(
@@ -101,7 +104,8 @@ fun runUsvmGeneration(
         ) {
             // TODO usvm-sbft: we may want to tune these JcSettings for contest
             useJavaRuntime(JdkInfoService.provide().path.toFile())
-            installFeatures(InMemoryHierarchy, Approximations)
+            // TODO: require usePersistence=false for ClassScorer
+            installFeatures(InMemoryHierarchy, Approximations, ClassScorer(TypeScorer, ::scoreClassNode))
             loadByteCode(classpathFiles)
         }
     }

utbot-junit-contest/usvm-runtool

@@ -17,4 +17,4 @@ env usvm.jvm.api.jar.path="$TOOL_DIR/usvm-api.jar" \
     usvm.jvm.approximations.jar.path="$TOOL_DIR/usvm-approximations.jar" \
     usvm-jvm-collectors-jar="$TOOL_DIR/usvm-jvm-collectors.jar" \
     usvm-jvm-instrumentation-jar="$TOOL_DIR/usvm-jvm-instrumentation.jar" \
-    $JAVA_HOME/bin/java -cp $TOOL sbst.runtool.Main
+    $JAVA_HOME/bin/java -Dorg.jacodb.impl.storage.defaultBatchSize=2000 -cp $TOOL sbst.runtool.Main