Fixed some parts in renaming ML related stuff (#839)

amandelpie · web-flow · commit 392dcebe992c · 2022-09-02T13:12:54.000+03:00
* Fixed renaming

* Fixed renaming

* Fixed renaming

* Comment dependency
diff --git a/gradle.properties b/gradle.properties
@@ -44,6 +44,8 @@ jsoup_version=1.7.2
 djl_api_version=0.17.0
 pytorch_native_version=1.9.1
 shadow_jar_version=7.1.2
+openblas_version=0.3.10-1.5.4
+arpack_ng_version=3.7.0-1.5.4
 # soot also depends on asm, so there could be two different versions
 
 org.gradle.daemon=false
diff --git a/utbot-analytics-torch/build.gradle b/utbot-analytics-torch/build.gradle
@@ -16,8 +16,6 @@ dependencies {
     testImplementation project(':utbot-sample')
     testImplementation group: 'junit', name: 'junit', version: junit4_version
 
-    implementation group: 'org.bytedeco', name: 'arpack-ng', version: "3.7.0-1.5.4", classifier: "$classifier"
-    implementation group: 'org.bytedeco', name: 'openblas', version: "0.3.10-1.5.4", classifier: "$classifier"
     implementation group: 'org.bytedeco', name: 'javacpp', version: javacpp_version, classifier: "$classifier"
     implementation group: 'org.jsoup', name: 'jsoup', version: jsoup_version
 
diff --git a/utbot-analytics-torch/readme.md b/utbot-analytics-torch/readme.md
@@ -1,6 +1,6 @@
 To enable support of the `utbot-analytics-torch` models in `utbot-intellij` module the following steps should be made:
 
-- change the row `api project(':utbot-analytics-torch')` to the `api project(':utbot-analytics-torch')` in the `build.gradle` file in the `utbot-intellij` module 
+- change the row `api project(':utbot-analytics')` to the `api project(':utbot-analytics-torch')` in the `build.gradle` file in the `utbot-intellij` module and uncomment it, if it's commented.
 - change the `pathSelectorType` in the `UtSettings.kt` to the `PathSelectorType.TORCH_SELECTOR`
 - don't forget the put the Torch model in the path ruled by the setting `modelPath` in the `UtSettings.kt`
 
diff --git a/utbot-analytics-torch/src/main/kotlin/org/utbot/AnalyticsTorchConfiguration.kt b/utbot-analytics-torch/src/main/kotlin/org/utbot/AnalyticsTorchConfiguration.kt
@@ -3,7 +3,7 @@ package org.utbot
 import org.utbot.analytics.EngineAnalyticsContext
 import org.utbot.features.FeatureExtractorFactoryImpl
 import org.utbot.features.FeatureProcessorWithStatesRepetitionFactory
-import org.utbot.predictors.StateRewardPredictorWithTorchModelsSupportFactoryImpl
+import org.utbot.predictors.TorchPredictorFactoryImpl
 
 /**
  * The basic configuration of the utbot-analytics-torch module used in utbot-intellij and (as planned) in utbot-cli
@@ -16,6 +16,6 @@ object AnalyticsTorchConfiguration {
     init {
         EngineAnalyticsContext.featureProcessorFactory = FeatureProcessorWithStatesRepetitionFactory()
         EngineAnalyticsContext.featureExtractorFactory = FeatureExtractorFactoryImpl()
-        EngineAnalyticsContext.stateRewardPredictorFactory = StateRewardPredictorWithTorchModelsSupportFactoryImpl()
+        EngineAnalyticsContext.mlPredictorFactory = TorchPredictorFactoryImpl()
     }
 }
diff --git a/utbot-analytics-torch/src/main/kotlin/org/utbot/predictors/StateRewardPredictorFactory.kt b/utbot-analytics-torch/src/main/kotlin/org/utbot/predictors/StateRewardPredictorFactory.kt
diff --git a/utbot-analytics-torch/src/main/kotlin/org/utbot/predictors/TorchPredictor.kt b/utbot-analytics-torch/src/main/kotlin/org/utbot/predictors/TorchPredictor.kt
@@ -6,12 +6,12 @@ import ai.djl.ndarray.NDArray
 import ai.djl.ndarray.NDList
 import ai.djl.translate.Translator
 import ai.djl.translate.TranslatorContext
-import org.utbot.analytics.StateRewardPredictor
+import org.utbot.analytics.MLPredictor
 import org.utbot.framework.UtSettings
 import java.io.Closeable
 import java.nio.file.Paths
 
-class StateRewardPredictorTorch : StateRewardPredictor, Closeable {
+class TorchPredictor : MLPredictor, Closeable {
     val model: Model
 
     init {
diff --git a/utbot-analytics-torch/src/main/kotlin/org/utbot/predictors/TorchPredictorFactoryImpl.kt b/utbot-analytics-torch/src/main/kotlin/org/utbot/predictors/TorchPredictorFactoryImpl.kt
@@ -0,0 +1,11 @@
+package org.utbot.predictors
+
+import org.utbot.analytics.MLPredictorFactory
+import org.utbot.framework.UtSettings
+
+/**
+ * Creates [StateRewardPredictor], by checking the [UtSettings] configuration.
+ */
+class TorchPredictorFactoryImpl : MLPredictorFactory {
+    override operator fun invoke() = TorchPredictor()
+}
diff --git a/utbot-analytics-torch/src/test/kotlin/org/utbot/predictors/TorchPredictorTest.kt b/utbot-analytics-torch/src/test/kotlin/org/utbot/predictors/TorchPredictorTest.kt
@@ -3,16 +3,16 @@ package org.utbot.predictors
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.utbot.analytics.StateRewardPredictor
+import org.utbot.analytics.MLPredictor
 import org.utbot.testcheckers.withModelPath
 import kotlin.system.measureNanoTime
 
-class NNStateRewardPredictorTest {
+class TorchPredictorTest {
     @Test
     @Disabled("Just to see the performance of predictors")
     fun simpleTest() {
         withModelPath("src/test/resources") {
-            val pred = StateRewardPredictorTorch()
+            val pred = TorchPredictor()
 
             val features = listOf(0.0, 0.0)
 
@@ -25,13 +25,13 @@ class NNStateRewardPredictorTest {
     fun performanceTest() {
         val features = (1..13).map { 1.0 }.toList()
         withModelPath("models") {
-            val averageTime = calcAverageTimeForModelPredict(::StateRewardPredictorTorch, 100, features)
+            val averageTime = calcAverageTimeForModelPredict(::TorchPredictor, 100, features)
             println(averageTime)
         }
     }
 
     private fun calcAverageTimeForModelPredict(
-        model: () -> StateRewardPredictor,
+        model: () -> MLPredictor,
         iterations: Int,
         features: List<Double>
     ): Double {
diff --git a/utbot-analytics/build.gradle b/utbot-analytics/build.gradle
@@ -12,13 +12,13 @@ evaluationDependsOn(':utbot-framework')
 compileTestJava.dependsOn tasks.getByPath(':utbot-framework:testClasses')
 
 dependencies {
-    api(project(":utbot-api"))
-    api(project(":utbot-core"))
-    api(project(":utbot-summary"))
-    api(project(":utbot-framework-api"))
-    api(project(":utbot-fuzzers"))
-    api(project(":utbot-instrumentation"))
-    api(project(":utbot-framework"))
+    implementation(project(":utbot-api"))
+    implementation(project(":utbot-core"))
+    implementation(project(":utbot-summary"))
+    implementation(project(":utbot-framework-api"))
+    implementation(project(":utbot-fuzzers"))
+    implementation(project(":utbot-instrumentation"))
+    implementation(project(":utbot-framework"))
     testImplementation project(':utbot-sample')
     testImplementation group: 'junit', name: 'junit', version: junit4_version
 
@@ -30,9 +30,8 @@ dependencies {
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
 
-    implementation group: 'org.bytedeco', name: 'arpack-ng', version: "3.7.0-1.5.4", classifier: "$classifier"
-    implementation group: 'org.bytedeco', name: 'openblas', version: "0.3.10-1.5.4", classifier: "$classifier"
-    implementation group: 'org.bytedeco', name: 'javacpp', version: javacpp_version, classifier: "$classifier"
+    implementation group: 'org.bytedeco', name: 'arpack-ng', version: arpack_ng_version, classifier: "$classifier"
+    implementation group: 'org.bytedeco', name: 'openblas', version: openblas_version, classifier: "$classifier"
 
     implementation group: 'tech.tablesaw', name: 'tablesaw-core', version: '0.38.2'
     implementation group: 'tech.tablesaw', name: 'tablesaw-jsplot', version: '0.38.2'
diff --git a/utbot-analytics/src/main/kotlin/org/utbot/AnalyticsConfiguration.kt b/utbot-analytics/src/main/kotlin/org/utbot/AnalyticsConfiguration.kt
@@ -3,7 +3,7 @@ package org.utbot
 import org.utbot.analytics.EngineAnalyticsContext
 import org.utbot.features.FeatureExtractorFactoryImpl
 import org.utbot.features.FeatureProcessorWithStatesRepetitionFactory
-import org.utbot.predictors.StateRewardPredictorFactoryImpl
+import org.utbot.predictors.MLPredictorFactoryImpl
 
 /**
  * The basic configuration of the utbot-analytics module used in utbot-intellij and (as planned) in utbot-cli
@@ -16,6 +16,6 @@ object AnalyticsConfiguration {
     init {
         EngineAnalyticsContext.featureProcessorFactory = FeatureProcessorWithStatesRepetitionFactory()
         EngineAnalyticsContext.featureExtractorFactory = FeatureExtractorFactoryImpl()
-        EngineAnalyticsContext.stateRewardPredictorFactory = StateRewardPredictorFactoryImpl()
+        EngineAnalyticsContext.mlPredictorFactory = MLPredictorFactoryImpl()
     }
 }
diff --git a/utbot-analytics/src/main/kotlin/org/utbot/predictors/LinearRegressionPredictor.kt b/utbot-analytics/src/main/kotlin/org/utbot/predictors/LinearRegressionPredictor.kt
@@ -1,6 +1,6 @@
 package org.utbot.predictors
 
-import org.utbot.analytics.StateRewardPredictor
+import org.utbot.analytics.MLPredictor
 import mu.KotlinLogging
 import org.utbot.framework.PathSelectorType
 import org.utbot.framework.UtSettings
@@ -35,8 +35,8 @@ private fun loadWeights(path: String): Matrix {
     return Matrix(weightsArray)
 }
 
-class LinearStateRewardPredictor(weightsPath: String = DEFAULT_WEIGHT_PATH, scalerPath: String = DEFAULT_SCALER_PATH) :
-    StateRewardPredictor {
+class LinearRegressionPredictor(weightsPath: String = DEFAULT_WEIGHT_PATH, scalerPath: String = DEFAULT_SCALER_PATH) :
+    MLPredictor {
     private lateinit var weights: Matrix
     private lateinit var scaler: StandardScaler
 
@@ -46,7 +46,7 @@ class LinearStateRewardPredictor(weightsPath: String = DEFAULT_WEIGHT_PATH, scal
             scaler = loadScaler(scalerPath)
         } catch (e: PredictorLoadingException) {
             logger.info(e) {
-                "Error while initialization of LinearStateRewardPredictor. Changing pathSelectorType on INHERITORS_SELECTOR"
+                "Error while initialization of LinearRegressionPredictor. Changing pathSelectorType on INHERITORS_SELECTOR"
             }
             UtSettings.pathSelectorType = PathSelectorType.INHERITORS_SELECTOR
         }
diff --git a/utbot-analytics/src/main/kotlin/org/utbot/predictors/MultilayerPerceptronPredictor.kt b/utbot-analytics/src/main/kotlin/org/utbot/predictors/MultilayerPerceptronPredictor.kt
@@ -1,7 +1,7 @@
 package org.utbot.predictors
 
 import mu.KotlinLogging
-import org.utbot.analytics.StateRewardPredictor
+import org.utbot.analytics.MLPredictor
 import org.utbot.framework.PathSelectorType
 import org.utbot.framework.UtSettings
 import org.utbot.predictors.util.PredictorLoadingException
@@ -13,8 +13,8 @@ private val logger = KotlinLogging.logger {}
 
 private fun getModel(path: String) = buildModel(loadModel(path))
 
-class NNStateRewardPredictorBase(modelPath: String = DEFAULT_MODEL_PATH, scalerPath: String = DEFAULT_SCALER_PATH) :
-    StateRewardPredictor {
+class MultilayerPerceptronPredictor(modelPath: String = DEFAULT_MODEL_PATH, scalerPath: String = DEFAULT_SCALER_PATH) :
+    MLPredictor {
     private lateinit var nn: FeedForwardNetwork
     private lateinit var scaler: StandardScaler
 
@@ -24,7 +24,7 @@ class NNStateRewardPredictorBase(modelPath: String = DEFAULT_MODEL_PATH, scalerP
             scaler = loadScaler(scalerPath)
         } catch (e: PredictorLoadingException) {
             logger.info(e) {
-                "Error while initialization of NNStateRewardPredictorBase. Changing pathSelectorType on INHERITORS_SELECTOR"
+                "Error while initialization of MultilayerPerceptronPredictor. Changing pathSelectorType on INHERITORS_SELECTOR"
             }
             UtSettings.pathSelectorType = PathSelectorType.INHERITORS_SELECTOR
         }
diff --git a/utbot-analytics/src/main/kotlin/org/utbot/predictors/StateRewardPredictorFactory.kt b/utbot-analytics/src/main/kotlin/org/utbot/predictors/StateRewardPredictorFactory.kt
@@ -1,15 +1,16 @@
 package org.utbot.predictors
 
-import org.utbot.analytics.StateRewardPredictorFactory
-import org.utbot.framework.StateRewardPredictorType
+import org.utbot.analytics.MLPredictor
+import org.utbot.analytics.MLPredictorFactory
+import org.utbot.framework.MLPredictorType
 import org.utbot.framework.UtSettings
 
 /**
- * Creates [StateRewardPredictor], by checking the [UtSettings] configuration.
+ * Creates [MLPredictor], by checking the [UtSettings] configuration.
  */
-class StateRewardPredictorFactoryImpl : StateRewardPredictorFactory {
-    override operator fun invoke() = when (UtSettings.stateRewardPredictorType) {
-        StateRewardPredictorType.BASE -> NNStateRewardPredictorBase()
-        StateRewardPredictorType.LINEAR -> LinearStateRewardPredictor()
+class MLPredictorFactoryImpl : MLPredictorFactory {
+    override operator fun invoke() = when (UtSettings.mlPredictorType) {
+        MLPredictorType.MLP -> MultilayerPerceptronPredictor()
+        MLPredictorType.LINREG -> LinearRegressionPredictor()
     }
 }
diff --git a/utbot-analytics/src/main/resources/config.properties b/utbot-analytics/src/main/resources/config.properties
@@ -0,0 +1,3 @@
+project=antlr
+selectors=random_120,cpi_120,fork_120,inheritors_120,random_120
+covStatistics=logs/covStatistics,logs/covStatistics
diff --git a/utbot-analytics/src/test/kotlin/org/utbot/predictors/LinearRegressionPredictorTest.kt b/utbot-analytics/src/test/kotlin/org/utbot/predictors/LinearRegressionPredictorTest.kt
@@ -7,11 +7,11 @@ import org.utbot.framework.UtSettings
 import org.utbot.testcheckers.withPathSelectorType
 import org.utbot.testcheckers.withModelPath
 
-class LinearStateRewardPredictorTest {
+class LinearRegressionPredictorTest {
     @Test
     fun simpleTest() {
         withModelPath("src/test/resources") {
-            val pred = LinearStateRewardPredictor()
+            val pred = LinearRegressionPredictor()
 
             val features = listOf(
                 listOf(2.0, 3.0),
@@ -26,7 +26,7 @@ class LinearStateRewardPredictorTest {
     fun wrongFormatTest() {
         withModelPath("src/test/resources") {
             withPathSelectorType(PathSelectorType.ML_SELECTOR) {
-                LinearStateRewardPredictor("wrong_format_linear.txt")
+                LinearRegressionPredictor("wrong_format_linear.txt")
                 assertEquals(PathSelectorType.INHERITORS_SELECTOR, UtSettings.pathSelectorType)
             }
         }
@@ -35,7 +35,7 @@ class LinearStateRewardPredictorTest {
     @Test
     fun simpleTestNotBatch() {
         withModelPath("src/test/resources") {
-            val pred = LinearStateRewardPredictor()
+            val pred = LinearRegressionPredictor()
 
             val features = listOf(2.0, 3.0)
 
diff --git a/utbot-analytics/src/test/kotlin/org/utbot/predictors/MultilayerPerceptronPredictorTest.kt b/utbot-analytics/src/test/kotlin/org/utbot/predictors/MultilayerPerceptronPredictorTest.kt
@@ -3,18 +3,18 @@ package org.utbot.predictors
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.utbot.analytics.StateRewardPredictor
+import org.utbot.analytics.MLPredictor
 import org.utbot.framework.PathSelectorType
 import org.utbot.framework.UtSettings
 import org.utbot.testcheckers.withPathSelectorType
 import org.utbot.testcheckers.withModelPath
 import kotlin.system.measureNanoTime
 
-class NNStateRewardPredictorTest {
+class MultilayerPerceptronPredictorTest {
     @Test
     fun simpleTest() {
         withModelPath("src/test/resources") {
-            val pred = NNStateRewardPredictorBase()
+            val pred = MultilayerPerceptronPredictor()
 
             val features = listOf(0.0, 0.0)
 
@@ -27,13 +27,13 @@ class NNStateRewardPredictorTest {
     fun performanceTest() {
         val features = (1..13).map { 1.0 }.toList()
         withModelPath("models\\test\\0") {
-            val averageTime = calcAverageTimeForModelPredict(::NNStateRewardPredictorBase, 100, features)
+            val averageTime = calcAverageTimeForModelPredict(::MultilayerPerceptronPredictor, 100, features)
             println(averageTime)
         }
     }
 
     internal fun calcAverageTimeForModelPredict(
-        model: () -> StateRewardPredictor,
+        model: () -> MLPredictor,
         iterations: Int,
         features: List<Double>
     ): Double {
@@ -52,7 +52,7 @@ class NNStateRewardPredictorTest {
     fun corruptedModelFileTest() {
         withModelPath("src/test/resources") {
             withPathSelectorType(PathSelectorType.ML_SELECTOR) {
-                NNStateRewardPredictorBase(modelPath = "corrupted_nn.json")
+                MultilayerPerceptronPredictor(modelPath = "corrupted_nn.json")
                 assertEquals(PathSelectorType.INHERITORS_SELECTOR, UtSettings.pathSelectorType)
             }
         }
@@ -62,7 +62,7 @@ class NNStateRewardPredictorTest {
     fun emptyModelFileTest() {
         withModelPath("src/test/resources") {
             withPathSelectorType(PathSelectorType.ML_SELECTOR) {
-                NNStateRewardPredictorBase(modelPath = "empty_nn.json")
+                MultilayerPerceptronPredictor(modelPath = "empty_nn.json")
                 assertEquals(PathSelectorType.INHERITORS_SELECTOR, UtSettings.pathSelectorType)
             }
         }
@@ -72,7 +72,7 @@ class NNStateRewardPredictorTest {
     fun corruptedScalerTest() {
         withModelPath("src/test/resources") {
             withPathSelectorType(PathSelectorType.ML_SELECTOR) {
-                NNStateRewardPredictorBase(scalerPath = "corrupted_scaler.txt")
+                MultilayerPerceptronPredictor(scalerPath = "corrupted_scaler.txt")
                 assertEquals(PathSelectorType.INHERITORS_SELECTOR, UtSettings.pathSelectorType)
             }
         }
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt
@@ -93,9 +93,9 @@ object UtSettings : AbstractSettings(
     var mlSelectorRecalculationType: MLSelectorRecalculationType by getEnumProperty(MLSelectorRecalculationType.WITHOUT_RECALCULATION)
 
     /**
-     * Type of [StateRewardPredictor].
+     * Type of [MLPredictor].
      */
-    var stateRewardPredictorType: StateRewardPredictorType by getEnumProperty(StateRewardPredictorType.BASE)
+    var mlPredictorType: MLPredictorType by getEnumProperty(MLPredictorType.MLP)
 
     /**
      * Steps limit for path selector.
@@ -451,16 +451,16 @@ enum class MLSelectorRecalculationType {
 }
 
 /**
- * Enum to specify [StateRewardPredictor], see implementations for details
+ * Enum to specify [MLPredictor], see implementations for details
  */
-enum class StateRewardPredictorType {
+enum class MLPredictorType {
     /**
-     * [MLStateRewardPredictorBase]
+     * [MultilayerPerceptronPredictor]
      */
-    BASE,
+    MLP,
 
     /**
-     * [LinearStateRewardPredictorBase]
+     * [LinearRegressionPredictor]
      */
-    LINEAR
+    LINREG
 }
diff --git a/utbot-framework/src/main/kotlin/org/utbot/analytics/EngineAnalyticsContext.kt b/utbot-framework/src/main/kotlin/org/utbot/analytics/EngineAnalyticsContext.kt
diff --git a/utbot-framework/src/main/kotlin/org/utbot/analytics/MLPredictor.kt b/utbot-framework/src/main/kotlin/org/utbot/analytics/MLPredictor.kt
diff --git a/utbot-framework/src/main/kotlin/org/utbot/analytics/MLPredictorFactory.kt b/utbot-framework/src/main/kotlin/org/utbot/analytics/MLPredictorFactory.kt
diff --git a/utbot-framework/src/main/kotlin/org/utbot/analytics/StateRewardPredictorFactory.kt b/utbot-framework/src/main/kotlin/org/utbot/analytics/StateRewardPredictorFactory.kt
diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt
diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/ContestEstimator.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/ContestEstimator.kt
