added new path selector type

UnitTestBot · May 23, 2024 · 008425c · 008425c
1 parent f270820
commit 008425c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/usvm-python/usvm-python-commons/src/main/kotlin/org/usvm/python/ps/PyPathSelectorType.kt b/usvm-python/usvm-python-commons/src/main/kotlin/org/usvm/python/ps/PyPathSelectorType.kt
@@ -1,18 +1,18 @@
 package org.usvm.python.ps
 
 enum class PyPathSelectorType {
-    BaselinePriorityDfs, // passes tests
-    BaselineWeightedDfs, // passes tests
-    BaselinePriorityNumberOfVirtualDfs, // passes tests
-    BaselineWeightedNumberOfVirtualRandomTree, // passes tests
-    BaselinePriorityNumberOfInstructionsDfs, // passes tests
-    BaselinePriorityNumberOfInstructionsRandomTree, // passes tests
-    BaselinePriorityPlusTypeRatingByHintsDfs, // passes tests
-    DelayedForkByInstructionWeightedDfs, // passes tests
-    DelayedForkByInstructionWeightedRandomTree, // passes tests
-    DelayedForkByInstructionPriorityNumberOfVirtualDfs, // passes tests
-    DelayedForkByInstructionWeightedNumberOfVirtualRandomTree, // passes tests
-    DelayedForkByInstructionPriorityNumberOfInstructionsDfs, // passes tests
-    DelayedForkByInstructionPriorityNumberOfInstructionsRandomTree, // passes tests
-    DelayedForkByInstructionWeightedNumberOfInstructionsRandomTree, // fails testAddAndCompare
+    BaselinePriorityDfs,  // passes tests
+    BaselineWeightedDfs,  // passes tests
+    BaselinePriorityNumberOfVirtualDfs,  // passes tests
+    BaselineWeightedNumberOfVirtualRandomTree,  // passes tests
+    BaselinePriorityNumberOfInstructionsDfs,  // passes tests
+    BaselinePriorityNumberOfInstructionsRandomTree,  // passes tests
+    BaselinePriorityPlusTypeRatingByHintsDfs,  // passes tests
+    DelayedForkByInstructionWeightedDfs,  // passes tests
+    DelayedForkByInstructionWeightedRandomTree,  // passes tests
+    DelayedForkByInstructionPriorityNumberOfVirtualDfs,  // passes tests
+    DelayedForkByInstructionWeightedNumberOfVirtualRandomTree,  // passes tests
+    DelayedForkByInstructionPriorityNumberOfInstructionsDfs,  // passes tests
+    DelayedForkByInstructionPriorityNumberOfInstructionsRandomTree,  // passes tests
+    DelayedForkByInstructionPriorityNumberOfInstructionsRandomTreePlusTypeRating,  // passes tests
 }
diff --git a/usvm-python/usvm-python-main/src/main/kotlin/org/usvm/machine/PyMachine.kt b/usvm-python/usvm-python-main/src/main/kotlin/org/usvm/machine/PyMachine.kt
@@ -32,8 +32,8 @@ import kotlin.random.Random
 class PyMachine(
     private val program: PyProgram,
     private val typeSystem: PythonTypeSystem,
-    private val pathSelectorType: PyPathSelectorType = PyPathSelectorType.BaselinePriorityNumberOfInstructionsRandomTree,
-    private val printErrorMsg: Boolean = false,
+    private val pathSelectorType: PyPathSelectorType = PyPathSelectorType.DelayedForkByInstructionPriorityNumberOfInstructionsRandomTreePlusTypeRating,
+    private val printErrorMsg: Boolean = false
 ) : UMachine<PyState>() {
     private val ctx = PyContext(typeSystem)
 

diff --git a/usvm-python/usvm-python-main/src/main/kotlin/org/usvm/machine/ps/PyPathSelectorFactory.kt b/usvm-python/usvm-python-main/src/main/kotlin/org/usvm/machine/ps/PyPathSelectorFactory.kt
@@ -89,8 +89,8 @@ fun createPyPathSelector(
                 newStateObserver
             )
 
-        PyPathSelectorType.DelayedForkByInstructionWeightedNumberOfInstructionsRandomTree ->
-            createDelayedForkByInstructionWeightedNumberOfInstructionsRandomTreePyPathSelector(
+        PyPathSelectorType.DelayedForkByInstructionPriorityNumberOfInstructionsRandomTreePlusTypeRating ->
+            createDelayedForkByInstructionPriorityNumberOfInstructionsRandomTreePlusTypeRatingPyPathSelector(
                 initialNode,
                 ctx,
                 random,
@@ -352,16 +352,17 @@ fun createDelayedForkByInstructionPriorityNumberOfInstructionsRandomTreePyPathSe
         newStateObserver
     )
 
-fun createDelayedForkByInstructionWeightedNumberOfInstructionsRandomTreePyPathSelector(
+
+fun createDelayedForkByInstructionPriorityNumberOfInstructionsRandomTreePlusTypeRatingPyPathSelector(
     initialNode: PathNode<PyInstruction>,
     ctx: PyContext,
     random: Random,
     newStateObserver: NewStateObserver,
 ): PyVirtualPathSelector<*, *> =
     PyVirtualPathSelector(
         ctx,
-        makeDelayedForkByInstructionWeightedStrategy(random),
-        BaselineDelayedForkStrategy(),
+        makeDelayedForkByInstructionPriorityStrategy(random),
+        TypeRatingByNumberOfHints(),
         DelayedForkByInstructionGraphCreation {
             WeightedPyPathSelector(
                 random,
@@ -378,6 +379,7 @@ fun createDelayedForkByInstructionWeightedNumberOfInstructionsRandomTreePyPathSe
         newStateObserver
     )
 
+
 fun createTypeRatingByHintsDfsPyPathSelector(
     ctx: PyContext,
     random: Random,