Fix merging issues

Author: mondokm

subprojects/xcfa/xcfa-analysis/src/main/java/hu/bme/mit/theta/xcfa/analysis/XcfaAnalysis.kt

@@ -499,9 +499,11 @@ class ExplPredCombinedXcfaAnalysis(
     ) -> List<XcfaState<PtrState<Prod2State<ExplState, PredState>>>>,
   partialOrd: PartialOrd<XcfaState<PtrState<Prod2State<ExplState, PredState>>>>,
   isHavoc: Boolean,
+  coi: XcfaCoi? = null,
 ) :
   XcfaAnalysis<Prod2State<ExplState, PredState>, PtrPrec<Prod2Prec<ExplPrec, PredPrec>>>(
     corePartialOrd = partialOrd,
     coreInitFunc = getExplPredCombinedXcfaInitFunc(xcfa, solver),
     coreTransFunc = prod2ExplPredTransFunc,
+    coneOfInfluence = coi,
   )

subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/params/ParamValues.kt

@@ -252,14 +252,15 @@ enum class Domain(
     stateType = TypeToken.get(PredState::class.java).type,
   ),
   EXPL_PRED_SPLIT(
-    abstractor = { a, b, c, d, e, f, g, h, i, j ->
+    abstractor = { a, b, c, d, e, f, g, h, i, j, k ->
       getXcfaAbstractor(
         ExplPredCombinedXcfaAnalysis(
           a,
           b,
           getExplPredSplitXcfaTransFunc(Prod2ExplPredAbstractors.booleanAbstractor(b), j),
           i as PartialOrd<XcfaState<PtrState<Prod2State<ExplState, PredState>>>>,
           j,
+          null,
         ),
         d,
         e,
@@ -286,14 +287,15 @@ enum class Domain(
     stateType = TypeToken.get(Prod2State::class.java).type,
   ),
   EXPL_PRED_STMT(
-    abstractor = { a, b, c, d, e, f, g, h, i, j ->
+    abstractor = { a, b, c, d, e, f, g, h, i, j, k ->
       getXcfaAbstractor(
         ExplPredCombinedXcfaAnalysis(
           a,
           b,
           getExplPredStmtXcfaTransFunc(b, j),
           i as PartialOrd<XcfaState<PtrState<Prod2State<ExplState, PredState>>>>,
           j,
+          k,
         ),
         d,
         e,