supporting super-type handling in getWrappedGene

WebFuzzing · Dec 23, 2024 · e5439c1 · e5439c1
1 parent 1fd5f43
commit e5439c1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/core/src/main/kotlin/org/evomaster/core/search/gene/Gene.kt b/core/src/main/kotlin/org/evomaster/core/search/gene/Gene.kt
@@ -300,15 +300,22 @@ abstract class Gene(
      * Wrapper genes, and only those, will override this method to check their children
      */
     @Suppress("BOUNDS_NOT_ALLOWED_IF_BOUNDED_BY_TYPE_PARAMETER")
-    open  fun <T,K> getWrappedGene(klass: Class<K>) : T?  where T : Gene, T : K{
+    open  fun <T,K> getWrappedGene(klass: Class<K>, strict: Boolean = false) : T?  where T : Gene, T : K{
 
-        if(this.javaClass == klass){
+        if(matchingClass(klass,strict)){
             return this as T
         }
 
         return null
     }
 
+    protected fun matchingClass(klass: Class<*>, strict: Boolean) : Boolean{
+        if(strict){
+           return this.javaClass == klass
+        }
+        return klass.isAssignableFrom(this.javaClass)
+    }
+
     /**
      * there might be a need to repair gene based on some constraints, e.g., DateGene and TimeGene
      *

diff --git a/core/src/main/kotlin/org/evomaster/core/search/gene/optional/ChoiceGene.kt b/core/src/main/kotlin/org/evomaster/core/search/gene/optional/ChoiceGene.kt
@@ -96,8 +96,8 @@ class ChoiceGene<T>(
     }
 
     @Suppress("BOUNDS_NOT_ALLOWED_IF_BOUNDED_BY_TYPE_PARAMETER")
-    override fun <T,K> getWrappedGene(klass: Class<K>) : T?  where T : Gene, T: K{
-        if(this.javaClass == klass){
+    override fun <T,K> getWrappedGene(klass: Class<K>, strict: Boolean) : T?  where T : Gene, T: K{
+        if(matchingClass(klass,strict)){
             return this as T
         }
         return activeGene().getWrappedGene(klass)

diff --git a/core/src/main/kotlin/org/evomaster/core/search/gene/optional/CustomMutationRateGene.kt b/core/src/main/kotlin/org/evomaster/core/search/gene/optional/CustomMutationRateGene.kt
@@ -57,8 +57,8 @@ class CustomMutationRateGene<out T>(
     }
 
     @Suppress("BOUNDS_NOT_ALLOWED_IF_BOUNDED_BY_TYPE_PARAMETER")
-    override fun <T,K> getWrappedGene(klass: Class<K>) : T?  where T : Gene, T: K{
-        if(this.javaClass == klass){
+    override fun <T,K> getWrappedGene(klass: Class<K>, strict: Boolean) : T?  where T : Gene, T: K{
+        if(matchingClass(klass,strict)){
             return this as T
         }
         return gene.getWrappedGene(klass)

diff --git a/core/src/main/kotlin/org/evomaster/core/search/gene/optional/FlexibleGene.kt b/core/src/main/kotlin/org/evomaster/core/search/gene/optional/FlexibleGene.kt
@@ -76,8 +76,8 @@ class FlexibleGene(name: String,
     }
 
     @Suppress("BOUNDS_NOT_ALLOWED_IF_BOUNDED_BY_TYPE_PARAMETER")
-    override fun <T,K> getWrappedGene(klass: Class<K>) : T?  where T : Gene, T: K{
-        if(this.javaClass == klass){
+    override fun <T,K> getWrappedGene(klass: Class<K>, strict: Boolean) : T?  where T : Gene, T: K{
+        if(matchingClass(klass,strict)){
             return this as T
         }
         return gene.getWrappedGene(klass)

diff --git a/core/src/main/kotlin/org/evomaster/core/search/gene/optional/SelectableWrapperGene.kt b/core/src/main/kotlin/org/evomaster/core/search/gene/optional/SelectableWrapperGene.kt
@@ -36,8 +36,8 @@ abstract class SelectableWrapperGene(name: String,
     }
 
     @Suppress("BOUNDS_NOT_ALLOWED_IF_BOUNDED_BY_TYPE_PARAMETER")
-    override fun <T,K> getWrappedGene(klass: Class<K>) : T?  where T : Gene, T: K{
-        if(this.javaClass == klass){
+    override fun <T,K> getWrappedGene(klass: Class<K>, strict: Boolean) : T?  where T : Gene, T: K{
+        if(matchingClass(klass,strict)){
             return this as T
         }
         return gene.getWrappedGene(klass)