@tuprolog/2p-full 0.31.1 → 0.31.2

package/2p-solve-problog.js

@@ -185,7 +185,7 @@
   function get_probabilityOrNull() {
     var tmp;
     try {
-      tmp = this.x3d();
+      tmp = this.a3e();
     } catch ($p) {
       var tmp_0;
       if ($p instanceof Error) {
@@ -230,157 +230,157 @@
   //endregion
   function MutableProblogSolver(solver) {
     ProblogSolver.call(this, solver);
-    this.s3b_1 = solver;
+    this.v3b_1 = solver;
   }
-  MutableProblogSolver.prototype.f37 = function (library) {
-    this.s3b_1.loadLibrary(library);
+  MutableProblogSolver.prototype.i37 = function (library) {
+    this.v3b_1.loadLibrary(library);
   };
   MutableProblogSolver.prototype.loadLibrary = function (library) {
-    return this.f37(library);
+    return this.i37(library);
   };
-  MutableProblogSolver.prototype.g37 = function (library) {
-    this.s3b_1.unloadLibrary(library);
+  MutableProblogSolver.prototype.j37 = function (library) {
+    this.v3b_1.unloadLibrary(library);
   };
   MutableProblogSolver.prototype.unloadLibrary = function (library) {
-    return this.g37(library);
+    return this.j37(library);
   };
-  MutableProblogSolver.prototype.h37 = function (libraries) {
-    this.s3b_1.setLibraries(libraries);
+  MutableProblogSolver.prototype.k37 = function (libraries) {
+    this.v3b_1.setLibraries(libraries);
   };
   MutableProblogSolver.prototype.setLibraries = function (libraries) {
-    return this.h37(libraries);
+    return this.k37(libraries);
   };
-  MutableProblogSolver.prototype.i37 = function (theory) {
-    this.s3b_1.loadStaticKb(Companion_getInstance_22().ofIterable(this.s3b_1.k1l(), theory));
+  MutableProblogSolver.prototype.l37 = function (theory) {
+    this.v3b_1.loadStaticKb(Companion_getInstance_22().ofIterable(this.v3b_1.k1l(), theory));
   };
   MutableProblogSolver.prototype.loadStaticKb = function (theory) {
-    return this.i37(theory);
+    return this.l37(theory);
   };
-  MutableProblogSolver.prototype.j37 = function (theory) {
-    this.s3b_1.appendStaticKb(Companion_getInstance_22().ofIterable(this.s3b_1.k1l(), theory));
+  MutableProblogSolver.prototype.m37 = function (theory) {
+    this.v3b_1.appendStaticKb(Companion_getInstance_22().ofIterable(this.v3b_1.k1l(), theory));
   };
   MutableProblogSolver.prototype.appendStaticKb = function (theory) {
-    return this.j37(theory);
+    return this.m37(theory);
   };
-  MutableProblogSolver.prototype.k37 = function () {
-    this.s3b_1.resetStaticKb();
+  MutableProblogSolver.prototype.n37 = function () {
+    this.v3b_1.resetStaticKb();
   };
   MutableProblogSolver.prototype.resetStaticKb = function () {
-    return this.k37();
+    return this.n37();
   };
-  MutableProblogSolver.prototype.l37 = function (theory) {
-    this.s3b_1.loadDynamicKb(Companion_getInstance_22().ofIterable(this.s3b_1.k1l(), theory));
+  MutableProblogSolver.prototype.o37 = function (theory) {
+    this.v3b_1.loadDynamicKb(Companion_getInstance_22().ofIterable(this.v3b_1.k1l(), theory));
   };
   MutableProblogSolver.prototype.loadDynamicKb = function (theory) {
-    return this.l37(theory);
+    return this.o37(theory);
   };
-  MutableProblogSolver.prototype.m37 = function (theory) {
-    this.s3b_1.appendDynamicKb(Companion_getInstance_22().ofIterable(this.s3b_1.k1l(), theory));
+  MutableProblogSolver.prototype.p37 = function (theory) {
+    this.v3b_1.appendDynamicKb(Companion_getInstance_22().ofIterable(this.v3b_1.k1l(), theory));
   };
   MutableProblogSolver.prototype.appendDynamicKb = function (theory) {
-    return this.m37(theory);
+    return this.p37(theory);
   };
-  MutableProblogSolver.prototype.n37 = function () {
-    this.s3b_1.resetDynamicKb();
+  MutableProblogSolver.prototype.q37 = function () {
+    this.v3b_1.resetDynamicKb();
   };
   MutableProblogSolver.prototype.resetDynamicKb = function () {
-    return this.n37();
+    return this.q37();
   };
   MutableProblogSolver.prototype.w1m = function (clause) {
-    this.s3b_1.assertA(first(Companion_getInstance_22().of(this.s3b_1.k1l(), [clause]).t1l()));
+    this.v3b_1.assertA(first(Companion_getInstance_22().of(this.v3b_1.k1l(), [clause]).t1l()));
   };
   MutableProblogSolver.prototype.assertA = function (clause) {
     return this.w1m(clause);
   };
-  MutableProblogSolver.prototype.o37 = function (fact) {
-    this.s3b_1.assertA(first(Companion_getInstance_22().of(this.s3b_1.k1l(), [Companion_getInstance().of(fact)]).t1l()));
+  MutableProblogSolver.prototype.r37 = function (fact) {
+    this.v3b_1.assertA(first(Companion_getInstance_22().of(this.v3b_1.k1l(), [Companion_getInstance().of(fact)]).t1l()));
   };
   MutableProblogSolver.prototype.assertAFact = function (fact) {
-    return this.o37(fact);
+    return this.r37(fact);
   };
   MutableProblogSolver.prototype.w1l = function (clause) {
-    this.s3b_1.assertZ(first(Companion_getInstance_22().of(this.s3b_1.k1l(), [clause]).t1l()));
+    this.v3b_1.assertZ(first(Companion_getInstance_22().of(this.v3b_1.k1l(), [clause]).t1l()));
   };
   MutableProblogSolver.prototype.assertZ = function (clause) {
     return this.w1l(clause);
   };
-  MutableProblogSolver.prototype.p37 = function (fact) {
-    this.s3b_1.assertA(first(Companion_getInstance_22().of(this.s3b_1.k1l(), [Companion_getInstance().of(fact)]).t1l()));
+  MutableProblogSolver.prototype.s37 = function (fact) {
+    this.v3b_1.assertA(first(Companion_getInstance_22().of(this.v3b_1.k1l(), [Companion_getInstance().of(fact)]).t1l()));
   };
   MutableProblogSolver.prototype.assertZFact = function (fact) {
-    return this.p37(fact);
+    return this.s37(fact);
   };
   MutableProblogSolver.prototype.e1t = function (clause) {
-    return this.s3b_1.retract(first(Companion_getInstance_22().of(this.s3b_1.k1l(), [clause]).t1l()));
+    return this.v3b_1.retract(first(Companion_getInstance_22().of(this.v3b_1.k1l(), [clause]).t1l()));
   };
   MutableProblogSolver.prototype.retract = function (clause) {
     return this.e1t(clause);
   };
   MutableProblogSolver.prototype.f1t = function (fact) {
-    return this.s3b_1.retract(first(Companion_getInstance_22().of(this.s3b_1.k1l(), [Companion_getInstance().of(fact)]).t1l()));
+    return this.v3b_1.retract(first(Companion_getInstance_22().of(this.v3b_1.k1l(), [Companion_getInstance().of(fact)]).t1l()));
   };
   MutableProblogSolver.prototype.retractByHead = function (fact) {
     return this.f1t(fact);
   };
   MutableProblogSolver.prototype.c1m = function (clause) {
-    return this.s3b_1.retractAll(first(Companion_getInstance_22().of(this.s3b_1.k1l(), [clause]).t1l()));
+    return this.v3b_1.retractAll(first(Companion_getInstance_22().of(this.v3b_1.k1l(), [clause]).t1l()));
   };
   MutableProblogSolver.prototype.retractAll = function (clause) {
     return this.c1m(clause);
   };
-  MutableProblogSolver.prototype.q37 = function (fact) {
-    return this.s3b_1.retractAll(first(Companion_getInstance_22().of(this.s3b_1.k1l(), [Companion_getInstance().of(fact)]).t1l()));
+  MutableProblogSolver.prototype.t37 = function (fact) {
+    return this.v3b_1.retractAll(first(Companion_getInstance_22().of(this.v3b_1.k1l(), [Companion_getInstance().of(fact)]).t1l()));
   };
   MutableProblogSolver.prototype.retractAllBeHead = function (fact) {
-    return this.q37(fact);
+    return this.t37(fact);
   };
-  MutableProblogSolver.prototype.r37 = function (name, value) {
-    this.s3b_1.setFlag(name, value);
+  MutableProblogSolver.prototype.u37 = function (name, value) {
+    this.v3b_1.setFlag(name, value);
   };
   MutableProblogSolver.prototype.setFlag = function (name, value) {
-    return this.r37(name, value);
+    return this.u37(name, value);
   };
-  MutableProblogSolver.prototype.s37 = function (flag) {
-    this.s3b_1.setFlagPair(flag);
+  MutableProblogSolver.prototype.v37 = function (flag) {
+    this.v3b_1.setFlagPair(flag);
   };
   MutableProblogSolver.prototype.setFlagPair = function (flag) {
-    return this.s37(flag);
+    return this.v37(flag);
   };
-  MutableProblogSolver.prototype.t37 = function (flag) {
-    this.s3b_1.setFlagNotable(flag);
+  MutableProblogSolver.prototype.w37 = function (flag) {
+    this.v3b_1.setFlagNotable(flag);
   };
   MutableProblogSolver.prototype.setFlagNotable = function (flag) {
-    return this.t37(flag);
+    return this.w37(flag);
   };
-  MutableProblogSolver.prototype.u37 = function (stdIn) {
-    this.s3b_1.setStandardInput(stdIn);
+  MutableProblogSolver.prototype.x37 = function (stdIn) {
+    this.v3b_1.setStandardInput(stdIn);
   };
   MutableProblogSolver.prototype.setStandardInput = function (stdIn) {
-    return this.u37(stdIn);
+    return this.x37(stdIn);
   };
-  MutableProblogSolver.prototype.v37 = function (stdErr) {
-    this.s3b_1.setStandardError(stdErr);
+  MutableProblogSolver.prototype.y37 = function (stdErr) {
+    this.v3b_1.setStandardError(stdErr);
   };
   MutableProblogSolver.prototype.setStandardError = function (stdErr) {
-    return this.v37(stdErr);
+    return this.y37(stdErr);
   };
-  MutableProblogSolver.prototype.w37 = function (stdOut) {
-    this.s3b_1.setStandardOutput(stdOut);
+  MutableProblogSolver.prototype.z37 = function (stdOut) {
+    this.v3b_1.setStandardOutput(stdOut);
   };
   MutableProblogSolver.prototype.setStandardOutput = function (stdOut) {
-    return this.w37(stdOut);
+    return this.z37(stdOut);
   };
-  MutableProblogSolver.prototype.x37 = function (warnings) {
-    this.s3b_1.setWarnings(warnings);
+  MutableProblogSolver.prototype.a38 = function (warnings) {
+    this.v3b_1.setWarnings(warnings);
   };
   MutableProblogSolver.prototype.setWarnings = function (warnings) {
-    return this.x37(warnings);
+    return this.a38(warnings);
   };
   MutableProblogSolver.prototype.p1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new MutableProblogSolver(this.s3b_1.p1v(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings));
+    return new MutableProblogSolver(this.v3b_1.p1v(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings));
   };
   MutableProblogSolver.prototype.z1s = function () {
-    return new MutableProblogSolver(this.s3b_1.z1s());
+    return new MutableProblogSolver(this.v3b_1.z1s());
   };
   MutableProblogSolver.prototype.clone = function () {
     return this.z1s();
@@ -418,13 +418,13 @@
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp0__get_functor__thl4dk = ProbSetConfig_getInstance();
     tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
-    var tmp_1 = tmp_0.of(tmp$ret$0, [ProbSetConfig_getInstance().g3c(options)]);
+    var tmp_1 = tmp_0.of(tmp$ret$0, [ProbSetConfig_getInstance().j3c(options)]);
     var tmp_2 = Companion_getInstance_3();
     var tmp$ret$1;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp1__get_functor__4k11yf = Prob_getInstance();
     tmp$ret$1 = tmp1__get_functor__4k11yf.signature.name;
-    var tmp_3 = $this.t3b_1.solveWithOptions(tmp.of(tmp_1, tmp_2.of(tmp$ret$1, [anonVar, goal])), options);
+    var tmp_3 = $this.w3b_1.solveWithOptions(tmp.of(tmp_1, tmp_2.of(tmp$ret$1, [anonVar, goal])), options);
     return map(tmp_3, ProblogSolver$solveNonProbabilistically$lambda(goal, anonVar));
   }
   function solveProbabilistically($this, goal, options) {
@@ -435,7 +435,7 @@
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp0__get_functor__thl4dk = ProbQuery_getInstance();
     tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
-    var tmp_0 = $this.t3b_1.solveWithOptions(tmp.of(tmp$ret$0, [probabilityVar, goal, ProbSetConfig_getInstance().g3c(options), bddVar]), options);
+    var tmp_0 = $this.w3b_1.solveWithOptions(tmp.of(tmp$ret$0, [probabilityVar, goal, ProbSetConfig_getInstance().j3c(options), bddVar]), options);
     return map(tmp_0, ProblogSolver$solveProbabilistically$lambda(probabilityVar, bddVar, goal, options));
   }
   function ProblogSolver$solveNonProbabilistically$lambda$lambda($anonVar) {
@@ -505,9 +505,9 @@
           tmp_5 = false;
         }
         if (tmp_5) {
-          var explanation = bddTerm.h3c_1;
+          var explanation = bddTerm.k3c_1;
           if (explanation instanceof BinaryDecisionDiagramExplanation) {
-            newSolution = setBinaryDecisionDiagram(newSolution, explanation.j3c_1);
+            newSolution = setBinaryDecisionDiagram(newSolution, explanation.m3c_1);
           }
         }
         tmp_2 = newSolution;
@@ -516,45 +516,45 @@
     };
   }
   function ProblogSolver(solver) {
-    this.t3b_1 = solver;
+    this.w3b_1 = solver;
   }
   ProblogSolver.prototype.z1u = function () {
-    return this.t3b_1.z1u();
+    return this.w3b_1.z1u();
   };
   ProblogSolver.prototype.x1u = function () {
-    return this.t3b_1.x1u();
+    return this.w3b_1.x1u();
   };
   ProblogSolver.prototype.a1v = function () {
-    return this.t3b_1.a1v();
+    return this.w3b_1.a1v();
   };
   ProblogSolver.prototype.w1u = function () {
-    return this.t3b_1.w1u();
+    return this.w3b_1.w1u();
   };
   ProblogSolver.prototype.h1v = function () {
-    return this.t3b_1.h1v();
+    return this.w3b_1.h1v();
   };
   ProblogSolver.prototype.b1v = function () {
-    return this.t3b_1.b1v();
+    return this.w3b_1.b1v();
   };
   ProblogSolver.prototype.m1v = function () {
-    return this.t3b_1.m1v();
+    return this.w3b_1.m1v();
   };
   ProblogSolver.prototype.i1v = function () {
-    return this.t3b_1.i1v();
+    return this.w3b_1.i1v();
   };
   ProblogSolver.prototype.k1v = function () {
-    return this.t3b_1.k1v();
+    return this.w3b_1.k1v();
   };
   ProblogSolver.prototype.y1u = function () {
-    return this.t3b_1.y1u();
+    return this.w3b_1.y1u();
   };
   ProblogSolver.prototype.k1l = function () {
-    return this.t3b_1.k1l();
+    return this.w3b_1.k1l();
   };
   ProblogSolver.prototype.o1v = function () {
-    return this.t3b_1.o1v();
+    return this.w3b_1.o1v();
   };
-  ProblogSolver.prototype.u2b = function (goal, options) {
+  ProblogSolver.prototype.c2c = function (goal, options) {
     var tmp;
     if (!get_isProbabilistic(options)) {
       tmp = solveNonProbabilistically(this, goal, options);
@@ -564,61 +564,61 @@
     return tmp;
   };
   ProblogSolver.prototype.solveWithOptions = function (goal, options) {
-    return this.u2b(goal, options);
+    return this.c2c(goal, options);
   };
-  ProblogSolver.prototype.u3b = function (goal, timeout) {
-    return this.u2b(goal, Companion_getInstance_5().allLazilyWithTimeout(timeout));
+  ProblogSolver.prototype.x3b = function (goal, timeout) {
+    return this.c2c(goal, Companion_getInstance_5().allLazilyWithTimeout(timeout));
   };
   ProblogSolver.prototype.solveWithTimeout = function (goal, timeout) {
-    return this.u3b(goal, timeout);
+    return this.x3b(goal, timeout);
   };
-  ProblogSolver.prototype.v3b = function (goal) {
-    return this.u2b(goal, Companion_getInstance_5().DEFAULT);
+  ProblogSolver.prototype.y3b = function (goal) {
+    return this.c2c(goal, Companion_getInstance_5().DEFAULT);
   };
   ProblogSolver.prototype.solve = function (goal) {
-    return this.v3b(goal);
+    return this.y3b(goal);
   };
-  ProblogSolver.prototype.w3b = function (goal, timeout) {
-    return toList(this.u3b(goal, timeout));
+  ProblogSolver.prototype.z3b = function (goal, timeout) {
+    return toList(this.x3b(goal, timeout));
   };
   ProblogSolver.prototype.solveListWithTimeout = function (goal, timeout) {
-    return this.w3b(goal, timeout);
+    return this.z3b(goal, timeout);
   };
-  ProblogSolver.prototype.x3b = function (goal) {
-    return toList(this.v3b(goal));
+  ProblogSolver.prototype.a3c = function (goal) {
+    return toList(this.y3b(goal));
   };
   ProblogSolver.prototype.solveList = function (goal) {
-    return this.x3b(goal);
+    return this.a3c(goal);
   };
-  ProblogSolver.prototype.y3b = function (goal, options) {
-    return toList(this.u2b(goal, options));
+  ProblogSolver.prototype.b3c = function (goal, options) {
+    return toList(this.c2c(goal, options));
   };
   ProblogSolver.prototype.solveListWithOptions = function (goal, options) {
-    return this.y3b(goal, options);
+    return this.b3c(goal, options);
   };
-  ProblogSolver.prototype.z3b = function (goal, timeout) {
-    return first_0(this.u2b(goal, Companion_getInstance_5().someLazilyWithTimeout(1, timeout)));
+  ProblogSolver.prototype.c3c = function (goal, timeout) {
+    return first_0(this.c2c(goal, Companion_getInstance_5().someLazilyWithTimeout(1, timeout)));
   };
   ProblogSolver.prototype.solveOnceWithTimeout = function (goal, timeout) {
-    return this.z3b(goal, timeout);
+    return this.c3c(goal, timeout);
   };
-  ProblogSolver.prototype.a3c = function (goal) {
-    return first_0(this.u2b(goal, Companion_getInstance_5().someLazily(1)));
+  ProblogSolver.prototype.d3c = function (goal) {
+    return first_0(this.c2c(goal, Companion_getInstance_5().someLazily(1)));
   };
   ProblogSolver.prototype.solveOnce = function (goal) {
-    return this.a3c(goal);
+    return this.d3c(goal);
   };
-  ProblogSolver.prototype.b3c = function (goal, options) {
-    return first_0(this.u2b(goal, options.setLimit(1)));
+  ProblogSolver.prototype.e3c = function (goal, options) {
+    return first_0(this.c2c(goal, options.setLimit(1)));
   };
   ProblogSolver.prototype.solveOnceWithOptions = function (goal, options) {
-    return this.b3c(goal, options);
+    return this.e3c(goal, options);
   };
   ProblogSolver.prototype.p1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new ProblogSolver(this.t3b_1.p1v(unificator, libraries, flags, Companion_getInstance_22().ofIterable(unificator, staticKb), Companion_getInstance_22().ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
+    return new ProblogSolver(this.w3b_1.p1v(unificator, libraries, flags, Companion_getInstance_22().ofIterable(unificator, staticKb), Companion_getInstance_22().ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
   };
   ProblogSolver.prototype.z1s = function () {
-    return new ProblogSolver(this.t3b_1.clone());
+    return new ProblogSolver(this.w3b_1.clone());
   };
   ProblogSolver.prototype.clone = function () {
     return this.z1s();
@@ -631,7 +631,7 @@
     var tmp;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.contains' call
-    var tmp0_contains = ProblogLib_getInstance().i2e();
+    var tmp0_contains = ProblogLib_getInstance().o2e();
     var tmp$ret$0;
     // Inline function 'kotlin.collections.containsKey' call
     tmp$ret$0 = (isInterface(libraries, Map) ? libraries : THROW_CCE()).u2(tmp0_contains);
@@ -644,7 +644,7 @@
     return tmp;
   }
   function ProblogSolverFactory$ensureVariablesTracking$lambda($this$invoke) {
-    return $this$invoke.m29_1;
+    return $this$invoke.u29_1;
   }
   function ProblogSolverFactory() {
     ProblogSolverFactory_instance = this;
@@ -677,17 +677,17 @@
     DefaultBuiltins_instance = this;
     ExtensionLibrary.call(this, DefaultBuiltins_getInstance());
   }
-  DefaultBuiltins.prototype.i2e = function () {
-    return ProblogLib_getInstance().i2e();
+  DefaultBuiltins.prototype.o2e = function () {
+    return ProblogLib_getInstance().o2e();
   };
-  DefaultBuiltins.prototype.t2e = function () {
-    return ProblogLib_getInstance().t2e();
+  DefaultBuiltins.prototype.z2e = function () {
+    return ProblogLib_getInstance().z2e();
   };
-  DefaultBuiltins.prototype.y2e = function () {
-    return ProblogLib_getInstance().y2e();
+  DefaultBuiltins.prototype.b2f = function () {
+    return ProblogLib_getInstance().b2f();
   };
-  DefaultBuiltins.prototype.x2e = function () {
-    return ProblogLib_getInstance().x2e();
+  DefaultBuiltins.prototype.a2f = function () {
+    return ProblogLib_getInstance().a2f();
   };
   var DefaultBuiltins_instance;
   function DefaultBuiltins_getInstance_0() {
@@ -699,10 +699,10 @@
     MinimalBuiltins_instance = this;
     ExtensionLibrary.call(this, ProblogLib_getInstance());
   }
-  MinimalBuiltins.prototype.y2e = function () {
+  MinimalBuiltins.prototype.b2f = function () {
     return listOf(EnsureExecutable_getInstance());
   };
-  MinimalBuiltins.prototype.x2e = function () {
+  MinimalBuiltins.prototype.a2f = function () {
     return listOf(Call_getInstance());
   };
   var MinimalBuiltins_instance;
@@ -714,18 +714,18 @@
   function ProblogLib() {
     ProblogLib_instance = this;
     var tmp = Companion_getInstance_6();
-    ExtensionLibrary.call(this, tmp.e2e('problog.lang', null, null, null, null, 30, null));
-    this.a3d_1 = 'EXPL';
-    this.b3d_1 = 'evidence';
-    this.c3d_1 = 'prob';
+    ExtensionLibrary.call(this, tmp.m2e('problog.lang', null, null, null, null, 30, null));
+    this.d3d_1 = 'EXPL';
+    this.e3d_1 = 'evidence';
+    this.f3d_1 = 'prob';
   }
-  ProblogLib.prototype.t2e = function () {
+  ProblogLib.prototype.z2e = function () {
     return get_PROBLOG_SPECIFIC_OPERATORS();
   };
-  ProblogLib.prototype.x2e = function () {
+  ProblogLib.prototype.a2f = function () {
     return listOf(Prob_getInstance());
   };
-  ProblogLib.prototype.y2e = function () {
+  ProblogLib.prototype.b2f = function () {
     return listOf_0([ProbHelper_getInstance(), ProbSolve_getInstance(), ProbExplAnd_getInstance(), ProbQuery_getInstance(), ProbSolveEvidence_getInstance(), ProbSolveWithEvidence_getInstance(), ProbNegationAsFailure_getInstance(), ProbSetConfig_getInstance()]);
   };
   var ProblogLib_instance;
@@ -747,11 +747,11 @@
   }
   function ClauseMappingException(message, cause) {
     TuPrologException_init_$Init$(cause, this);
-    this.j3d_1 = message;
+    this.m3d_1 = message;
     captureStack(this, ClauseMappingException);
   }
   ClauseMappingException.prototype.k1 = function () {
-    return this.j3d_1;
+    return this.m3d_1;
   };
   Object.defineProperty(ClauseMappingException.prototype, 'message', {
     configurable: true,
@@ -803,11 +803,11 @@
   }
   function Companion_0() {
     Companion_instance_0 = this;
-    this.k3d_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(false), Companion_getInstance_23().n3d_1);
-    this.l3d_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(true), Companion_getInstance_23().o3d_1);
+    this.n3d_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(false), Companion_getInstance_23().q3d_1);
+    this.o3d_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(true), Companion_getInstance_23().r3d_1);
   }
-  Companion_0.prototype.p3d = function (term) {
-    return new BinaryDecisionDiagramExplanation(bddOf(term), new ComputedValue(term.r3d_1));
+  Companion_0.prototype.s3d = function (term) {
+    return new BinaryDecisionDiagramExplanation(bddOf(term), new ComputedValue(term.u3d_1));
   };
   var Companion_instance_0;
   function Companion_getInstance_21() {
@@ -831,296 +831,296 @@
     };
   }
   function ProbExplanationTerm(explanation) {
-    this.h3c_1 = explanation;
-    this.i3c_1 = Companion_getInstance_8().of('<expl:' + explanation + '>');
+    this.k3c_1 = explanation;
+    this.l3c_1 = Companion_getInstance_8().of('<expl:' + explanation + '>');
   }
   ProbExplanationTerm.prototype.gw = function () {
-    return this.i3c_1.gw();
+    return this.l3c_1.gw();
   };
   ProbExplanationTerm.prototype.yw = function () {
-    return this.i3c_1.yw();
+    return this.l3c_1.yw();
   };
   ProbExplanationTerm.prototype.zv = function () {
-    return this.i3c_1.zv();
+    return this.l3c_1.zv();
   };
   ProbExplanationTerm.prototype.fw = function () {
-    return this.i3c_1.fw();
+    return this.l3c_1.fw();
   };
   ProbExplanationTerm.prototype.xw = function () {
-    return this.i3c_1.xw();
+    return this.l3c_1.xw();
   };
   ProbExplanationTerm.prototype.aw = function () {
-    return this.i3c_1.aw();
+    return this.l3c_1.aw();
   };
   ProbExplanationTerm.prototype.tw = function () {
-    return this.i3c_1.tw();
+    return this.l3c_1.tw();
   };
   ProbExplanationTerm.prototype.mw = function () {
-    return this.i3c_1.mw();
+    return this.l3c_1.mw();
   };
   ProbExplanationTerm.prototype.sw = function () {
-    return this.i3c_1.sw();
+    return this.l3c_1.sw();
   };
   ProbExplanationTerm.prototype.ow = function () {
-    return this.i3c_1.ow();
+    return this.l3c_1.ow();
   };
   ProbExplanationTerm.prototype.bw = function () {
-    return this.i3c_1.bw();
+    return this.l3c_1.bw();
   };
   ProbExplanationTerm.prototype.cw = function () {
-    return this.i3c_1.cw();
+    return this.l3c_1.cw();
   };
   ProbExplanationTerm.prototype.pw = function () {
-    return this.i3c_1.pw();
+    return this.l3c_1.pw();
   };
   ProbExplanationTerm.prototype.ew = function () {
-    return this.i3c_1.ew();
+    return this.l3c_1.ew();
   };
   ProbExplanationTerm.prototype.ww = function () {
-    return this.i3c_1.ww();
+    return this.l3c_1.ww();
   };
   ProbExplanationTerm.prototype.uw = function () {
-    return this.i3c_1.uw();
+    return this.l3c_1.uw();
   };
   ProbExplanationTerm.prototype.gx = function () {
-    return this.i3c_1.gx();
+    return this.l3c_1.gx();
   };
   ProbExplanationTerm.prototype.rw = function () {
-    return this.i3c_1.rw();
+    return this.l3c_1.rw();
   };
   ProbExplanationTerm.prototype.fx = function () {
-    return this.i3c_1.fx();
+    return this.l3c_1.fx();
   };
   ProbExplanationTerm.prototype.hx = function () {
-    return this.i3c_1.hx();
+    return this.l3c_1.hx();
   };
   ProbExplanationTerm.prototype.dx = function () {
-    return this.i3c_1.dx();
+    return this.l3c_1.dx();
   };
   ProbExplanationTerm.prototype.nw = function () {
-    return this.i3c_1.nw();
+    return this.l3c_1.nw();
   };
   ProbExplanationTerm.prototype.lw = function () {
-    return this.i3c_1.lw();
+    return this.l3c_1.lw();
   };
   ProbExplanationTerm.prototype.dw = function () {
-    return this.i3c_1.dw();
+    return this.l3c_1.dw();
   };
   ProbExplanationTerm.prototype.cx = function () {
-    return this.i3c_1.cx();
+    return this.l3c_1.cx();
   };
   ProbExplanationTerm.prototype.qw = function () {
-    return this.i3c_1.qw();
+    return this.l3c_1.qw();
   };
   ProbExplanationTerm.prototype.bx = function () {
-    return this.i3c_1.bx();
+    return this.l3c_1.bx();
   };
   ProbExplanationTerm.prototype.kt = function () {
-    return this.i3c_1.kt();
+    return this.l3c_1.kt();
   };
   ProbExplanationTerm.prototype.b1 = function () {
-    return this.i3c_1.b1();
+    return this.l3c_1.b1();
   };
   ProbExplanationTerm.prototype.hw = function () {
-    return this.i3c_1.hw();
+    return this.l3c_1.hw();
   };
   ProbExplanationTerm.prototype.accept = function (visitor) {
-    return this.i3c_1.accept(visitor);
+    return this.l3c_1.accept(visitor);
   };
   ProbExplanationTerm.prototype.addFirst = function (argument) {
-    return this.i3c_1.addFirst(argument);
+    return this.l3c_1.addFirst(argument);
   };
   ProbExplanationTerm.prototype.addLast = function (argument) {
-    return this.i3c_1.addLast(argument);
+    return this.l3c_1.addLast(argument);
   };
   ProbExplanationTerm.prototype.append = function (argument) {
-    return this.i3c_1.append(argument);
+    return this.l3c_1.append(argument);
   };
   ProbExplanationTerm.prototype.kw = function () {
-    return this.i3c_1.kw();
+    return this.l3c_1.kw();
   };
   ProbExplanationTerm.prototype.asAtom = function () {
     return this.kw();
   };
   ProbExplanationTerm.prototype.asBlock = function () {
-    return this.i3c_1.asBlock();
+    return this.l3c_1.asBlock();
   };
   ProbExplanationTerm.prototype.asClause = function () {
-    return this.i3c_1.asClause();
+    return this.l3c_1.asClause();
   };
   ProbExplanationTerm.prototype.asCons = function () {
-    return this.i3c_1.asCons();
+    return this.l3c_1.asCons();
   };
   ProbExplanationTerm.prototype.asDirective = function () {
-    return this.i3c_1.asDirective();
+    return this.l3c_1.asDirective();
   };
   ProbExplanationTerm.prototype.asEmptyBlock = function () {
-    return this.i3c_1.asEmptyBlock();
+    return this.l3c_1.asEmptyBlock();
   };
   ProbExplanationTerm.prototype.asEmptyList = function () {
-    return this.i3c_1.asEmptyList();
+    return this.l3c_1.asEmptyList();
   };
   ProbExplanationTerm.prototype.asFact = function () {
-    return this.i3c_1.asFact();
+    return this.l3c_1.asFact();
   };
   ProbExplanationTerm.prototype.asIndicator = function () {
-    return this.i3c_1.asIndicator();
+    return this.l3c_1.asIndicator();
   };
   ProbExplanationTerm.prototype.asInteger = function () {
-    return this.i3c_1.asInteger();
+    return this.l3c_1.asInteger();
   };
   ProbExplanationTerm.prototype.asList = function () {
-    return this.i3c_1.asList();
+    return this.l3c_1.asList();
   };
   ProbExplanationTerm.prototype.asNumeric = function () {
-    return this.i3c_1.asNumeric();
+    return this.l3c_1.asNumeric();
   };
   ProbExplanationTerm.prototype.asReal = function () {
-    return this.i3c_1.asReal();
+    return this.l3c_1.asReal();
   };
   ProbExplanationTerm.prototype.asRecursive = function () {
-    return this.i3c_1.asRecursive();
+    return this.l3c_1.asRecursive();
   };
   ProbExplanationTerm.prototype.asRule = function () {
-    return this.i3c_1.asRule();
+    return this.l3c_1.asRule();
   };
   ProbExplanationTerm.prototype.vw = function () {
-    return this.i3c_1.vw();
+    return this.l3c_1.vw();
   };
   ProbExplanationTerm.prototype.asStruct = function () {
     return this.vw();
   };
   ProbExplanationTerm.prototype.asTerm = function () {
-    return this.i3c_1.asTerm();
+    return this.l3c_1.asTerm();
   };
   ProbExplanationTerm.prototype.asTruth = function () {
-    return this.i3c_1.asTruth();
+    return this.l3c_1.asTruth();
   };
   ProbExplanationTerm.prototype.asTuple = function () {
-    return this.i3c_1.asTuple();
+    return this.l3c_1.asTuple();
   };
   ProbExplanationTerm.prototype.asVar = function () {
-    return this.i3c_1.asVar();
+    return this.l3c_1.asVar();
   };
   ProbExplanationTerm.prototype.zw = function () {
-    return this.i3c_1.zw();
+    return this.l3c_1.zw();
   };
   ProbExplanationTerm.prototype.qq = function () {
     return this.zw();
   };
   ProbExplanationTerm.prototype.castToAtom = function () {
-    return this.i3c_1.castToAtom();
+    return this.l3c_1.castToAtom();
   };
   ProbExplanationTerm.prototype.castToBlock = function () {
-    return this.i3c_1.castToBlock();
+    return this.l3c_1.castToBlock();
   };
   ProbExplanationTerm.prototype.castToClause = function () {
-    return this.i3c_1.castToClause();
+    return this.l3c_1.castToClause();
   };
   ProbExplanationTerm.prototype.castToCons = function () {
-    return this.i3c_1.castToCons();
+    return this.l3c_1.castToCons();
   };
   ProbExplanationTerm.prototype.castToConstant = function () {
-    return this.i3c_1.castToConstant();
+    return this.l3c_1.castToConstant();
   };
   ProbExplanationTerm.prototype.castToDirective = function () {
-    return this.i3c_1.castToDirective();
+    return this.l3c_1.castToDirective();
   };
   ProbExplanationTerm.prototype.castToEmptyBlock = function () {
-    return this.i3c_1.castToEmptyBlock();
+    return this.l3c_1.castToEmptyBlock();
   };
   ProbExplanationTerm.prototype.castToEmptyList = function () {
-    return this.i3c_1.castToEmptyList();
+    return this.l3c_1.castToEmptyList();
   };
   ProbExplanationTerm.prototype.castToFact = function () {
-    return this.i3c_1.castToFact();
+    return this.l3c_1.castToFact();
   };
   ProbExplanationTerm.prototype.castToIndicator = function () {
-    return this.i3c_1.castToIndicator();
+    return this.l3c_1.castToIndicator();
   };
   ProbExplanationTerm.prototype.castToInteger = function () {
-    return this.i3c_1.castToInteger();
+    return this.l3c_1.castToInteger();
   };
   ProbExplanationTerm.prototype.castToList = function () {
-    return this.i3c_1.castToList();
+    return this.l3c_1.castToList();
   };
   ProbExplanationTerm.prototype.castToNumeric = function () {
-    return this.i3c_1.castToNumeric();
+    return this.l3c_1.castToNumeric();
   };
   ProbExplanationTerm.prototype.castToReal = function () {
-    return this.i3c_1.castToReal();
+    return this.l3c_1.castToReal();
   };
   ProbExplanationTerm.prototype.castToRecursive = function () {
-    return this.i3c_1.castToRecursive();
+    return this.l3c_1.castToRecursive();
   };
   ProbExplanationTerm.prototype.castToRule = function () {
-    return this.i3c_1.castToRule();
+    return this.l3c_1.castToRule();
   };
   ProbExplanationTerm.prototype.castToStruct = function () {
-    return this.i3c_1.castToStruct();
+    return this.l3c_1.castToStruct();
   };
   ProbExplanationTerm.prototype.castToTerm = function () {
-    return this.i3c_1.castToTerm();
+    return this.l3c_1.castToTerm();
   };
   ProbExplanationTerm.prototype.castToTruth = function () {
-    return this.i3c_1.castToTruth();
+    return this.l3c_1.castToTruth();
   };
   ProbExplanationTerm.prototype.castToTuple = function () {
-    return this.i3c_1.castToTuple();
+    return this.l3c_1.castToTuple();
   };
   ProbExplanationTerm.prototype.castToVar = function () {
-    return this.i3c_1.castToVar();
+    return this.l3c_1.castToVar();
   };
   ProbExplanationTerm.prototype.ax = function (other) {
-    return this.i3c_1.ax(other);
+    return this.l3c_1.ax(other);
   };
   ProbExplanationTerm.prototype.aa = function (other) {
     return this.ax((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   ProbExplanationTerm.prototype.containsTag = function (name) {
-    return this.i3c_1.containsTag(name);
+    return this.l3c_1.containsTag(name);
   };
   ProbExplanationTerm.prototype.equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.i3c_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.l3c_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   ProbExplanationTerm.prototype.equals = function (other) {
-    return this.i3c_1.equals(other);
+    return this.l3c_1.equals(other);
   };
   ProbExplanationTerm.prototype.get = function (index) {
-    return this.i3c_1.get(index);
+    return this.l3c_1.get(index);
   };
   ProbExplanationTerm.prototype.getArgAt = function (index) {
-    return this.i3c_1.getArgAt(index);
+    return this.l3c_1.getArgAt(index);
   };
   ProbExplanationTerm.prototype.getTag = function (name) {
-    return this.i3c_1.getTag(name);
+    return this.l3c_1.getTag(name);
   };
   ProbExplanationTerm.prototype.hashCode = function () {
-    return this.i3c_1.hashCode();
+    return this.l3c_1.hashCode();
   };
   ProbExplanationTerm.prototype.insertAt = function (index, argument) {
-    return this.i3c_1.insertAt(index, argument);
+    return this.l3c_1.insertAt(index, argument);
   };
   ProbExplanationTerm.prototype.resetTags = function (tags) {
-    return this.i3c_1.resetTags(tags);
+    return this.l3c_1.resetTags(tags);
   };
   ProbExplanationTerm.prototype.setArgs = function (args) {
-    return this.i3c_1.setArgs(args);
+    return this.l3c_1.setArgs(args);
   };
   ProbExplanationTerm.prototype.setArgsIterable = function (args) {
-    return this.i3c_1.setArgsIterable(args);
+    return this.l3c_1.setArgsIterable(args);
   };
   ProbExplanationTerm.prototype.setArgsSequence = function (args) {
-    return this.i3c_1.setArgsSequence(args);
+    return this.l3c_1.setArgsSequence(args);
   };
   ProbExplanationTerm.prototype.setFunctor = function (functor) {
-    return this.i3c_1.setFunctor(functor);
+    return this.l3c_1.setFunctor(functor);
   };
   ProbExplanationTerm.prototype.structurallyEquals = function (other) {
-    return this.i3c_1.structurallyEquals(other);
+    return this.l3c_1.structurallyEquals(other);
   };
   ProbExplanationTerm.prototype.toString = function () {
-    return this.i3c_1.toString();
+    return this.l3c_1.toString();
   };
   ProbExplanationTerm.prototype.ex = function () {
     return false;
@@ -1132,35 +1132,35 @@
     return this.ix();
   };
   ProbExplanationTerm.prototype.iw = function () {
-    return new ProbExplanationTerm(this.h3c_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda));
+    return new ProbExplanationTerm(this.k3c_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda));
   };
   ProbExplanationTerm.prototype.freshCopy = function () {
     return this.iw();
   };
   ProbExplanationTerm.prototype.jw = function (scope) {
-    return new ProbExplanationTerm(this.h3c_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda_0(scope)));
+    return new ProbExplanationTerm(this.k3c_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda_0(scope)));
   };
   ProbExplanationTerm.prototype.freshCopyFromScope = function (scope) {
     return this.jw(scope);
   };
-  ProbExplanationTerm.prototype.b2p = function (substitution, substitutions) {
-    return this.c2p(substitution, substitutions.slice());
+  ProbExplanationTerm.prototype.e2p = function (substitution, substitutions) {
+    return this.f2p(substitution, substitutions.slice());
   };
   ProbExplanationTerm.prototype.getSubstituted = function (substitution, substitutions) {
-    return this.b2p(substitution, substitutions);
+    return this.e2p(substitution, substitutions);
   };
-  ProbExplanationTerm.prototype.c2p = function (substitution, substitutions) {
+  ProbExplanationTerm.prototype.f2p = function (substitution, substitutions) {
     return this.s16(Companion_getInstance_9().ofSubstitution(substitution, substitutions.slice()));
   };
   ProbExplanationTerm.prototype.apply = function (substitution, substitutions) {
-    return this.c2p(substitution, substitutions);
+    return this.f2p(substitution, substitutions);
   };
   ProbExplanationTerm.prototype.s16 = function (substitution) {
     var tmp;
     if (substitution.d() ? true : this.jx()) {
       tmp = this;
     } else {
-      tmp = new ProbExplanationTerm(this.h3c_1.applyTransformation(ProbExplanationTerm$apply$lambda(substitution)));
+      tmp = new ProbExplanationTerm(this.k3c_1.applyTransformation(ProbExplanationTerm$apply$lambda(substitution)));
     }
     return tmp;
   };
@@ -1168,23 +1168,23 @@
     return this.s16(substitution);
   };
   ProbExplanationTerm.prototype.jx = function () {
-    return !this.h3c_1.z3d();
+    return !this.k3c_1.c3e();
   };
   function _get_cachedHashCode__d7x0zy($this) {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = cachedHashCode$factory();
-    tmp$ret$0 = $this.w3d_1.b1();
+    tmp$ret$0 = $this.z3d_1.b1();
     return tmp$ret$0;
   }
   function ProbTerm$isGround$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (this$0.s3d_1.jx()) {
+      if (this$0.v3d_1.jx()) {
         var tmp$ret$0;
         $l$block_0: {
           // Inline function 'kotlin.collections.any' call
-          var tmp0_any = this$0.t3d_1;
+          var tmp0_any = this$0.w3d_1;
           var tmp_0;
           if (isInterface(tmp0_any, Collection)) {
             tmp_0 = tmp0_any.d();
@@ -1217,230 +1217,230 @@
   }
   function ProbTerm$cachedHashCode$delegate$lambda(this$0) {
     return function () {
-      var result = this$0.q3d_1.hashCode();
-      result = imul(31, result) + getNumberHashCode(this$0.r3d_1) | 0;
-      result = imul(31, result) + this$0.s3d_1.hashCode() | 0;
-      result = imul(31, result) + hashCode(this$0.t3d_1) | 0;
+      var result = this$0.t3d_1.hashCode();
+      result = imul(31, result) + getNumberHashCode(this$0.u3d_1) | 0;
+      result = imul(31, result) + this$0.v3d_1.hashCode() | 0;
+      result = imul(31, result) + hashCode(this$0.w3d_1) | 0;
       return result;
     };
   }
   function ProbTerm(id, probability, term, extraVariables) {
-    this.q3d_1 = id;
-    this.r3d_1 = probability;
-    this.s3d_1 = term;
-    this.t3d_1 = extraVariables;
-    this.u3d_1 = Companion_getInstance_3().of(get_ANNOTATION_FUNCTOR(), [Companion_getInstance_10().ofDouble(probability), term]);
+    this.t3d_1 = id;
+    this.u3d_1 = probability;
+    this.v3d_1 = term;
+    this.w3d_1 = extraVariables;
+    this.x3d_1 = Companion_getInstance_3().of(get_ANNOTATION_FUNCTOR(), [Companion_getInstance_10().ofDouble(probability), term]);
     var tmp = this;
-    tmp.v3d_1 = lazy(ProbTerm$isGround$delegate$lambda(this));
+    tmp.y3d_1 = lazy(ProbTerm$isGround$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.w3d_1 = lazy(ProbTerm$cachedHashCode$delegate$lambda(this));
+    tmp_0.z3d_1 = lazy(ProbTerm$cachedHashCode$delegate$lambda(this));
   }
   ProbTerm.prototype.aw = function () {
-    return this.u3d_1.aw();
+    return this.x3d_1.aw();
   };
   ProbTerm.prototype.mw = function () {
-    return this.u3d_1.mw();
+    return this.x3d_1.mw();
   };
   ProbTerm.prototype.sw = function () {
-    return this.u3d_1.sw();
+    return this.x3d_1.sw();
   };
   ProbTerm.prototype.ex = function () {
-    return this.u3d_1.ex();
+    return this.x3d_1.ex();
   };
   ProbTerm.prototype.bw = function () {
-    return this.u3d_1.bw();
+    return this.x3d_1.bw();
   };
   ProbTerm.prototype.cw = function () {
-    return this.u3d_1.cw();
+    return this.x3d_1.cw();
   };
   ProbTerm.prototype.uw = function () {
-    return this.u3d_1.uw();
+    return this.x3d_1.uw();
   };
   ProbTerm.prototype.gx = function () {
-    return this.u3d_1.gx();
+    return this.x3d_1.gx();
   };
   ProbTerm.prototype.rw = function () {
-    return this.u3d_1.rw();
+    return this.x3d_1.rw();
   };
   ProbTerm.prototype.fx = function () {
-    return this.u3d_1.fx();
+    return this.x3d_1.fx();
   };
   ProbTerm.prototype.hx = function () {
-    return this.u3d_1.hx();
+    return this.x3d_1.hx();
   };
   ProbTerm.prototype.lw = function () {
-    return this.u3d_1.lw();
+    return this.x3d_1.lw();
   };
   ProbTerm.prototype.dw = function () {
-    return this.u3d_1.dw();
+    return this.x3d_1.dw();
   };
   ProbTerm.prototype.qw = function () {
-    return this.u3d_1.qw();
+    return this.x3d_1.qw();
   };
   ProbTerm.prototype.bx = function () {
-    return this.u3d_1.bx();
+    return this.x3d_1.bx();
   };
   ProbTerm.prototype.kt = function () {
-    return this.u3d_1.kt();
+    return this.x3d_1.kt();
   };
   ProbTerm.prototype.hw = function () {
-    return this.u3d_1.hw();
+    return this.x3d_1.hw();
   };
   ProbTerm.prototype.accept = function (visitor) {
-    return this.u3d_1.accept(visitor);
+    return this.x3d_1.accept(visitor);
   };
   ProbTerm.prototype.asAtom = function () {
-    return this.u3d_1.asAtom();
+    return this.x3d_1.asAtom();
   };
   ProbTerm.prototype.asBlock = function () {
-    return this.u3d_1.asBlock();
+    return this.x3d_1.asBlock();
   };
   ProbTerm.prototype.asClause = function () {
-    return this.u3d_1.asClause();
+    return this.x3d_1.asClause();
   };
   ProbTerm.prototype.asCons = function () {
-    return this.u3d_1.asCons();
+    return this.x3d_1.asCons();
   };
   ProbTerm.prototype.asConstant = function () {
-    return this.u3d_1.asConstant();
+    return this.x3d_1.asConstant();
   };
   ProbTerm.prototype.asDirective = function () {
-    return this.u3d_1.asDirective();
+    return this.x3d_1.asDirective();
   };
   ProbTerm.prototype.asEmptyBlock = function () {
-    return this.u3d_1.asEmptyBlock();
+    return this.x3d_1.asEmptyBlock();
   };
   ProbTerm.prototype.asEmptyList = function () {
-    return this.u3d_1.asEmptyList();
+    return this.x3d_1.asEmptyList();
   };
   ProbTerm.prototype.asFact = function () {
-    return this.u3d_1.asFact();
+    return this.x3d_1.asFact();
   };
   ProbTerm.prototype.asIndicator = function () {
-    return this.u3d_1.asIndicator();
+    return this.x3d_1.asIndicator();
   };
   ProbTerm.prototype.asInteger = function () {
-    return this.u3d_1.asInteger();
+    return this.x3d_1.asInteger();
   };
   ProbTerm.prototype.asList = function () {
-    return this.u3d_1.asList();
+    return this.x3d_1.asList();
   };
   ProbTerm.prototype.asNumeric = function () {
-    return this.u3d_1.asNumeric();
+    return this.x3d_1.asNumeric();
   };
   ProbTerm.prototype.asReal = function () {
-    return this.u3d_1.asReal();
+    return this.x3d_1.asReal();
   };
   ProbTerm.prototype.asRecursive = function () {
-    return this.u3d_1.asRecursive();
+    return this.x3d_1.asRecursive();
   };
   ProbTerm.prototype.asRule = function () {
-    return this.u3d_1.asRule();
+    return this.x3d_1.asRule();
   };
   ProbTerm.prototype.asStruct = function () {
-    return this.u3d_1.vw();
+    return this.x3d_1.vw();
   };
   ProbTerm.prototype.asTerm = function () {
-    return this.u3d_1.asTerm();
+    return this.x3d_1.asTerm();
   };
   ProbTerm.prototype.asTruth = function () {
-    return this.u3d_1.asTruth();
+    return this.x3d_1.asTruth();
   };
   ProbTerm.prototype.asTuple = function () {
-    return this.u3d_1.asTuple();
+    return this.x3d_1.asTuple();
   };
   ProbTerm.prototype.asVar = function () {
-    return this.u3d_1.asVar();
+    return this.x3d_1.asVar();
   };
   ProbTerm.prototype.zw = function () {
-    return this.u3d_1.zw();
+    return this.x3d_1.zw();
   };
   ProbTerm.prototype.qq = function () {
     return this.zw();
   };
   ProbTerm.prototype.castToAtom = function () {
-    return this.u3d_1.castToAtom();
+    return this.x3d_1.castToAtom();
   };
   ProbTerm.prototype.castToBlock = function () {
-    return this.u3d_1.castToBlock();
+    return this.x3d_1.castToBlock();
   };
   ProbTerm.prototype.castToClause = function () {
-    return this.u3d_1.castToClause();
+    return this.x3d_1.castToClause();
   };
   ProbTerm.prototype.castToCons = function () {
-    return this.u3d_1.castToCons();
+    return this.x3d_1.castToCons();
   };
   ProbTerm.prototype.castToConstant = function () {
-    return this.u3d_1.castToConstant();
+    return this.x3d_1.castToConstant();
   };
   ProbTerm.prototype.castToDirective = function () {
-    return this.u3d_1.castToDirective();
+    return this.x3d_1.castToDirective();
   };
   ProbTerm.prototype.castToEmptyBlock = function () {
-    return this.u3d_1.castToEmptyBlock();
+    return this.x3d_1.castToEmptyBlock();
   };
   ProbTerm.prototype.castToEmptyList = function () {
-    return this.u3d_1.castToEmptyList();
+    return this.x3d_1.castToEmptyList();
   };
   ProbTerm.prototype.castToFact = function () {
-    return this.u3d_1.castToFact();
+    return this.x3d_1.castToFact();
   };
   ProbTerm.prototype.castToIndicator = function () {
-    return this.u3d_1.castToIndicator();
+    return this.x3d_1.castToIndicator();
   };
   ProbTerm.prototype.castToInteger = function () {
-    return this.u3d_1.castToInteger();
+    return this.x3d_1.castToInteger();
   };
   ProbTerm.prototype.castToList = function () {
-    return this.u3d_1.castToList();
+    return this.x3d_1.castToList();
   };
   ProbTerm.prototype.castToNumeric = function () {
-    return this.u3d_1.castToNumeric();
+    return this.x3d_1.castToNumeric();
   };
   ProbTerm.prototype.castToReal = function () {
-    return this.u3d_1.castToReal();
+    return this.x3d_1.castToReal();
   };
   ProbTerm.prototype.castToRecursive = function () {
-    return this.u3d_1.castToRecursive();
+    return this.x3d_1.castToRecursive();
   };
   ProbTerm.prototype.castToRule = function () {
-    return this.u3d_1.castToRule();
+    return this.x3d_1.castToRule();
   };
   ProbTerm.prototype.castToStruct = function () {
-    return this.u3d_1.castToStruct();
+    return this.x3d_1.castToStruct();
   };
   ProbTerm.prototype.castToTerm = function () {
-    return this.u3d_1.castToTerm();
+    return this.x3d_1.castToTerm();
   };
   ProbTerm.prototype.castToTruth = function () {
-    return this.u3d_1.castToTruth();
+    return this.x3d_1.castToTruth();
   };
   ProbTerm.prototype.castToTuple = function () {
-    return this.u3d_1.castToTuple();
+    return this.x3d_1.castToTuple();
   };
   ProbTerm.prototype.castToVar = function () {
-    return this.u3d_1.castToVar();
+    return this.x3d_1.castToVar();
   };
   ProbTerm.prototype.containsTag = function (name) {
-    return this.u3d_1.containsTag(name);
+    return this.x3d_1.containsTag(name);
   };
   ProbTerm.prototype.equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.u3d_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.x3d_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   ProbTerm.prototype.getTag = function (name) {
-    return this.u3d_1.getTag(name);
+    return this.x3d_1.getTag(name);
   };
   ProbTerm.prototype.resetTags = function (tags) {
-    return this.u3d_1.resetTags(tags);
+    return this.x3d_1.resetTags(tags);
   };
   ProbTerm.prototype.structurallyEquals = function (other) {
-    return this.u3d_1.structurallyEquals(other);
+    return this.x3d_1.structurallyEquals(other);
   };
   ProbTerm.prototype.iw = function () {
-    var termCopy = this.s3d_1.freshCopy();
+    var termCopy = this.v3d_1.freshCopy();
     var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp0_map = this.t3d_1;
+    var tmp0_map = this.w3d_1;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
@@ -1454,16 +1454,16 @@
     }
     tmp$ret$1 = tmp0_mapTo;
     tmp$ret$2 = tmp$ret$1;
-    return new ProbTerm(this.q3d_1, this.r3d_1, termCopy, toSet(tmp$ret$2));
+    return new ProbTerm(this.t3d_1, this.u3d_1, termCopy, toSet(tmp$ret$2));
   };
   ProbTerm.prototype.freshCopy = function () {
     return this.iw();
   };
   ProbTerm.prototype.jw = function (scope) {
-    var termCopy = this.s3d_1.freshCopyFromScope(scope);
+    var termCopy = this.v3d_1.freshCopyFromScope(scope);
     var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp0_map = this.t3d_1;
+    var tmp0_map = this.w3d_1;
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
@@ -1477,22 +1477,22 @@
     }
     tmp$ret$1 = tmp0_mapTo;
     tmp$ret$2 = tmp$ret$1;
-    return new ProbTerm(this.q3d_1, this.r3d_1, termCopy, toSet(tmp$ret$2));
+    return new ProbTerm(this.t3d_1, this.u3d_1, termCopy, toSet(tmp$ret$2));
   };
   ProbTerm.prototype.freshCopyFromScope = function (scope) {
     return this.jw(scope);
   };
-  ProbTerm.prototype.b2p = function (substitution, substitutions) {
-    return this.c2p(substitution, substitutions.slice());
+  ProbTerm.prototype.e2p = function (substitution, substitutions) {
+    return this.f2p(substitution, substitutions.slice());
   };
   ProbTerm.prototype.getSubstituted = function (substitution, substitutions) {
-    return this.b2p(substitution, substitutions);
+    return this.e2p(substitution, substitutions);
   };
-  ProbTerm.prototype.c2p = function (substitution, substitutions) {
+  ProbTerm.prototype.f2p = function (substitution, substitutions) {
     return this.s16(Companion_getInstance_9().ofSubstitution(substitution, substitutions.slice()));
   };
   ProbTerm.prototype.apply = function (substitution, substitutions) {
-    return this.c2p(substitution, substitutions);
+    return this.f2p(substitution, substitutions);
   };
   ProbTerm.prototype.s16 = function (substitution) {
     var tmp;
@@ -1503,7 +1503,7 @@
       var tmp$ret$0;
       $l$block_0: {
         // Inline function 'kotlin.collections.any' call
-        var tmp0_any = this.t3d_1;
+        var tmp0_any = this.w3d_1;
         var tmp_1;
         if (isInterface(tmp0_any, Collection)) {
           tmp_1 = tmp0_any.d();
@@ -1528,11 +1528,11 @@
         tmp$ret$0 = false;
       }
       if (!tmp$ret$0) {
-        tmp_0 = this.t3d_1;
+        tmp_0 = this.w3d_1;
       } else {
         var tmp$ret$5;
         // Inline function 'kotlin.collections.mapNotNull' call
-        var tmp1_mapNotNull = this.t3d_1;
+        var tmp1_mapNotNull = this.w3d_1;
         var tmp$ret$4;
         // Inline function 'kotlin.collections.mapNotNullTo' call
         var tmp0_mapNotNullTo = ArrayList_init_$Create$_0();
@@ -1560,7 +1560,7 @@
         tmp_0 = toSet(tmp$ret$5);
       }
       var newExtraVars = tmp_0;
-      tmp = new ProbTerm(this.q3d_1, this.r3d_1, this.s3d_1.applySubstitution(substitution), newExtraVars);
+      tmp = new ProbTerm(this.t3d_1, this.u3d_1, this.v3d_1.applySubstitution(substitution), newExtraVars);
     }
     return tmp;
   };
@@ -1571,23 +1571,23 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = isGround$factory();
-    tmp$ret$0 = this.v3d_1.b1();
+    tmp$ret$0 = this.y3d_1.b1();
     return tmp$ret$0;
   };
   ProbTerm.prototype.ax = function (other) {
     if (!(other instanceof ProbTerm)) {
       return compareTo.call(this, other);
     }
-    var res = this.q3d_1.jd(other.q3d_1);
+    var res = this.t3d_1.jd(other.t3d_1);
     if (!(res === 0))
       return res;
-    res = this.s3d_1.ax(other.s3d_1);
+    res = this.v3d_1.ax(other.v3d_1);
     if (!(res === 0))
       return res;
-    res = equals(this.t3d_1, other.t3d_1) ? 0 : -1;
+    res = equals(this.w3d_1, other.w3d_1) ? 0 : -1;
     if (!(res === 0))
       return res;
-    res = compareTo_0(this.r3d_1, other.r3d_1);
+    res = compareTo_0(this.u3d_1, other.u3d_1);
     return res;
   };
   ProbTerm.prototype.aa = function (other) {
@@ -1606,7 +1606,7 @@
     return _get_cachedHashCode__d7x0zy(this);
   };
   ProbTerm.prototype.toString = function () {
-    return '' + round(this.r3d_1 * 100) / 100.0 + '::' + this.s3d_1;
+    return '' + round(this.u3d_1 * 100) / 100.0 + '::' + this.v3d_1;
   };
   function isGround$factory() {
     return getPropertyCallableRef('isGround', 1, KProperty1, function (receiver) {
@@ -1729,7 +1729,7 @@
   function AnnotatedDisjunctionClauseMapper() {
     AnnotatedDisjunctionClauseMapper_instance = this;
   }
-  AnnotatedDisjunctionClauseMapper.prototype.a3e = function (clause) {
+  AnnotatedDisjunctionClauseMapper.prototype.d3e = function (clause) {
     var tmp;
     if (isInterface(clause, Rule)) {
       var tmp_0 = clause.ly().fw();
@@ -1740,7 +1740,7 @@
     }
     return tmp;
   };
-  AnnotatedDisjunctionClauseMapper.prototype.b3e = function (clause) {
+  AnnotatedDisjunctionClauseMapper.prototype.e3e = function (clause) {
     if (!isInterface(clause, Rule)) {
       var tmp = 'Clause is not an instance of Rule: ' + clause;
       throw ClauseMappingException_init_$Create$(tmp, null, 2, null);
@@ -1774,13 +1774,13 @@
       }
       var curRuleHead = tmp_1;
       probSum = probSum + curProb;
-      tmp$ret$1 = ProbabilisticClauseMapper_getInstance().c3e(Companion_getInstance_12().of(Companion_getInstance_3().of(get_ANNOTATION_FUNCTOR(), [Companion_getInstance_10().ofDouble(curProb / (1.0 - (probSum - curProb))), curRuleHead]), [body]));
+      tmp$ret$1 = ProbabilisticClauseMapper_getInstance().f3e(Companion_getInstance_12().of(Companion_getInstance_3().of(get_ANNOTATION_FUNCTOR(), [Companion_getInstance_10().ofDouble(curProb / (1.0 - (probSum - curProb))), curRuleHead]), [body]));
       tmp0_mapTo.g(tmp$ret$1);
     }
     tmp$ret$2 = tmp0_mapTo;
     tmp$ret$3 = tmp$ret$2;
     var mappedRules = toList_0(tmp$ret$3);
-    var explanation = Companion_getInstance_21().l3d_1;
+    var explanation = Companion_getInstance_21().o3d_1;
     var tmp$ret$6;
     // Inline function 'kotlin.collections.map' call
     var tmp$ret$5;
@@ -1791,10 +1791,10 @@
       var item_0 = tmp0_iterator_0.p();
       var tmp$ret$4;
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.AnnotatedDisjunctionClauseMapper.apply.<anonymous>' call
-      var thisExplanation = Companion_getInstance_21().p3d(item_0.h4_1);
+      var thisExplanation = Companion_getInstance_21().s3d(item_0.h4_1);
       var resultExplanation = thisExplanation.and(explanation);
       explanation = explanation.and(thisExplanation.not());
-      tmp$ret$4 = ProbabilisticClauseMapper_getInstance().d3e(item_0.g4_1, resultExplanation);
+      tmp$ret$4 = ProbabilisticClauseMapper_getInstance().g3e(item_0.g4_1, resultExplanation);
       tmp0_mapTo_0.g(tmp$ret$4);
     }
     tmp$ret$5 = tmp0_mapTo_0;
@@ -1809,7 +1809,7 @@
   }
   function BinaryDecisionDiagramExplanation_init_$Init$(diagram, computedValue, $mask0, $marker, $this) {
     if (!(($mask0 & 2) === 0))
-      computedValue = Companion_getInstance_23().m3d_1;
+      computedValue = Companion_getInstance_23().p3d_1;
     BinaryDecisionDiagramExplanation.call($this, diagram, computedValue);
     return $this;
   }
@@ -1817,13 +1817,13 @@
     return BinaryDecisionDiagramExplanation_init_$Init$(diagram, computedValue, $mask0, $marker, Object.create(BinaryDecisionDiagramExplanation.prototype));
   }
   function ComputedValue(probability) {
-    this.e3e_1 = probability;
+    this.h3e_1 = probability;
   }
   ComputedValue.prototype.toString = function () {
-    return 'ComputedValue(probability=' + this.e3e_1 + ')';
+    return 'ComputedValue(probability=' + this.h3e_1 + ')';
   };
   ComputedValue.prototype.hashCode = function () {
-    return this.e3e_1 == null ? 0 : getNumberHashCode(this.e3e_1);
+    return this.h3e_1 == null ? 0 : getNumberHashCode(this.h3e_1);
   };
   ComputedValue.prototype.equals = function (other) {
     if (this === other)
@@ -1831,15 +1831,15 @@
     if (!(other instanceof ComputedValue))
       return false;
     var tmp0_other_with_cast = other instanceof ComputedValue ? other : THROW_CCE();
-    if (!equals(this.e3e_1, tmp0_other_with_cast.e3e_1))
+    if (!equals(this.h3e_1, tmp0_other_with_cast.h3e_1))
       return false;
     return true;
   };
   function Companion_2() {
     Companion_instance_2 = this;
-    this.m3d_1 = new ComputedValue(null);
-    this.n3d_1 = new ComputedValue(0.0);
-    this.o3d_1 = new ComputedValue(1.0);
+    this.p3d_1 = new ComputedValue(null);
+    this.q3d_1 = new ComputedValue(0.0);
+    this.r3d_1 = new ComputedValue(1.0);
   }
   var Companion_instance_2;
   function Companion_getInstance_23() {
@@ -1855,8 +1855,8 @@
   }
   function computeExpansion($this, value, low, high) {
     var tmp;
-    if (!(low.e3e_1 == null) ? !(high.e3e_1 == null) : false) {
-      tmp = value.r3d_1 * high.e3e_1 + (1.0 - value.r3d_1) * low.e3e_1;
+    if (!(low.h3e_1 == null) ? !(high.h3e_1 == null) : false) {
+      tmp = value.u3d_1 * high.h3e_1 + (1.0 - value.u3d_1) * low.h3e_1;
     } else {
       tmp = null;
     }
@@ -1866,7 +1866,7 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = cachedNot$factory();
-    tmp$ret$0 = $this.l3c_1.b1();
+    tmp$ret$0 = $this.o3c_1.b1();
     return tmp$ret$0;
   }
   function BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda$lambda(this$0) {
@@ -1876,9 +1876,9 @@
   }
   function BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda(this$0) {
     return function () {
-      var tmp = Companion_getInstance_23().n3d_1;
-      var tmp_0 = Companion_getInstance_23().o3d_1;
-      var result = notThenExpansion(this$0.j3c_1, tmp, tmp_0, BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda$lambda(this$0));
+      var tmp = Companion_getInstance_23().q3d_1;
+      var tmp_0 = Companion_getInstance_23().r3d_1;
+      var result = notThenExpansion(this$0.m3c_1, tmp, tmp_0, BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda$lambda(this$0));
       return new BinaryDecisionDiagramExplanation(result.g4_1, result.h4_1);
     };
   }
@@ -1893,14 +1893,14 @@
     };
   }
   function BinaryDecisionDiagramExplanation$probability$delegate$lambda$lambda(node, low, high) {
-    return node.r3d_1 * high + (1.0 - node.r3d_1) * low;
+    return node.u3d_1 * high + (1.0 - node.u3d_1) * low;
   }
   function BinaryDecisionDiagramExplanation$probability$delegate$lambda(this$0) {
     return function () {
-      var tmp0_elvis_lhs = this$0.k3c_1.e3e_1;
+      var tmp0_elvis_lhs = this$0.n3c_1.h3e_1;
       var tmp;
       if (tmp0_elvis_lhs == null) {
-        tmp = expansion(this$0.j3c_1, 0.0, 1.0, BinaryDecisionDiagramExplanation$probability$delegate$lambda$lambda);
+        tmp = expansion(this$0.m3c_1, 0.0, 1.0, BinaryDecisionDiagramExplanation$probability$delegate$lambda$lambda);
       } else {
         tmp = tmp0_elvis_lhs;
       }
@@ -1912,7 +1912,7 @@
   }
   function BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda(this$0) {
     return function () {
-      return anyWhere(this$0.j3c_1, BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda$lambda);
+      return anyWhere(this$0.m3c_1, BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda$lambda);
     };
   }
   function BinaryDecisionDiagramExplanation$apply$lambda($transformation) {
@@ -1922,64 +1922,64 @@
   }
   function BinaryDecisionDiagramExplanation(diagram, computedValue) {
     Companion_getInstance_23();
-    this.j3c_1 = diagram;
-    this.k3c_1 = computedValue;
+    this.m3c_1 = diagram;
+    this.n3c_1 = computedValue;
     var tmp = this;
-    tmp.l3c_1 = lazy(BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda(this));
+    tmp.o3c_1 = lazy(BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.m3c_1 = lazy(BinaryDecisionDiagramExplanation$probability$delegate$lambda(this));
+    tmp_0.p3c_1 = lazy(BinaryDecisionDiagramExplanation$probability$delegate$lambda(this));
     var tmp_1 = this;
-    tmp_1.n3c_1 = lazy(BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda(this));
+    tmp_1.q3c_1 = lazy(BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda(this));
   }
-  BinaryDecisionDiagramExplanation.prototype.f3e = function () {
+  BinaryDecisionDiagramExplanation.prototype.i3e = function () {
     return _get_cachedNot__l38068(this);
   };
   BinaryDecisionDiagramExplanation.prototype.not = function () {
-    return this.f3e();
+    return this.i3e();
   };
-  BinaryDecisionDiagramExplanation.prototype.g3e = function (that) {
-    var tmp = getAsInternal(this, that).j3c_1;
-    var tmp_0 = Companion_getInstance_23().n3d_1;
-    var tmp_1 = Companion_getInstance_23().o3d_1;
-    var result = andThenExpansion(this.j3c_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$and$lambda(this));
+  BinaryDecisionDiagramExplanation.prototype.j3e = function (that) {
+    var tmp = getAsInternal(this, that).m3c_1;
+    var tmp_0 = Companion_getInstance_23().q3d_1;
+    var tmp_1 = Companion_getInstance_23().r3d_1;
+    var result = andThenExpansion(this.m3c_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$and$lambda(this));
     return new BinaryDecisionDiagramExplanation(result.g4_1, result.h4_1);
   };
   BinaryDecisionDiagramExplanation.prototype.and = function (that) {
-    return this.g3e(that);
+    return this.j3e(that);
   };
-  BinaryDecisionDiagramExplanation.prototype.h3e = function (that) {
-    var tmp = getAsInternal(this, that).j3c_1;
-    var tmp_0 = Companion_getInstance_23().n3d_1;
-    var tmp_1 = Companion_getInstance_23().o3d_1;
-    var result = orThenExpansion(this.j3c_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$or$lambda(this));
+  BinaryDecisionDiagramExplanation.prototype.k3e = function (that) {
+    var tmp = getAsInternal(this, that).m3c_1;
+    var tmp_0 = Companion_getInstance_23().q3d_1;
+    var tmp_1 = Companion_getInstance_23().r3d_1;
+    var result = orThenExpansion(this.m3c_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$or$lambda(this));
     return new BinaryDecisionDiagramExplanation(result.g4_1, result.h4_1);
   };
   BinaryDecisionDiagramExplanation.prototype.or = function (that) {
-    return this.h3e(that);
+    return this.k3e(that);
   };
-  BinaryDecisionDiagramExplanation.prototype.x3d = function () {
+  BinaryDecisionDiagramExplanation.prototype.a3e = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = probability$factory();
-    tmp$ret$0 = this.m3c_1.b1();
+    tmp$ret$0 = this.p3c_1.b1();
     return tmp$ret$0;
   };
-  BinaryDecisionDiagramExplanation.prototype.z3d = function () {
+  BinaryDecisionDiagramExplanation.prototype.c3e = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = containsAnyNotGroundTerm$factory();
-    tmp$ret$0 = this.n3c_1.b1();
+    tmp$ret$0 = this.q3c_1.b1();
     return tmp$ret$0;
   };
   BinaryDecisionDiagramExplanation.prototype.toString = function () {
-    return 'bdd:' + hashCode(this.j3c_1);
+    return 'bdd:' + hashCode(this.m3c_1);
   };
-  BinaryDecisionDiagramExplanation.prototype.i3e = function (transformation) {
-    var tmp = map_0(this.j3c_1, BinaryDecisionDiagramExplanation$apply$lambda(transformation));
+  BinaryDecisionDiagramExplanation.prototype.l3e = function (transformation) {
+    var tmp = map_0(this.m3c_1, BinaryDecisionDiagramExplanation$apply$lambda(transformation));
     return BinaryDecisionDiagramExplanation_init_$Create$(tmp, null, 2, null);
   };
   BinaryDecisionDiagramExplanation.prototype.applyTransformation = function (transformation) {
-    return this.i3e(transformation);
+    return this.l3e(transformation);
   };
   function cachedNot$factory() {
     return getPropertyCallableRef('cachedNot', 1, KProperty1, function (receiver) {
@@ -1988,12 +1988,12 @@
   }
   function probability$factory() {
     return getPropertyCallableRef('probability', 1, KProperty1, function (receiver) {
-      return receiver.x3d();
+      return receiver.a3e();
     }, null);
   }
   function containsAnyNotGroundTerm$factory() {
     return getPropertyCallableRef('containsAnyNotGroundTerm', 1, KProperty1, function (receiver) {
-      return receiver.z3d();
+      return receiver.c3e();
     }, null);
   }
   function get_nonWrappableFunctors() {
@@ -2003,16 +2003,16 @@
   var nonWrappableFunctors;
   function ClauseMappingUtils() {
     ClauseMappingUtils_instance = this;
-    this.j3e_1 = new Long(1, 0);
-    this.k3e_1 = listOf_0([DirectiveClauseMapper_getInstance(), AnnotatedDisjunctionClauseMapper_getInstance(), ProbabilisticClauseMapper_getInstance(), EvidenceClauseMapper_getInstance(), PrologClauseMapper_getInstance(), NothingClauseMapper_getInstance()]);
+    this.m3e_1 = new Long(1, 0);
+    this.n3e_1 = listOf_0([DirectiveClauseMapper_getInstance(), AnnotatedDisjunctionClauseMapper_getInstance(), ProbabilisticClauseMapper_getInstance(), EvidenceClauseMapper_getInstance(), PrologClauseMapper_getInstance(), NothingClauseMapper_getInstance()]);
   }
-  ClauseMappingUtils.prototype.l3e = function () {
+  ClauseMappingUtils.prototype.o3e = function () {
     var tmp0_this = this;
-    var tmp1 = tmp0_this.j3e_1;
-    tmp0_this.j3e_1 = tmp1.gh();
+    var tmp1 = tmp0_this.m3e_1;
+    tmp0_this.m3e_1 = tmp1.gh();
     return tmp1;
   };
-  ClauseMappingUtils.prototype.m3e = function (clause) {
+  ClauseMappingUtils.prototype.p3e = function (clause) {
     var tmp;
     if (get_isMappedAsProblog(clause)) {
       tmp = listOf(clause);
@@ -2022,13 +2022,13 @@
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.collections.first' call
-        var tmp0_first = this.k3e_1;
+        var tmp0_first = this.n3e_1;
         var tmp0_iterator = tmp0_first.j();
         while (tmp0_iterator.m()) {
           var element = tmp0_iterator.p();
           var tmp$ret$0;
           // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.ClauseMappingUtils.map.<anonymous>' call
-          tmp$ret$0 = element.a3e(clause);
+          tmp$ret$0 = element.d3e(clause);
           if (tmp$ret$0) {
             tmp$ret$1 = element;
             break $l$block;
@@ -2036,7 +2036,7 @@
         }
         throw NoSuchElementException_init_$Create$('Collection contains no element matching the predicate.');
       }
-      var tmp1_map = tmp$ret$1.b3e(clause);
+      var tmp1_map = tmp$ret$1.e3e(clause);
       var tmp$ret$3;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp1_map, 10));
@@ -2054,7 +2054,7 @@
     }
     return tmp;
   };
-  ClauseMappingUtils.prototype.n3e = function (indicator) {
+  ClauseMappingUtils.prototype.q3e = function (indicator) {
     var arityTerm = indicator.o10();
     var tmp = Companion_getInstance_13();
     var tmp_0 = indicator.n10();
@@ -2175,7 +2175,7 @@
   }
   function withExplanationNonWrappable(_this__u8e3s4, explanation) {
     init_properties_ClauseMappingUtils_kt_i29ma0();
-    return Companion_getInstance_2().of(_this__u8e3s4, Companion_getInstance_3().of('=', [explanation, toTerm(Companion_getInstance_21().l3d_1)]));
+    return Companion_getInstance_2().of(_this__u8e3s4, Companion_getInstance_3().of('=', [explanation, toTerm(Companion_getInstance_21().o3d_1)]));
   }
   function wrapInPredicate(_this__u8e3s4, functor, explanation) {
     init_properties_ClauseMappingUtils_kt_i29ma0();
@@ -2297,10 +2297,10 @@
   function DirectiveClauseMapper() {
     DirectiveClauseMapper_instance = this;
   }
-  DirectiveClauseMapper.prototype.a3e = function (clause) {
+  DirectiveClauseMapper.prototype.d3e = function (clause) {
     return clause.ow();
   };
-  DirectiveClauseMapper.prototype.b3e = function (clause) {
+  DirectiveClauseMapper.prototype.e3e = function (clause) {
     var body = clause.my();
     if (!isInterface(clause, Directive)) {
       var tmp = 'Clause is not an instance of Directive: ' + clause;
@@ -2346,7 +2346,7 @@
   function EvidenceClauseMapper() {
     EvidenceClauseMapper_instance = this;
   }
-  EvidenceClauseMapper.prototype.a3e = function (clause) {
+  EvidenceClauseMapper.prototype.d3e = function (clause) {
     var tmp;
     if (isInterface(clause, Rule)) {
       var tmp_0 = clause.ly().fw();
@@ -2357,7 +2357,7 @@
     }
     return tmp;
   };
-  EvidenceClauseMapper.prototype.b3e = function (clause) {
+  EvidenceClauseMapper.prototype.e3e = function (clause) {
     if (!isInterface(clause, Rule)) {
       var tmp = 'Clause is not an instance of Rule: ' + clause;
       throw ClauseMappingException_init_$Create$(tmp, null, 2, null);
@@ -2417,7 +2417,7 @@
           var tmp$ret$0;
           var tmp$ret$0_0;
           // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedMutableProblogTheory.<init>.<anonymous>' call
-          tmp$ret$0 = ClauseMappingUtils_getInstance().m3e(element);
+          tmp$ret$0 = ClauseMappingUtils_getInstance().p3e(element);
           tmp$ret$0_0 = Unit_getInstance();
           var list = tmp$ret$0;
           addAll(tmp0_flatMapTo, list);
@@ -2438,79 +2438,79 @@
     return MappedMutableProblogTheory_init_$Init$(clauses, unificator, theory, $mask0, $marker, Object.create(MappedMutableProblogTheory.prototype));
   }
   function MappedMutableProblogTheory(clauses, unificator, theory) {
-    this.o3e_1 = theory;
+    this.r3e_1 = theory;
   }
   MappedMutableProblogTheory.prototype.t1l = function () {
-    return this.o3e_1.t1l();
+    return this.r3e_1.t1l();
   };
   MappedMutableProblogTheory.prototype.m1l = function () {
-    return this.o3e_1.m1l();
+    return this.r3e_1.m1l();
   };
   MappedMutableProblogTheory.prototype.o1l = function () {
-    return this.o3e_1.o1l();
+    return this.r3e_1.o1l();
   };
   MappedMutableProblogTheory.prototype.k1s = function () {
-    return this.o3e_1.k1s();
+    return this.r3e_1.k1s();
   };
   MappedMutableProblogTheory.prototype.o = function () {
-    return this.o3e_1.o();
+    return this.r3e_1.o();
   };
   MappedMutableProblogTheory.prototype.kt = function () {
-    return this.o3e_1.kt();
+    return this.r3e_1.kt();
   };
   MappedMutableProblogTheory.prototype.k1l = function () {
-    return this.o3e_1.k1l();
+    return this.r3e_1.k1l();
   };
   MappedMutableProblogTheory.prototype.z1s = function () {
-    return this.o3e_1.z1s();
+    return this.r3e_1.z1s();
   };
   MappedMutableProblogTheory.prototype.clone = function () {
     return this.z1s();
   };
   MappedMutableProblogTheory.prototype.contains = function (clause) {
-    return this.o3e_1.contains(clause);
+    return this.r3e_1.contains(clause);
   };
   MappedMutableProblogTheory.prototype.containsIndicator = function (indicator) {
-    return this.o3e_1.containsIndicator(indicator);
+    return this.r3e_1.containsIndicator(indicator);
   };
   MappedMutableProblogTheory.prototype.containsHead = function (head) {
-    return this.o3e_1.containsHead(head);
+    return this.r3e_1.containsHead(head);
   };
   MappedMutableProblogTheory.prototype.containsTag = function (name) {
-    return this.o3e_1.containsTag(name);
+    return this.r3e_1.containsTag(name);
   };
   MappedMutableProblogTheory.prototype.equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.o3e_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.r3e_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   MappedMutableProblogTheory.prototype.get = function (clause) {
-    return this.o3e_1.get(clause);
+    return this.r3e_1.get(clause);
   };
   MappedMutableProblogTheory.prototype.getByIndicator = function (indicator) {
-    return this.o3e_1.getByIndicator(indicator);
+    return this.r3e_1.getByIndicator(indicator);
   };
   MappedMutableProblogTheory.prototype.getByHead = function (head) {
-    return this.o3e_1.getByHead(head);
+    return this.r3e_1.getByHead(head);
   };
   MappedMutableProblogTheory.prototype.getTag = function (name) {
-    return this.o3e_1.getTag(name);
+    return this.r3e_1.getTag(name);
   };
   MappedMutableProblogTheory.prototype.j = function () {
-    return this.o3e_1.j();
+    return this.r3e_1.j();
   };
   MappedMutableProblogTheory.prototype.o12 = function (tags) {
-    return this.o3e_1.o12(tags);
+    return this.r3e_1.o12(tags);
   };
   MappedMutableProblogTheory.prototype.resetTags = function (tags) {
     return this.o12(tags);
   };
   MappedMutableProblogTheory.prototype.l1s = function (unificator) {
-    return this.o3e_1.l1s(unificator);
+    return this.r3e_1.l1s(unificator);
   };
   MappedMutableProblogTheory.prototype.setUnificator = function (unificator) {
     return this.l1s(unificator);
   };
   MappedMutableProblogTheory.prototype.toStringAsProlog = function (asPrologText) {
-    return this.o3e_1.toStringAsProlog(asPrologText);
+    return this.r3e_1.toStringAsProlog(asPrologText);
   };
   MappedMutableProblogTheory.prototype.a1t = function () {
     return false;
@@ -2527,17 +2527,17 @@
   MappedMutableProblogTheory.prototype.toImmutableTheory = function () {
     return this.a1s();
   };
-  MappedMutableProblogTheory.prototype.p3e = function (theory) {
-    return new MappedMutableProblogTheory(null, this.k1l(), this.o3e_1.n1s(theory));
+  MappedMutableProblogTheory.prototype.s3e = function (theory) {
+    return new MappedMutableProblogTheory(null, this.k1l(), this.r3e_1.n1s(theory));
   };
   MappedMutableProblogTheory.prototype.n1s = function (theory) {
     var tmp0_subject = theory;
     var tmp;
     if (isInterface(tmp0_subject, ProblogTheory)) {
-      tmp = this.p3e(theory);
+      tmp = this.s3e(theory);
     } else {
       var tmp_0 = this.k1l();
-      tmp = this.p3e(MappedMutableProblogTheory_init_$Create$(theory, tmp_0, null, 4, null));
+      tmp = this.s3e(MappedMutableProblogTheory_init_$Create$(theory, tmp_0, null, 4, null));
     }
     return tmp;
   };
@@ -2545,8 +2545,8 @@
     return this.n1s(theory);
   };
   MappedMutableProblogTheory.prototype.b1s = function (clause) {
-    var mapped = ClauseMappingUtils_getInstance().m3e(clause);
-    return new MappedMutableProblogTheory(null, this.k1l(), this.o3e_1.n1s(Companion_getInstance_18().indexedOfIterable(this.k1l(), mapped)));
+    var mapped = ClauseMappingUtils_getInstance().p3e(clause);
+    return new MappedMutableProblogTheory(null, this.k1l(), this.r3e_1.n1s(Companion_getInstance_18().indexedOfIterable(this.k1l(), mapped)));
   };
   MappedMutableProblogTheory.prototype.plus = function (clause) {
     return this.b1s(clause);
@@ -2562,14 +2562,14 @@
       var element = tmp0_iterator.p();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedMutableProblogTheory.assertA.<anonymous>' call
-      tmp$ret$0 = ClauseMappingUtils_getInstance().m3e(element);
+      tmp$ret$0 = ClauseMappingUtils_getInstance().p3e(element);
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
     tmp$ret$1 = tmp0_flatMapTo;
     tmp$ret$2 = tmp$ret$1;
     var mapped = tmp$ret$2;
-    return new MappedMutableProblogTheory(null, this.k1l(), this.o3e_1.r1s(mapped));
+    return new MappedMutableProblogTheory(null, this.k1l(), this.r3e_1.r1s(mapped));
   };
   MappedMutableProblogTheory.prototype.assertAIterable = function (clauses) {
     return this.r1s(clauses);
@@ -2585,14 +2585,14 @@
       var element = tmp0_iterator.p();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedMutableProblogTheory.assertZ.<anonymous>' call
-      tmp$ret$0 = ClauseMappingUtils_getInstance().m3e(element);
+      tmp$ret$0 = ClauseMappingUtils_getInstance().p3e(element);
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
     tmp$ret$1 = tmp0_flatMapTo;
     tmp$ret$2 = tmp$ret$1;
     var mapped = tmp$ret$2;
-    return new MappedMutableProblogTheory(null, this.k1l(), this.o3e_1.u1s(mapped));
+    return new MappedMutableProblogTheory(null, this.k1l(), this.r3e_1.u1s(mapped));
   };
   MappedMutableProblogTheory.prototype.assertZIterable = function (clauses) {
     return this.u1s(clauses);
@@ -2608,14 +2608,14 @@
       var element = tmp0_iterator.p();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedMutableProblogTheory.retract.<anonymous>' call
-      tmp$ret$0 = ClauseMappingUtils_getInstance().m3e(element);
+      tmp$ret$0 = ClauseMappingUtils_getInstance().p3e(element);
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
     tmp$ret$1 = tmp0_flatMapTo;
     tmp$ret$2 = tmp$ret$1;
     var mapped = tmp$ret$2;
-    var result = this.o3e_1.y1s(mapped);
+    var result = this.r3e_1.y1s(mapped);
     var tmp;
     if (result instanceof Success) {
       tmp = new Success(new MappedMutableProblogTheory(null, this.k1l(), result.h1s()), result.i1t_1);
@@ -2628,7 +2628,7 @@
     return this.y1s(clauses);
   };
   MappedMutableProblogTheory.prototype.c1m = function (clause) {
-    var mappedClauses = ClauseMappingUtils_getInstance().m3e(clause);
+    var mappedClauses = ClauseMappingUtils_getInstance().p3e(clause);
     var result = null;
     var tmp0_iterator = mappedClauses.j();
     while (tmp0_iterator.m()) {
@@ -2640,7 +2640,7 @@
         tmp = !(result instanceof Failure);
       }
       if (tmp) {
-        result = this.o3e_1.c1m(c);
+        result = this.r3e_1.c1m(c);
       }
     }
     var tmp1_subject = result;
@@ -2660,7 +2660,7 @@
     return this.c1m(clause);
   };
   MappedMutableProblogTheory.prototype.g1s = function (indicator) {
-    return new MappedMutableProblogTheory(null, this.k1l(), this.o3e_1.g1s(ClauseMappingUtils_getInstance().n3e(indicator)));
+    return new MappedMutableProblogTheory(null, this.k1l(), this.r3e_1.g1s(ClauseMappingUtils_getInstance().q3e(indicator)));
   };
   MappedMutableProblogTheory.prototype.abolish = function (indicator) {
     return this.g1s(indicator);
@@ -2748,7 +2748,7 @@
           var tmp$ret$0;
           var tmp$ret$0_0;
           // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedProblogTheory.<init>.<anonymous>' call
-          tmp$ret$0 = ClauseMappingUtils_getInstance().m3e(element);
+          tmp$ret$0 = ClauseMappingUtils_getInstance().p3e(element);
           tmp$ret$0_0 = Unit_getInstance();
           var list = tmp$ret$0;
           addAll(tmp0_flatMapTo, list);
@@ -2769,70 +2769,70 @@
     return MappedProblogTheory_init_$Init$(clauses, unificator, theory, $mask0, $marker, Object.create(MappedProblogTheory.prototype));
   }
   function MappedProblogTheory(clauses, unificator, theory) {
-    this.q3e_1 = theory;
+    this.t3e_1 = theory;
   }
   MappedProblogTheory.prototype.t1l = function () {
-    return this.q3e_1.t1l();
+    return this.t3e_1.t1l();
   };
   MappedProblogTheory.prototype.m1l = function () {
-    return this.q3e_1.m1l();
+    return this.t3e_1.m1l();
   };
   MappedProblogTheory.prototype.o1l = function () {
-    return this.q3e_1.o1l();
+    return this.t3e_1.o1l();
   };
   MappedProblogTheory.prototype.k1s = function () {
-    return this.q3e_1.k1s();
+    return this.t3e_1.k1s();
   };
   MappedProblogTheory.prototype.o = function () {
-    return this.q3e_1.o();
+    return this.t3e_1.o();
   };
   MappedProblogTheory.prototype.kt = function () {
-    return this.q3e_1.kt();
+    return this.t3e_1.kt();
   };
   MappedProblogTheory.prototype.k1l = function () {
-    return this.q3e_1.k1l();
+    return this.t3e_1.k1l();
   };
   MappedProblogTheory.prototype.clone = function () {
-    return this.q3e_1.clone();
+    return this.t3e_1.clone();
   };
   MappedProblogTheory.prototype.contains = function (clause) {
-    return this.q3e_1.contains(clause);
+    return this.t3e_1.contains(clause);
   };
   MappedProblogTheory.prototype.containsIndicator = function (indicator) {
-    return this.q3e_1.containsIndicator(indicator);
+    return this.t3e_1.containsIndicator(indicator);
   };
   MappedProblogTheory.prototype.containsHead = function (head) {
-    return this.q3e_1.containsHead(head);
+    return this.t3e_1.containsHead(head);
   };
   MappedProblogTheory.prototype.containsTag = function (name) {
-    return this.q3e_1.containsTag(name);
+    return this.t3e_1.containsTag(name);
   };
   MappedProblogTheory.prototype.equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.q3e_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.t3e_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   MappedProblogTheory.prototype.get = function (clause) {
-    return this.q3e_1.get(clause);
+    return this.t3e_1.get(clause);
   };
   MappedProblogTheory.prototype.getByIndicator = function (indicator) {
-    return this.q3e_1.getByIndicator(indicator);
+    return this.t3e_1.getByIndicator(indicator);
   };
   MappedProblogTheory.prototype.getByHead = function (head) {
-    return this.q3e_1.getByHead(head);
+    return this.t3e_1.getByHead(head);
   };
   MappedProblogTheory.prototype.getTag = function (name) {
-    return this.q3e_1.getTag(name);
+    return this.t3e_1.getTag(name);
   };
   MappedProblogTheory.prototype.j = function () {
-    return this.q3e_1.j();
+    return this.t3e_1.j();
   };
   MappedProblogTheory.prototype.resetTags = function (tags) {
-    return this.q3e_1.resetTags(tags);
+    return this.t3e_1.resetTags(tags);
   };
   MappedProblogTheory.prototype.setUnificator = function (unificator) {
-    return this.q3e_1.setUnificator(unificator);
+    return this.t3e_1.setUnificator(unificator);
   };
   MappedProblogTheory.prototype.toStringAsProlog = function (asPrologText) {
-    return this.q3e_1.toStringAsProlog(asPrologText);
+    return this.t3e_1.toStringAsProlog(asPrologText);
   };
   MappedProblogTheory.prototype.a1t = function () {
     return false;
@@ -2849,17 +2849,17 @@
   MappedProblogTheory.prototype.toImmutableTheory = function () {
     return this.a1s();
   };
-  MappedProblogTheory.prototype.p3e = function (theory) {
-    return new MappedProblogTheory(null, this.k1l(), this.q3e_1.plusTheory(theory));
+  MappedProblogTheory.prototype.s3e = function (theory) {
+    return new MappedProblogTheory(null, this.k1l(), this.t3e_1.plusTheory(theory));
   };
   MappedProblogTheory.prototype.n1s = function (theory) {
     var tmp0_subject = theory;
     var tmp;
     if (isInterface(tmp0_subject, ProblogTheory)) {
-      tmp = this.p3e(theory);
+      tmp = this.s3e(theory);
     } else {
       var tmp_0 = this.k1l();
-      tmp = this.p3e(MappedProblogTheory_init_$Create$(theory, tmp_0, null, 4, null));
+      tmp = this.s3e(MappedProblogTheory_init_$Create$(theory, tmp_0, null, 4, null));
     }
     return tmp;
   };
@@ -2867,8 +2867,8 @@
     return this.n1s(theory);
   };
   MappedProblogTheory.prototype.b1s = function (clause) {
-    var mapped = ClauseMappingUtils_getInstance().m3e(clause);
-    return new MappedProblogTheory(null, this.k1l(), this.q3e_1.plusTheory(Companion_getInstance_18().indexedOfIterable(this.k1l(), mapped)));
+    var mapped = ClauseMappingUtils_getInstance().p3e(clause);
+    return new MappedProblogTheory(null, this.k1l(), this.t3e_1.plusTheory(Companion_getInstance_18().indexedOfIterable(this.k1l(), mapped)));
   };
   MappedProblogTheory.prototype.plus = function (clause) {
     return this.b1s(clause);
@@ -2884,14 +2884,14 @@
       var element = tmp0_iterator.p();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedProblogTheory.assertA.<anonymous>' call
-      tmp$ret$0 = ClauseMappingUtils_getInstance().m3e(element);
+      tmp$ret$0 = ClauseMappingUtils_getInstance().p3e(element);
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
     tmp$ret$1 = tmp0_flatMapTo;
     tmp$ret$2 = tmp$ret$1;
     var mapped = tmp$ret$2;
-    return new MappedProblogTheory(null, this.k1l(), this.q3e_1.assertAIterable(mapped));
+    return new MappedProblogTheory(null, this.k1l(), this.t3e_1.assertAIterable(mapped));
   };
   MappedProblogTheory.prototype.assertAIterable = function (clauses) {
     return this.r1s(clauses);
@@ -2907,14 +2907,14 @@
       var element = tmp0_iterator.p();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedProblogTheory.assertZ.<anonymous>' call
-      tmp$ret$0 = ClauseMappingUtils_getInstance().m3e(element);
+      tmp$ret$0 = ClauseMappingUtils_getInstance().p3e(element);
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
     tmp$ret$1 = tmp0_flatMapTo;
     tmp$ret$2 = tmp$ret$1;
     var mapped = tmp$ret$2;
-    return new MappedProblogTheory(null, this.k1l(), this.q3e_1.assertZIterable(mapped));
+    return new MappedProblogTheory(null, this.k1l(), this.t3e_1.assertZIterable(mapped));
   };
   MappedProblogTheory.prototype.assertZIterable = function (clauses) {
     return this.u1s(clauses);
@@ -2930,14 +2930,14 @@
       var element = tmp0_iterator.p();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedProblogTheory.retract.<anonymous>' call
-      tmp$ret$0 = ClauseMappingUtils_getInstance().m3e(element);
+      tmp$ret$0 = ClauseMappingUtils_getInstance().p3e(element);
       var list = tmp$ret$0;
       addAll(tmp0_flatMapTo, list);
     }
     tmp$ret$1 = tmp0_flatMapTo;
     tmp$ret$2 = tmp$ret$1;
     var mapped = tmp$ret$2;
-    var result = this.q3e_1.retractIterable(mapped);
+    var result = this.t3e_1.retractIterable(mapped);
     var tmp;
     if (result instanceof Success) {
       tmp = new Success(new MappedProblogTheory(null, this.k1l(), result.h1s()), result.i1t_1);
@@ -2950,7 +2950,7 @@
     return this.y1s(clauses);
   };
   MappedProblogTheory.prototype.c1m = function (clause) {
-    var mappedClauses = ClauseMappingUtils_getInstance().m3e(clause);
+    var mappedClauses = ClauseMappingUtils_getInstance().p3e(clause);
     var result = null;
     var tmp0_iterator = mappedClauses.j();
     while (tmp0_iterator.m()) {
@@ -2962,7 +2962,7 @@
         tmp = !(result instanceof Failure);
       }
       if (tmp) {
-        result = this.q3e_1.retractAll(c);
+        result = this.t3e_1.retractAll(c);
       }
     }
     var tmp1_subject = result;
@@ -2978,7 +2978,7 @@
     return this.c1m(clause);
   };
   MappedProblogTheory.prototype.g1s = function (indicator) {
-    return new MappedProblogTheory(null, this.k1l(), this.q3e_1.abolish(ClauseMappingUtils_getInstance().n3e(indicator)));
+    return new MappedProblogTheory(null, this.k1l(), this.t3e_1.abolish(ClauseMappingUtils_getInstance().q3e(indicator)));
   };
   MappedProblogTheory.prototype.abolish = function (indicator) {
     return this.g1s(indicator);
@@ -3046,10 +3046,10 @@
   function NothingClauseMapper() {
     NothingClauseMapper_instance = this;
   }
-  NothingClauseMapper.prototype.a3e = function (clause) {
+  NothingClauseMapper.prototype.d3e = function (clause) {
     return true;
   };
-  NothingClauseMapper.prototype.b3e = function (clause) {
+  NothingClauseMapper.prototype.e3e = function (clause) {
     return listOf(clause);
   };
   var NothingClauseMapper_instance;
@@ -3061,7 +3061,7 @@
   function ProbabilisticClauseMapper() {
     ProbabilisticClauseMapper_instance = this;
   }
-  ProbabilisticClauseMapper.prototype.a3e = function (clause) {
+  ProbabilisticClauseMapper.prototype.d3e = function (clause) {
     var tmp;
     if (isInterface(clause, Rule)) {
       tmp = clause.ly().fw() === get_ANNOTATION_FUNCTOR();
@@ -3070,15 +3070,15 @@
     }
     return tmp;
   };
-  ProbabilisticClauseMapper.prototype.b3e = function (clause) {
+  ProbabilisticClauseMapper.prototype.e3e = function (clause) {
     if (!isInterface(clause, Rule)) {
       var tmp = 'Clause is not an instance of Rule: ' + clause;
       throw ClauseMappingException_init_$Create$(tmp, null, 2, null);
     }
-    var mapped = this.c3e(clause);
-    return listOf(this.d3e(mapped.g4_1, Companion_getInstance_21().p3d(mapped.h4_1)));
+    var mapped = this.f3e(clause);
+    return listOf(this.g3e(mapped.g4_1, Companion_getInstance_21().s3d(mapped.h4_1)));
   };
-  ProbabilisticClauseMapper.prototype.c3e = function (rule) {
+  ProbabilisticClauseMapper.prototype.f3e = function (rule) {
     if (!(rule.ly().zv() === 2)) {
       throw TuPrologException_init_$Create$('Invalid probabilistic rule: ' + rule.ly());
     }
@@ -3108,10 +3108,10 @@
     headTerm = anonVariablesFix.ly();
     bodyTerm = anonVariablesFix.my();
     var extraVariables = get_extraVariables(Companion_getInstance_12().of(headTerm, [bodyTerm]));
-    var probTerm_0 = new ProbTerm(ClauseMappingUtils_getInstance().l3e(), probability, headTerm, extraVariables);
+    var probTerm_0 = new ProbTerm(ClauseMappingUtils_getInstance().o3e(), probability, headTerm, extraVariables);
     return new Pair(Companion_getInstance_12().of(headTerm, [bodyTerm]), probTerm_0);
   };
-  ProbabilisticClauseMapper.prototype.d3e = function (rule, explanation) {
+  ProbabilisticClauseMapper.prototype.g3e = function (rule, explanation) {
     var tmp = rule.my();
     if (isInterface(tmp, Truth)) {
       return Companion_getInstance_12().of(withExplanation(rule.ly(), toTerm(explanation)), [rule.my()]);
@@ -3142,17 +3142,17 @@
   function PrologClauseMapper() {
     PrologClauseMapper_instance = this;
   }
-  PrologClauseMapper.prototype.a3e = function (clause) {
+  PrologClauseMapper.prototype.d3e = function (clause) {
     return isInterface(clause, Rule);
   };
-  PrologClauseMapper.prototype.b3e = function (clause) {
+  PrologClauseMapper.prototype.e3e = function (clause) {
     if (!isInterface(clause, Rule)) {
       var tmp = 'Clause is not an instance of Rule: ' + clause;
       throw ClauseMappingException_init_$Create$(tmp, null, 2, null);
     }
     var tmp_0 = clause.my();
     if (isInterface(tmp_0, Truth)) {
-      return listOf(Companion_getInstance_12().of(withExplanation(clause.ly(), toTerm(Companion_getInstance_21().l3d_1)), [clause.my()]));
+      return listOf(Companion_getInstance_12().of(withExplanation(clause.ly(), toTerm(Companion_getInstance_21().o3d_1)), [clause.my()]));
     }
     var tmp_1 = Companion_getInstance_1();
     ProblogLib_getInstance();
@@ -3170,12 +3170,12 @@
     ProblogLib_getInstance();
     NonBacktrackable.call(this, 'prob' + '_expl_and');
   }
-  ProbExplAnd.prototype.z2r = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_19().h2h(_this__u8e3s4, 1);
-    Companion_getInstance_19().n2h(_this__u8e3s4, 1);
-    if (ProbSetConfig_getInstance().s3e(_this__u8e3s4.context)) {
-      var tmp = Companion_getInstance_19().b2h(_this__u8e3s4, first, toTerm(Companion_getInstance_21().l3d_1));
-      return _this__u8e3s4.g2g(tmp, null, [], 6, null);
+  ProbExplAnd.prototype.c2s = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_19().k2h(_this__u8e3s4, 1);
+    Companion_getInstance_19().q2h(_this__u8e3s4, 1);
+    if (ProbSetConfig_getInstance().v3e(_this__u8e3s4.context)) {
+      var tmp = Companion_getInstance_19().e2h(_this__u8e3s4, first, toTerm(Companion_getInstance_21().o3d_1));
+      return _this__u8e3s4.j2g(tmp, null, [], 6, null);
     }
     var tmp_0;
     var tmp_1;
@@ -3191,13 +3191,13 @@
       tmp_1 = false;
     }
     if (tmp_1) {
-      var explanation = (second.h3c_1.x3d() === 0.0 ? true : third.h3c_1.x3d() === 0.0) ? Companion_getInstance_21().k3d_1 : (second.h3c_1.x3d() === 1.0 ? third.h3c_1.x3d() === 1.0 : false) ? Companion_getInstance_21().l3d_1 : second.h3c_1.x3d() === 1.0 ? third.h3c_1 : third.h3c_1.x3d() === 1.0 ? second.h3c_1 : second.h3c_1.and(third.h3c_1);
+      var explanation = (second.k3c_1.a3e() === 0.0 ? true : third.k3c_1.a3e() === 0.0) ? Companion_getInstance_21().n3d_1 : (second.k3c_1.a3e() === 1.0 ? third.k3c_1.a3e() === 1.0 : false) ? Companion_getInstance_21().o3d_1 : second.k3c_1.a3e() === 1.0 ? third.k3c_1 : third.k3c_1.a3e() === 1.0 ? second.k3c_1 : second.k3c_1.and(third.k3c_1);
       var tmp_3;
-      if (explanation.x3d() === 0.0) {
-        tmp_3 = _this__u8e3s4.y2i(false, null, [], 6, null);
+      if (explanation.a3e() === 0.0) {
+        tmp_3 = _this__u8e3s4.b2j(false, null, [], 6, null);
       } else {
-        var tmp_4 = Companion_getInstance_19().b2h(_this__u8e3s4, first, new ProbExplanationTerm(explanation));
-        tmp_3 = _this__u8e3s4.g2g(tmp_4, null, [], 6, null);
+        var tmp_4 = Companion_getInstance_19().e2h(_this__u8e3s4, first, new ProbExplanationTerm(explanation));
+        tmp_3 = _this__u8e3s4.j2g(tmp_4, null, [], 6, null);
       }
       tmp_0 = tmp_3;
     } else {
@@ -3206,12 +3206,12 @@
       tmp$ret$0 = this.signature.name;
       var tmp_5 = "Can't compute " + tmp$ret$0;
       var tmp_6 = ResolutionException_init_$Create$(tmp_5, null, _this__u8e3s4.context, [], 10, null);
-      tmp_0 = _this__u8e3s4.c2j(tmp_6, null, [], 6, null);
+      tmp_0 = _this__u8e3s4.f2j(tmp_6, null, [], 6, null);
     }
     return tmp_0;
   };
-  ProbExplAnd.prototype.r2j = function (_this__u8e3s4, first, second, third) {
-    return this.z2r(_this__u8e3s4, first, second, third);
+  ProbExplAnd.prototype.u2j = function (_this__u8e3s4, first, second, third) {
+    return this.c2s(_this__u8e3s4, first, second, third);
   };
   var ProbExplAnd_instance;
   function ProbExplAnd_getInstance() {
@@ -3220,22 +3220,22 @@
     return ProbExplAnd_instance;
   }
   function ProbHelper$computeAllSubstitutions$slambda($goal, $this_computeAllSubstitutions, $third, $first, $second, $goalSignature, resultContinuation) {
-    this.b3f_1 = $goal;
-    this.c3f_1 = $this_computeAllSubstitutions;
-    this.d3f_1 = $third;
-    this.e3f_1 = $first;
-    this.f3f_1 = $second;
-    this.g3f_1 = $goalSignature;
+    this.e3f_1 = $goal;
+    this.f3f_1 = $this_computeAllSubstitutions;
+    this.g3f_1 = $third;
+    this.h3f_1 = $first;
+    this.i3f_1 = $second;
+    this.j3f_1 = $goalSignature;
     CoroutineImpl.call(this, resultContinuation);
   }
-  ProbHelper$computeAllSubstitutions$slambda.prototype.t2t = function ($this$sequence, $cont) {
-    var tmp = this.u2t($this$sequence, $cont);
+  ProbHelper$computeAllSubstitutions$slambda.prototype.w2t = function ($this$sequence, $cont) {
+    var tmp = this.x2t($this$sequence, $cont);
     tmp.ei_1 = Unit_getInstance();
     tmp.fi_1 = null;
     return tmp.ki();
   };
   ProbHelper$computeAllSubstitutions$slambda.prototype.wi = function (p1, $cont) {
-    return this.t2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
+    return this.w2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
   };
   ProbHelper$computeAllSubstitutions$slambda.prototype.ki = function () {
     var suspendResult = this.ei_1;
@@ -3245,91 +3245,91 @@
         switch (tmp) {
           case 0:
             this.di_1 = 18;
-            this.i3f_1 = this.b3f_1.fw();
-            if (this.i3f_1 === '\\+' ? true : this.i3f_1 === 'not') {
+            this.l3f_1 = this.e3f_1.fw();
+            if (this.l3f_1 === '\\+' ? true : this.l3f_1 === 'not') {
               this.ci_1 = 16;
               var tmp_0;
-              if (ProbSetConfig_getInstance().s3e(this.c3f_1.context)) {
+              if (ProbSetConfig_getInstance().v3e(this.f3f_1.context)) {
                 var tmp_1 = Companion_getInstance_19();
                 var tmp_2 = Companion_getInstance_3();
-                var tmp_3 = this.b3f_1.fw();
+                var tmp_3 = this.e3f_1.fw();
                 var tmp_4 = Companion_getInstance_3();
                 var tmp0__get_functor__thl4dk = Prob_getInstance();
-                tmp_0 = tmp_1.b2h(this.c3f_1, this.d3f_1, tmp_2.of(tmp_3, [tmp_4.of(tmp0__get_functor__thl4dk.signature.name, [Companion_getInstance_1().anonymous(), this.b3f_1.get(0)])])).plus(Companion_getInstance_19().b2h(this.c3f_1, this.e3f_1, toTerm(Companion_getInstance_21().l3d_1)));
+                tmp_0 = tmp_1.e2h(this.f3f_1, this.g3f_1, tmp_2.of(tmp_3, [tmp_4.of(tmp0__get_functor__thl4dk.signature.name, [Companion_getInstance_1().anonymous(), this.e3f_1.get(0)])])).plus(Companion_getInstance_19().e2h(this.f3f_1, this.h3f_1, toTerm(Companion_getInstance_21().o3d_1)));
               } else {
                 var tmp_5 = Companion_getInstance_19();
                 var tmp_6 = Companion_getInstance_3();
                 var tmp1__get_functor__4k11yf = ProbNegationAsFailure_getInstance();
-                tmp_0 = tmp_5.b2h(this.c3f_1, this.d3f_1, tmp_6.of(tmp1__get_functor__4k11yf.signature.name, [this.e3f_1, this.b3f_1.get(0)]));
+                tmp_0 = tmp_5.e2h(this.f3f_1, this.g3f_1, tmp_6.of(tmp1__get_functor__4k11yf.signature.name, [this.h3f_1, this.e3f_1.get(0)]));
               }
-              suspendResult = this.h3f_1.z4(tmp_0, this);
+              suspendResult = this.k3f_1.z4(tmp_0, this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              if ((this.i3f_1 === ',' ? true : this.i3f_1 === ';') ? true : this.i3f_1 === '->') {
+              if ((this.l3f_1 === ',' ? true : this.l3f_1 === ';') ? true : this.l3f_1 === '->') {
                 this.ci_1 = 15;
                 var tmp_7;
-                if (ProbSetConfig_getInstance().s3e(this.c3f_1.context)) {
-                  tmp_7 = Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, withBodyExplanation(this.b3f_1, Companion_getInstance_1().anonymous())).plus(Companion_getInstance_19().b2h(this.c3f_1, this.e3f_1, toTerm(Companion_getInstance_21().l3d_1)));
+                if (ProbSetConfig_getInstance().v3e(this.f3f_1.context)) {
+                  tmp_7 = Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, withBodyExplanation(this.e3f_1, Companion_getInstance_1().anonymous())).plus(Companion_getInstance_19().e2h(this.f3f_1, this.h3f_1, toTerm(Companion_getInstance_21().o3d_1)));
                 } else {
-                  tmp_7 = Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, withBodyExplanation(this.b3f_1, this.e3f_1));
+                  tmp_7 = Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, withBodyExplanation(this.e3f_1, this.h3f_1));
                 }
-                suspendResult = this.h3f_1.z4(tmp_7, this);
+                suspendResult = this.k3f_1.z4(tmp_7, this);
                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                   return suspendResult;
                 }
                 continue $sm;
               } else {
-                if (this.i3f_1 === 'call') {
-                  this.j3f_1 = this.b3f_1.get(0);
+                if (this.l3f_1 === 'call') {
+                  this.m3f_1 = this.e3f_1.get(0);
                   this.ci_1 = 14;
-                  suspendResult = this.h3f_1.z4(Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, Companion_getInstance_2().of(Companion_getInstance_3().of('ensure_executable', [this.j3f_1]), Companion_getInstance_3().of(this.b3f_1.fw(), [withBodyExplanation(this.j3f_1, this.e3f_1)]))), this);
+                  suspendResult = this.k3f_1.z4(Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, Companion_getInstance_2().of(Companion_getInstance_3().of('ensure_executable', [this.m3f_1]), Companion_getInstance_3().of(this.e3f_1.fw(), [withBodyExplanation(this.m3f_1, this.h3f_1)]))), this);
                   if (suspendResult === get_COROUTINE_SUSPENDED()) {
                     return suspendResult;
                   }
                   continue $sm;
                 } else {
-                  if (this.i3f_1 === 'catch') {
+                  if (this.l3f_1 === 'catch') {
                     this.ci_1 = 13;
-                    suspendResult = this.h3f_1.z4(Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, Companion_getInstance_3().of(this.b3f_1.fw(), [withBodyExplanation(this.b3f_1.get(0), this.e3f_1), this.b3f_1.get(1), withBodyExplanation(this.b3f_1.get(2), this.e3f_1)])), this);
+                    suspendResult = this.k3f_1.z4(Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, Companion_getInstance_3().of(this.e3f_1.fw(), [withBodyExplanation(this.e3f_1.get(0), this.h3f_1), this.e3f_1.get(1), withBodyExplanation(this.e3f_1.get(2), this.h3f_1)])), this);
                     if (suspendResult === get_COROUTINE_SUSPENDED()) {
                       return suspendResult;
                     }
                     continue $sm;
                   } else {
-                    if (this.i3f_1 === 'findall') {
+                    if (this.l3f_1 === 'findall') {
                       var tmp_8 = this;
-                      var tmp2_toTypedArray = this.b3f_1.gw();
-                      tmp_8.k3f_1 = copyToArray(tmp2_toTypedArray);
-                      this.k3f_1[1] = withBodyExplanation(this.k3f_1[1], Companion_getInstance_1().anonymous());
+                      var tmp2_toTypedArray = this.e3f_1.gw();
+                      tmp_8.n3f_1 = copyToArray(tmp2_toTypedArray);
+                      this.n3f_1[1] = withBodyExplanation(this.n3f_1[1], Companion_getInstance_1().anonymous());
                       this.ci_1 = 12;
-                      suspendResult = this.h3f_1.z4(Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, Companion_getInstance_3().of(this.b3f_1.fw(), this.k3f_1.slice())).plus(Companion_getInstance_19().b2h(this.c3f_1, this.e3f_1, toTerm(Companion_getInstance_21().l3d_1))), this);
+                      suspendResult = this.k3f_1.z4(Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, Companion_getInstance_3().of(this.e3f_1.fw(), this.n3f_1.slice())).plus(Companion_getInstance_19().e2h(this.f3f_1, this.h3f_1, toTerm(Companion_getInstance_21().o3d_1))), this);
                       if (suspendResult === get_COROUTINE_SUSPENDED()) {
                         return suspendResult;
                       }
                       continue $sm;
                     } else {
-                      if ((this.i3f_1 === 'assert' ? true : this.i3f_1 === 'asserta') ? true : this.i3f_1 === 'assertz') {
-                        this.l3f_1 = this.b3f_1.get(0);
+                      if ((this.l3f_1 === 'assert' ? true : this.l3f_1 === 'asserta') ? true : this.l3f_1 === 'assertz') {
+                        this.o3f_1 = this.e3f_1.get(0);
                         var tmp_9 = this;
-                        var tmp1_subject = this.l3f_1;
+                        var tmp1_subject = this.o3f_1;
                         var tmp_10;
                         if (isInterface(tmp1_subject, Clause)) {
-                          tmp_10 = extractSignature(ensureNotNull(this.l3f_1.ly()));
+                          tmp_10 = extractSignature(ensureNotNull(this.o3f_1.ly()));
                         } else {
-                          tmp_10 = extractSignature(safeToStruct(this.l3f_1));
+                          tmp_10 = extractSignature(safeToStruct(this.o3f_1));
                         }
-                        tmp_9.m3f_1 = tmp_10;
+                        tmp_9.p3f_1 = tmp_10;
                         var tmp_11;
-                        if (this.c3f_1.context.w1u().containsSignature(this.m3f_1)) {
+                        if (this.f3f_1.context.w1u().containsSignature(this.p3f_1)) {
                           tmp_11 = true;
                         } else {
                           var tmp_12;
-                          var tmp_13 = this.l3f_1;
+                          var tmp_13 = this.o3f_1;
                           if (isInterface(tmp_13, Clause)) {
-                            tmp_12 = !this.l3f_1.vy();
+                            tmp_12 = !this.o3f_1.vy();
                           } else {
                             tmp_12 = false;
                           }
@@ -3337,20 +3337,20 @@
                         }
                         if (tmp_11) {
                           this.ci_1 = 10;
-                          suspendResult = this.h3f_1.z4(Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, this.b3f_1).plus(Companion_getInstance_19().b2h(this.c3f_1, this.e3f_1, toTerm(Companion_getInstance_21().l3d_1))), this);
+                          suspendResult = this.k3f_1.z4(Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, this.e3f_1).plus(Companion_getInstance_19().e2h(this.f3f_1, this.h3f_1, toTerm(Companion_getInstance_21().o3d_1))), this);
                           if (suspendResult === get_COROUTINE_SUSPENDED()) {
                             return suspendResult;
                           }
                           continue $sm;
                         } else {
                           var tmp_14 = this;
-                          var tmp2_subject = this.l3f_1;
+                          var tmp2_subject = this.o3f_1;
                           var tmp_15;
                           if (isInterface(tmp2_subject, Clause)) {
-                            tmp_15 = ClauseMappingUtils_getInstance().m3e(this.l3f_1);
+                            tmp_15 = ClauseMappingUtils_getInstance().p3e(this.o3f_1);
                           } else {
                             if (isInterface(tmp2_subject, Struct)) {
-                              var tmp3_map = ClauseMappingUtils_getInstance().m3e(Companion_getInstance().of(this.l3f_1));
+                              var tmp3_map = ClauseMappingUtils_getInstance().p3e(Companion_getInstance().of(this.o3f_1));
                               var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp3_map, 10));
                               var tmp0_iterator = tmp3_map.j();
                               while (tmp0_iterator.m()) {
@@ -3359,40 +3359,40 @@
                               }
                               tmp_15 = tmp0_mapTo;
                             } else {
-                              tmp_15 = listOf(this.l3f_1);
+                              tmp_15 = listOf(this.o3f_1);
                             }
                           }
-                          tmp_14.n3f_1 = tmp_15;
+                          tmp_14.q3f_1 = tmp_15;
                           this.ci_1 = 9;
-                          var tmp0_mapTo_0 = ArrayList_init_$Create$(collectionSizeOrDefault(this.n3f_1, 10));
-                          var tmp0_iterator_0 = this.n3f_1.j();
+                          var tmp0_mapTo_0 = ArrayList_init_$Create$(collectionSizeOrDefault(this.q3f_1, 10));
+                          var tmp0_iterator_0 = this.q3f_1.j();
                           while (tmp0_iterator_0.m()) {
                             var item_0 = tmp0_iterator_0.p();
-                            tmp0_mapTo_0.g(Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, Companion_getInstance_3().of(this.b3f_1.fw(), [item_0])).plus(Companion_getInstance_19().b2h(this.c3f_1, this.e3f_1, toTerm(Companion_getInstance_21().l3d_1))));
+                            tmp0_mapTo_0.g(Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, Companion_getInstance_3().of(this.e3f_1.fw(), [item_0])).plus(Companion_getInstance_19().e2h(this.f3f_1, this.h3f_1, toTerm(Companion_getInstance_21().o3d_1))));
                           }
-                          suspendResult = this.h3f_1.b5(tmp0_mapTo_0, this);
+                          suspendResult = this.k3f_1.b5(tmp0_mapTo_0, this);
                           if (suspendResult === get_COROUTINE_SUSPENDED()) {
                             return suspendResult;
                           }
                           continue $sm;
                         }
                       } else {
-                        if (this.i3f_1 === 'retract' ? true : this.i3f_1 === 'retractall') {
-                          this.o3f_1 = this.b3f_1.get(0);
+                        if (this.l3f_1 === 'retract' ? true : this.l3f_1 === 'retractall') {
+                          this.r3f_1 = this.e3f_1.get(0);
                           this.ci_1 = 8;
                           var tmp_16 = Companion_getInstance_19();
                           var tmp_17 = Companion_getInstance_3();
-                          var tmp_18 = this.b3f_1.fw();
+                          var tmp_18 = this.e3f_1.fw();
                           var tmp_19;
                           var tmp_20;
                           var tmp_21;
-                          if (this.o3f_1.mw()) {
+                          if (this.r3f_1.mw()) {
                             tmp_21 = true;
                           } else {
                             var tmp_22;
-                            var tmp_23 = this.o3f_1;
+                            var tmp_23 = this.r3f_1;
                             if (isInterface(tmp_23, Struct)) {
-                              tmp_22 = this.o3f_1.fw() === ':-';
+                              tmp_22 = this.r3f_1.fw() === ':-';
                             } else {
                               tmp_22 = false;
                             }
@@ -3401,38 +3401,38 @@
                           if (tmp_21) {
                             tmp_20 = true;
                           } else {
-                            tmp_20 = this.c3f_1.context.w1u().containsSignature(extractSignature(safeToStruct(this.o3f_1)));
+                            tmp_20 = this.f3f_1.context.w1u().containsSignature(extractSignature(safeToStruct(this.r3f_1)));
                           }
                           if (tmp_20) {
-                            tmp_19 = this.o3f_1;
+                            tmp_19 = this.r3f_1;
                           } else {
-                            tmp_19 = withExplanation(this.o3f_1, this.e3f_1);
+                            tmp_19 = withExplanation(this.r3f_1, this.h3f_1);
                           }
-                          suspendResult = this.h3f_1.z4(tmp_16.b2h(this.c3f_1, this.d3f_1, tmp_17.of(tmp_18, [tmp_19])), this);
+                          suspendResult = this.k3f_1.z4(tmp_16.e2h(this.f3f_1, this.g3f_1, tmp_17.of(tmp_18, [tmp_19])), this);
                           if (suspendResult === get_COROUTINE_SUSPENDED()) {
                             return suspendResult;
                           }
                           continue $sm;
                         } else {
-                          if (this.i3f_1 === 'clause') {
-                            this.p3f_1 = this.b3f_1.get(0);
+                          if (this.l3f_1 === 'clause') {
+                            this.s3f_1 = this.e3f_1.get(0);
                             var tmp_24;
-                            var tmp_25 = this.p3f_1;
+                            var tmp_25 = this.s3f_1;
                             if (!isInterface(tmp_25, Struct)) {
                               tmp_24 = true;
                             } else {
-                              tmp_24 = this.c3f_1.context.w1u().hasProtected(extractSignature(this.p3f_1));
+                              tmp_24 = this.f3f_1.context.w1u().hasProtected(extractSignature(this.s3f_1));
                             }
                             if (tmp_24) {
                               this.ci_1 = 6;
-                              suspendResult = this.h3f_1.z4(Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, this.b3f_1).plus(Companion_getInstance_19().b2h(this.c3f_1, this.e3f_1, toTerm(Companion_getInstance_21().l3d_1))), this);
+                              suspendResult = this.k3f_1.z4(Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, this.e3f_1).plus(Companion_getInstance_19().e2h(this.f3f_1, this.h3f_1, toTerm(Companion_getInstance_21().o3d_1))), this);
                               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                 return suspendResult;
                               }
                               continue $sm;
                             } else {
                               this.ci_1 = 5;
-                              suspendResult = this.h3f_1.z4(Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, Companion_getInstance_3().of(this.b3f_1.fw(), [withExplanation(this.b3f_1.get(0), this.e3f_1), this.b3f_1.get(1)])), this);
+                              suspendResult = this.k3f_1.z4(Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, Companion_getInstance_3().of(this.e3f_1.fw(), [withExplanation(this.e3f_1.get(0), this.h3f_1), this.e3f_1.get(1)])), this);
                               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                 return suspendResult;
                               }
@@ -3441,16 +3441,16 @@
                           } else {
                             var tmp_26 = this;
                             var tmp_27;
-                            var tmp_28 = this.f3f_1;
+                            var tmp_28 = this.i3f_1;
                             if (isInterface(tmp_28, Truth)) {
                               tmp_27 = true;
                             } else {
-                              tmp_27 = this.c3f_1.context.w1u().containsSignature(this.g3f_1);
+                              tmp_27 = this.f3f_1.context.w1u().containsSignature(this.j3f_1);
                             }
-                            tmp_26.q3f_1 = tmp_27;
-                            if ((this.q3f_1 ? true : this.c3f_1.context.y1u().containsIndicator(this.g3f_1.toIndicator())) ? true : this.c3f_1.context.z1u().containsIndicator(this.g3f_1.toIndicator())) {
+                            tmp_26.t3f_1 = tmp_27;
+                            if ((this.t3f_1 ? true : this.f3f_1.context.y1u().containsIndicator(this.j3f_1.toIndicator())) ? true : this.f3f_1.context.z1u().containsIndicator(this.j3f_1.toIndicator())) {
                               this.ci_1 = 1;
-                              suspendResult = this.h3f_1.z4(Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, this.b3f_1).plus(Companion_getInstance_19().b2h(this.c3f_1, this.e3f_1, toTerm(Companion_getInstance_21().l3d_1))), this);
+                              suspendResult = this.k3f_1.z4(Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, this.e3f_1).plus(Companion_getInstance_19().e2h(this.f3f_1, this.h3f_1, toTerm(Companion_getInstance_21().o3d_1))), this);
                               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                 return suspendResult;
                               }
@@ -3473,9 +3473,9 @@
             this.ci_1 = 2;
             continue $sm;
           case 2:
-            if (!this.q3f_1) {
+            if (!this.t3f_1) {
               this.ci_1 = 3;
-              suspendResult = this.h3f_1.z4(Companion_getInstance_19().b2h(this.c3f_1, this.d3f_1, withExplanation(this.b3f_1, this.e3f_1)), this);
+              suspendResult = this.k3f_1.z4(Companion_getInstance_19().e2h(this.f3f_1, this.g3f_1, withExplanation(this.e3f_1, this.h3f_1)), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
@@ -3543,15 +3543,15 @@
       }
      while (true);
   };
-  ProbHelper$computeAllSubstitutions$slambda.prototype.u2t = function ($this$sequence, completion) {
-    var i = new ProbHelper$computeAllSubstitutions$slambda(this.b3f_1, this.c3f_1, this.d3f_1, this.e3f_1, this.f3f_1, this.g3f_1, completion);
-    i.h3f_1 = $this$sequence;
+  ProbHelper$computeAllSubstitutions$slambda.prototype.x2t = function ($this$sequence, completion) {
+    var i = new ProbHelper$computeAllSubstitutions$slambda(this.e3f_1, this.f3f_1, this.g3f_1, this.h3f_1, this.i3f_1, this.j3f_1, completion);
+    i.k3f_1 = $this$sequence;
     return i;
   };
   function ProbHelper$computeAllSubstitutions$slambda_0($goal, $this_computeAllSubstitutions, $third, $first, $second, $goalSignature, resultContinuation) {
     var i = new ProbHelper$computeAllSubstitutions$slambda($goal, $this_computeAllSubstitutions, $third, $first, $second, $goalSignature, resultContinuation);
     var l = function ($this$sequence, $cont) {
-      return i.t2t($this$sequence, $cont);
+      return i.w2t($this$sequence, $cont);
     };
     l.$arity = 1;
     return l;
@@ -3561,15 +3561,15 @@
     ProblogLib_getInstance();
     WithoutSideEffects.call(this, 'prob' + '_helper');
   }
-  ProbHelper.prototype.r2p = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_19().h2h(_this__u8e3s4, 1);
-    Companion_getInstance_19().n2h(_this__u8e3s4, 1);
+  ProbHelper.prototype.u2p = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_19().k2h(_this__u8e3s4, 1);
+    Companion_getInstance_19().q2h(_this__u8e3s4, 1);
     var goal = safeToStruct(second);
     var goalSignature = extractSignature(goal);
     return sequence(ProbHelper$computeAllSubstitutions$slambda_0(goal, _this__u8e3s4, third, first, second, goalSignature, null));
   };
-  ProbHelper.prototype.n2j = function (_this__u8e3s4, first, second, third) {
-    return this.r2p(_this__u8e3s4, first, second, third);
+  ProbHelper.prototype.q2j = function (_this__u8e3s4, first, second, third) {
+    return this.u2p(_this__u8e3s4, first, second, third);
   };
   var ProbHelper_instance;
   function ProbHelper_getInstance() {
@@ -3582,14 +3582,14 @@
     ProblogLib_getInstance();
     NonBacktrackable_0.call(this, 'prob' + '_negation_as_failure');
   }
-  ProbNegationAsFailure.prototype.x2p = function (_this__u8e3s4, first, second) {
-    Companion_getInstance_19().h2h(_this__u8e3s4, 1);
-    Companion_getInstance_19().n2h(_this__u8e3s4, 1);
+  ProbNegationAsFailure.prototype.a2q = function (_this__u8e3s4, first, second) {
+    Companion_getInstance_19().k2h(_this__u8e3s4, 1);
+    Companion_getInstance_19().q2h(_this__u8e3s4, 1);
     var tmp;
     if (!second.jx()) {
       var tmp_0 = 'Probabilistic negation does not support non-ground goals: ' + second;
       var tmp_1 = ResolutionException_init_$Create$(tmp_0, null, _this__u8e3s4.context, [], 10, null);
-      tmp = _this__u8e3s4.c2j(tmp_1, null, [], 6, null);
+      tmp = _this__u8e3s4.f2j(tmp_1, null, [], 6, null);
     } else {
       var explanationTermVar = Companion_getInstance_1().of('Explanation');
       var tmp_2 = _this__u8e3s4.subSolver();
@@ -3601,7 +3601,7 @@
       var solution = firstOrNull(tmp_2.solveWithOptions(tmp_3.of(tmp$ret$0, [explanationTermVar, second]), setProbabilistic(Companion_getInstance_5().DEFAULT, false)));
       var tmp_4;
       if (solution == null) {
-        tmp_4 = _this__u8e3s4.l2g(null, [], 3, null);
+        tmp_4 = _this__u8e3s4.o2g(null, [], 3, null);
       } else {
         var explanationTerm = solution.r1u().a3(explanationTermVar);
         var tmp_5;
@@ -3614,10 +3614,10 @@
         if (tmp_6) {
           var tmp_7 = 'No valid explanation has been solved for goal: ' + second;
           var tmp_8 = ResolutionException_init_$Create$(tmp_7, null, _this__u8e3s4.context, [], 10, null);
-          tmp_5 = _this__u8e3s4.c2j(tmp_8, null, [], 6, null);
+          tmp_5 = _this__u8e3s4.f2j(tmp_8, null, [], 6, null);
         } else {
-          var tmp_9 = Companion_getInstance_9().ofSubstitution(Companion_getInstance_19().b2h(_this__u8e3s4, first, new ProbExplanationTerm(explanationTerm.h3c_1.not())), []);
-          tmp_5 = _this__u8e3s4.g2g(tmp_9, null, [], 6, null);
+          var tmp_9 = Companion_getInstance_9().ofSubstitution(Companion_getInstance_19().e2h(_this__u8e3s4, first, new ProbExplanationTerm(explanationTerm.k3c_1.not())), []);
+          tmp_5 = _this__u8e3s4.j2g(tmp_9, null, [], 6, null);
         }
         tmp_4 = tmp_5;
       }
@@ -3625,8 +3625,8 @@
     }
     return tmp;
   };
-  ProbNegationAsFailure.prototype.a2g = function (_this__u8e3s4, first, second) {
-    return this.x2p(_this__u8e3s4, first, second);
+  ProbNegationAsFailure.prototype.d2g = function (_this__u8e3s4, first, second) {
+    return this.a2q(_this__u8e3s4, first, second);
   };
   var ProbNegationAsFailure_instance;
   function ProbNegationAsFailure_getInstance() {
@@ -3640,22 +3640,22 @@
     };
   }
   function ProbQuery$computeAllSubstitutions$slambda($solutions, $queryWithEvidenceExplanation, $evidenceExplanation, $this_computeAllSubstitutions, $first, $fourth, resultContinuation) {
-    this.b3g_1 = $solutions;
-    this.c3g_1 = $queryWithEvidenceExplanation;
-    this.d3g_1 = $evidenceExplanation;
-    this.e3g_1 = $this_computeAllSubstitutions;
-    this.f3g_1 = $first;
-    this.g3g_1 = $fourth;
+    this.e3g_1 = $solutions;
+    this.f3g_1 = $queryWithEvidenceExplanation;
+    this.g3g_1 = $evidenceExplanation;
+    this.h3g_1 = $this_computeAllSubstitutions;
+    this.i3g_1 = $first;
+    this.j3g_1 = $fourth;
     CoroutineImpl.call(this, resultContinuation);
   }
-  ProbQuery$computeAllSubstitutions$slambda.prototype.t2t = function ($this$sequence, $cont) {
-    var tmp = this.u2t($this$sequence, $cont);
+  ProbQuery$computeAllSubstitutions$slambda.prototype.w2t = function ($this$sequence, $cont) {
+    var tmp = this.x2t($this$sequence, $cont);
     tmp.ei_1 = Unit_getInstance();
     tmp.fi_1 = null;
     return tmp.ki();
   };
   ProbQuery$computeAllSubstitutions$slambda.prototype.wi = function (p1, $cont) {
-    return this.t2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
+    return this.w2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
   };
   ProbQuery$computeAllSubstitutions$slambda.prototype.ki = function () {
     var suspendResult = this.ei_1;
@@ -3665,67 +3665,67 @@
         switch (tmp) {
           case 0:
             this.di_1 = 8;
-            this.i3g_1 = this.b3g_1.j();
+            this.l3g_1 = this.e3g_1.j();
             this.ci_1 = 1;
             continue $sm;
           case 1:
-            if (!this.i3g_1.m()) {
+            if (!this.l3g_1.m()) {
               this.ci_1 = 7;
               continue $sm;
             }
 
-            this.j3g_1 = this.i3g_1.p();
-            if (this.j3g_1.f1w())
-              throw ensureNotNull(this.j3g_1.c1w());
-            this.k3g_1 = this.j3g_1.r1u().a3(this.c3g_1);
-            this.l3g_1 = this.j3g_1.r1u().a3(this.d3g_1);
+            this.m3g_1 = this.l3g_1.p();
+            if (this.m3g_1.f1w())
+              throw ensureNotNull(this.m3g_1.c1w());
+            this.n3g_1 = this.m3g_1.r1u().a3(this.f3g_1);
+            this.o3g_1 = this.m3g_1.r1u().a3(this.g3g_1);
             var tmp_0;
             var tmp_1;
             var tmp_2;
-            if (this.k3g_1 == null) {
+            if (this.n3g_1 == null) {
               tmp_2 = true;
             } else {
-              var tmp_3 = this.k3g_1;
+              var tmp_3 = this.n3g_1;
               tmp_2 = !(tmp_3 instanceof ProbExplanationTerm);
             }
 
             if (tmp_2) {
               tmp_1 = true;
             } else {
-              tmp_1 = this.l3g_1 == null;
+              tmp_1 = this.o3g_1 == null;
             }
 
             if (tmp_1) {
               tmp_0 = true;
             } else {
-              var tmp_4 = this.l3g_1;
+              var tmp_4 = this.o3g_1;
               tmp_0 = !(tmp_4 instanceof ProbExplanationTerm);
             }
 
             if (tmp_0) {
               this.ci_1 = 5;
-              suspendResult = this.h3g_1.z4(Companion_getInstance_9().failed(), this);
+              suspendResult = this.k3g_1.z4(Companion_getInstance_9().failed(), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.m3g_1 = this.k3g_1.h3c_1.y3d();
-              this.n3g_1 = this.l3g_1.h3c_1.y3d();
-              if (this.m3g_1 == null ? true : this.n3g_1 == null) {
+              this.p3g_1 = this.n3g_1.k3c_1.b3e();
+              this.q3g_1 = this.o3g_1.k3c_1.b3e();
+              if (this.p3g_1 == null ? true : this.q3g_1 == null) {
                 this.ci_1 = 3;
-                suspendResult = this.h3g_1.z4(Companion_getInstance_9().failed(), this);
+                suspendResult = this.k3g_1.z4(Companion_getInstance_9().failed(), this);
                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                   return suspendResult;
                 }
                 continue $sm;
               } else {
                 var tmp_5 = this;
-                var tmp_6 = this.j3g_1.r1u();
-                tmp_5.o3g_1 = tmp_6.filter(ProbQuery$computeAllSubstitutions$slambda$lambda(this.d3g_1, this.c3g_1));
-                this.p3g_1 = Companion_getInstance_10().ofDouble(this.m3g_1 / this.n3g_1);
+                var tmp_6 = this.m3g_1.r1u();
+                tmp_5.r3g_1 = tmp_6.filter(ProbQuery$computeAllSubstitutions$slambda$lambda(this.g3g_1, this.f3g_1));
+                this.s3g_1 = Companion_getInstance_10().ofDouble(this.p3g_1 / this.q3g_1);
                 this.ci_1 = 2;
-                suspendResult = this.h3g_1.z4(Companion_getInstance_9().ofSubstitution(this.o3g_1, [Companion_getInstance_19().b2h(this.e3g_1, this.f3g_1, this.p3g_1), Companion_getInstance_19().b2h(this.e3g_1, this.g3g_1, this.k3g_1)]), this);
+                suspendResult = this.k3g_1.z4(Companion_getInstance_9().ofSubstitution(this.r3g_1, [Companion_getInstance_19().e2h(this.h3g_1, this.i3g_1, this.s3g_1), Companion_getInstance_19().e2h(this.h3g_1, this.j3g_1, this.n3g_1)]), this);
                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                   return suspendResult;
                 }
@@ -3764,15 +3764,15 @@
       }
      while (true);
   };
-  ProbQuery$computeAllSubstitutions$slambda.prototype.u2t = function ($this$sequence, completion) {
-    var i = new ProbQuery$computeAllSubstitutions$slambda(this.b3g_1, this.c3g_1, this.d3g_1, this.e3g_1, this.f3g_1, this.g3g_1, completion);
-    i.h3g_1 = $this$sequence;
+  ProbQuery$computeAllSubstitutions$slambda.prototype.x2t = function ($this$sequence, completion) {
+    var i = new ProbQuery$computeAllSubstitutions$slambda(this.e3g_1, this.f3g_1, this.g3g_1, this.h3g_1, this.i3g_1, this.j3g_1, completion);
+    i.k3g_1 = $this$sequence;
     return i;
   };
   function ProbQuery$computeAllSubstitutions$slambda_0($solutions, $queryWithEvidenceExplanation, $evidenceExplanation, $this_computeAllSubstitutions, $first, $fourth, resultContinuation) {
     var i = new ProbQuery$computeAllSubstitutions$slambda($solutions, $queryWithEvidenceExplanation, $evidenceExplanation, $this_computeAllSubstitutions, $first, $fourth, resultContinuation);
     var l = function ($this$sequence, $cont) {
-      return i.t2t($this$sequence, $cont);
+      return i.w2t($this$sequence, $cont);
     };
     l.$arity = 1;
     return l;
@@ -3782,11 +3782,11 @@
     ProblogLib_getInstance();
     WithoutSideEffects_0.call(this, 'prob' + '_query');
   }
-  ProbQuery.prototype.r3g = function (_this__u8e3s4, first, second, third, fourth) {
-    Companion_getInstance_19().h2h(_this__u8e3s4, 1);
-    Companion_getInstance_19().n2h(_this__u8e3s4, 1);
-    Companion_getInstance_19().l2h(_this__u8e3s4, 1);
-    Companion_getInstance_19().h2h(_this__u8e3s4, 2);
+  ProbQuery.prototype.u3g = function (_this__u8e3s4, first, second, third, fourth) {
+    Companion_getInstance_19().k2h(_this__u8e3s4, 1);
+    Companion_getInstance_19().q2h(_this__u8e3s4, 1);
+    Companion_getInstance_19().o2h(_this__u8e3s4, 1);
+    Companion_getInstance_19().k2h(_this__u8e3s4, 2);
     var queryWithEvidenceExplanation = Companion_getInstance_1().of('QueryWithEvidenceExplanation');
     var evidenceExplanation = Companion_getInstance_1().of('EvidenceExplanation');
     var tmp = _this__u8e3s4.subSolver();
@@ -3802,11 +3802,11 @@
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp1__get_functor__4k11yf = ProbSolveWithEvidence_getInstance();
     tmp$ret$1 = tmp1__get_functor__4k11yf.signature.name;
-    var solutions = tmp.solveWithOptions(tmp_0.of(tmp_2, tmp_3.of(tmp$ret$1, [queryWithEvidenceExplanation, evidenceExplanation, second])), ProbSetConfig_getInstance().s3g(third));
+    var solutions = tmp.solveWithOptions(tmp_0.of(tmp_2, tmp_3.of(tmp$ret$1, [queryWithEvidenceExplanation, evidenceExplanation, second])), ProbSetConfig_getInstance().v3g(third));
     return sequence(ProbQuery$computeAllSubstitutions$slambda_0(solutions, queryWithEvidenceExplanation, evidenceExplanation, _this__u8e3s4, first, fourth, null));
   };
-  ProbQuery.prototype.d2i = function (_this__u8e3s4, first, second, third, fourth) {
-    return this.r3g(_this__u8e3s4, first, second, third, fourth);
+  ProbQuery.prototype.g2i = function (_this__u8e3s4, first, second, third, fourth) {
+    return this.u3g(_this__u8e3s4, first, second, third, fourth);
   };
   var ProbQuery_instance;
   function ProbQuery_getInstance() {
@@ -3822,24 +3822,24 @@
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     tmp$ret$0 = this.signature.name;
-    tmp.d3c_1 = tmp$ret$0 + '_flag';
+    tmp.g3c_1 = tmp$ret$0 + '_flag';
     var tmp_0 = this;
     var tmp$ret$1;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     tmp$ret$1 = this.signature.name;
-    tmp_0.e3c_1 = tmp$ret$1 + '_term';
+    tmp_0.h3c_1 = tmp$ret$1 + '_term';
     var tmp_1 = this;
     var tmp$ret$2;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     tmp$ret$2 = this.signature.name;
-    tmp_1.f3c_1 = 'it.unibo.tuprolog.solve.probability' + tmp$ret$2 + '_tag';
+    tmp_1.i3c_1 = 'it.unibo.tuprolog.solve.probability' + tmp$ret$2 + '_tag';
   }
-  ProbSetConfig.prototype.g2p = function (_this__u8e3s4, first) {
-    Companion_getInstance_19().h2h(_this__u8e3s4, 0);
-    Companion_getInstance_19().q2h(_this__u8e3s4, 0);
+  ProbSetConfig.prototype.j2p = function (_this__u8e3s4, first) {
+    Companion_getInstance_19().k2h(_this__u8e3s4, 0);
+    Companion_getInstance_19().t2h(_this__u8e3s4, 0);
     var tmp$ret$2;
     // Inline function 'kotlin.arrayOf' call
-    var tmp0_arrayOf = [SetFlags_init_$Create$([new Pair(this.d3c_1, first)])];
+    var tmp0_arrayOf = [SetFlags_init_$Create$([new Pair(this.g3c_1, first)])];
     var tmp$ret$1;
     // Inline function 'kotlin.js.unsafeCast' call
     var tmp$ret$0;
@@ -3847,25 +3847,25 @@
     tmp$ret$0 = tmp0_arrayOf;
     tmp$ret$1 = tmp$ret$0;
     tmp$ret$2 = tmp$ret$1;
-    return _this__u8e3s4.m2g(null, null, tmp$ret$2.slice(), 3, null);
+    return _this__u8e3s4.p2g(null, null, tmp$ret$2.slice(), 3, null);
   };
-  ProbSetConfig.prototype.a2k = function (_this__u8e3s4, first) {
-    return this.g2p(_this__u8e3s4, first);
+  ProbSetConfig.prototype.d2k = function (_this__u8e3s4, first) {
+    return this.j2p(_this__u8e3s4, first);
   };
-  ProbSetConfig.prototype.s3g = function (_this__u8e3s4) {
-    var tmp0_elvis_lhs = _this__u8e3s4.getTag(this.f3c_1);
+  ProbSetConfig.prototype.v3g = function (_this__u8e3s4) {
+    var tmp0_elvis_lhs = _this__u8e3s4.getTag(this.i3c_1);
     return tmp0_elvis_lhs == null ? Companion_getInstance_5().DEFAULT : tmp0_elvis_lhs;
   };
-  ProbSetConfig.prototype.g3c = function (_this__u8e3s4) {
-    return setTag(Companion_getInstance_8().of(this.e3c_1), this.f3c_1, _this__u8e3s4);
+  ProbSetConfig.prototype.j3c = function (_this__u8e3s4) {
+    return setTag(Companion_getInstance_8().of(this.h3c_1), this.i3c_1, _this__u8e3s4);
   };
-  ProbSetConfig.prototype.t3g = function (_this__u8e3s4) {
-    var tmp0_safe_receiver = _this__u8e3s4.x1u().o9(this.d3c_1);
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.s3g(tmp0_safe_receiver);
+  ProbSetConfig.prototype.w3g = function (_this__u8e3s4) {
+    var tmp0_safe_receiver = _this__u8e3s4.x1u().o9(this.g3c_1);
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.v3g(tmp0_safe_receiver);
     return tmp1_elvis_lhs == null ? Companion_getInstance_5().DEFAULT : tmp1_elvis_lhs;
   };
-  ProbSetConfig.prototype.s3e = function (_this__u8e3s4) {
-    return !get_isProbabilistic(this.t3g(_this__u8e3s4));
+  ProbSetConfig.prototype.v3e = function (_this__u8e3s4) {
+    return !get_isProbabilistic(this.w3g(_this__u8e3s4));
   };
   var ProbSetConfig_instance;
   function ProbSetConfig_getInstance() {
@@ -3887,20 +3887,20 @@
     };
   }
   function ProbSolve$computeAllSubstitutions$slambda($solutionGroups, $explanationVar, $this_computeAllSubstitutions, $first, resultContinuation) {
-    this.c3h_1 = $solutionGroups;
-    this.d3h_1 = $explanationVar;
-    this.e3h_1 = $this_computeAllSubstitutions;
-    this.f3h_1 = $first;
+    this.f3h_1 = $solutionGroups;
+    this.g3h_1 = $explanationVar;
+    this.h3h_1 = $this_computeAllSubstitutions;
+    this.i3h_1 = $first;
     CoroutineImpl.call(this, resultContinuation);
   }
-  ProbSolve$computeAllSubstitutions$slambda.prototype.t2t = function ($this$sequence, $cont) {
-    var tmp = this.u2t($this$sequence, $cont);
+  ProbSolve$computeAllSubstitutions$slambda.prototype.w2t = function ($this$sequence, $cont) {
+    var tmp = this.x2t($this$sequence, $cont);
     tmp.ei_1 = Unit_getInstance();
     tmp.fi_1 = null;
     return tmp.ki();
   };
   ProbSolve$computeAllSubstitutions$slambda.prototype.wi = function (p1, $cont) {
-    return this.t2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
+    return this.w2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
   };
   ProbSolve$computeAllSubstitutions$slambda.prototype.ki = function () {
     var suspendResult = this.ei_1;
@@ -3911,23 +3911,23 @@
           case 0:
             this.di_1 = 4;
             var tmp_0 = this;
-            tmp_0.h3h_1 = this.c3h_1.z().j();
+            tmp_0.k3h_1 = this.f3h_1.z().j();
             this.ci_1 = 1;
             continue $sm;
           case 1:
-            if (!this.h3h_1.m()) {
+            if (!this.k3h_1.m()) {
               this.ci_1 = 3;
               continue $sm;
             }
 
-            this.i3h_1 = this.h3h_1.p();
+            this.l3h_1 = this.k3h_1.p();
             var tmp_1 = this;
-            var tmp0_map = this.i3h_1.b1();
+            var tmp0_map = this.l3h_1.b1();
             var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
             var tmp0_iterator = tmp0_map.j();
             while (tmp0_iterator.m()) {
               var item = tmp0_iterator.p();
-              tmp0_mapTo.g(item.r1u().a3(this.d3h_1));
+              tmp0_mapTo.g(item.r1u().a3(this.g3h_1));
             }
 
             var tmp1_filterIsInstance = tmp0_mapTo;
@@ -3945,7 +3945,7 @@
             var tmp0_iterator_1 = tmp2_map.j();
             while (tmp0_iterator_1.m()) {
               var item_0 = tmp0_iterator_1.p();
-              tmp0_mapTo_0.g(item_0.h3c_1);
+              tmp0_mapTo_0.g(item_0.k3c_1);
             }
 
             var tmp3_reduce = tmp0_mapTo_0;
@@ -3956,13 +3956,13 @@
             while (iterator.m()) {
               var tmp4__anonymous__pkmkx7 = accumulator;
               var tmp5__anonymous__kpxxpo = iterator.p();
-              accumulator = tmp5__anonymous__kpxxpo.x3d() === 1.0 ? tmp4__anonymous__pkmkx7 : tmp4__anonymous__pkmkx7.x3d() === 1.0 ? tmp5__anonymous__kpxxpo : tmp4__anonymous__pkmkx7.or(tmp5__anonymous__kpxxpo);
+              accumulator = tmp5__anonymous__kpxxpo.a3e() === 1.0 ? tmp4__anonymous__pkmkx7 : tmp4__anonymous__pkmkx7.a3e() === 1.0 ? tmp5__anonymous__kpxxpo : tmp4__anonymous__pkmkx7.or(tmp5__anonymous__kpxxpo);
             }
 
-            tmp_1.j3h_1 = accumulator;
-            this.k3h_1 = Companion_getInstance_9().ofSubstitution(this.i3h_1.a1(), [Companion_getInstance_19().b2h(this.e3h_1, this.f3h_1, new ProbExplanationTerm(this.j3h_1))]);
+            tmp_1.m3h_1 = accumulator;
+            this.n3h_1 = Companion_getInstance_9().ofSubstitution(this.l3h_1.a1(), [Companion_getInstance_19().e2h(this.h3h_1, this.i3h_1, new ProbExplanationTerm(this.m3h_1))]);
             this.ci_1 = 2;
-            suspendResult = this.g3h_1.z4(this.k3h_1, this);
+            suspendResult = this.j3h_1.z4(this.n3h_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -3986,15 +3986,15 @@
       }
      while (true);
   };
-  ProbSolve$computeAllSubstitutions$slambda.prototype.u2t = function ($this$sequence, completion) {
-    var i = new ProbSolve$computeAllSubstitutions$slambda(this.c3h_1, this.d3h_1, this.e3h_1, this.f3h_1, completion);
-    i.g3h_1 = $this$sequence;
+  ProbSolve$computeAllSubstitutions$slambda.prototype.x2t = function ($this$sequence, completion) {
+    var i = new ProbSolve$computeAllSubstitutions$slambda(this.f3h_1, this.g3h_1, this.h3h_1, this.i3h_1, completion);
+    i.j3h_1 = $this$sequence;
     return i;
   };
   function ProbSolve$computeAllSubstitutions$slambda_0($solutionGroups, $explanationVar, $this_computeAllSubstitutions, $first, resultContinuation) {
     var i = new ProbSolve$computeAllSubstitutions$slambda($solutionGroups, $explanationVar, $this_computeAllSubstitutions, $first, resultContinuation);
     var l = function ($this$sequence, $cont) {
-      return i.t2t($this$sequence, $cont);
+      return i.w2t($this$sequence, $cont);
     };
     l.$arity = 1;
     return l;
@@ -4004,17 +4004,17 @@
     ProblogLib_getInstance();
     WithoutSideEffects_1.call(this, 'prob' + '_solve');
   }
-  ProbSolve.prototype.w2q = function (_this__u8e3s4, first, second) {
-    Companion_getInstance_19().h2h(_this__u8e3s4, 1);
-    Companion_getInstance_19().n2h(_this__u8e3s4, 1);
-    if (ProbSetConfig_getInstance().s3e(_this__u8e3s4.context)) {
+  ProbSolve.prototype.z2q = function (_this__u8e3s4, first, second) {
+    Companion_getInstance_19().k2h(_this__u8e3s4, 1);
+    Companion_getInstance_19().q2h(_this__u8e3s4, 1);
+    if (ProbSetConfig_getInstance().v3e(_this__u8e3s4.context)) {
       var tmp = _this__u8e3s4.subSolver();
       var tmp_0 = Companion_getInstance_3();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
       var tmp0__get_functor__thl4dk = Prob_getInstance();
       tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
-      var tmp_1 = tmp.solveWithOptions(tmp_0.of(tmp$ret$0, [first, second]), ProbSetConfig_getInstance().t3g(_this__u8e3s4.context));
+      var tmp_1 = tmp.solveWithOptions(tmp_0.of(tmp$ret$0, [first, second]), ProbSetConfig_getInstance().w3g(_this__u8e3s4.context));
       return map(tmp_1, ProbSolve$computeAllSubstitutions$lambda);
     }
     var tmp_2 = Companion_getInstance_1();
@@ -4026,7 +4026,7 @@
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp1__get_functor__4k11yf = Prob_getInstance();
     tmp$ret$1 = tmp1__get_functor__4k11yf.signature.name;
-    var solutions = toList(tmp_3.solveWithOptions(tmp_4.of(tmp$ret$1, [explanationVar, second]), ProbSetConfig_getInstance().t3g(_this__u8e3s4.context)));
+    var solutions = toList(tmp_3.solveWithOptions(tmp_4.of(tmp$ret$1, [explanationVar, second]), ProbSetConfig_getInstance().w3g(_this__u8e3s4.context)));
     var tmp$ret$2;
     // Inline function 'kotlin.sequences.filterIsInstance' call
     var tmp2_filterIsInstance = asSequence(solutions);
@@ -4063,7 +4063,7 @@
       tmp$ret$3 = false;
     }
     if (!tmp$ret$3) {
-      tmp_6 = sequenceOf([Companion_getInstance_9().ofSubstitution(Companion_getInstance_19().b2h(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_21().k3d_1)), [])]);
+      tmp_6 = sequenceOf([Companion_getInstance_9().ofSubstitution(Companion_getInstance_19().e2h(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_21().n3d_1)), [])]);
     } else {
       var tmp$ret$11;
       // Inline function 'kotlin.collections.groupBy' call
@@ -4118,8 +4118,8 @@
     }
     return tmp_6;
   };
-  ProbSolve.prototype.i2g = function (_this__u8e3s4, first, second) {
-    return this.w2q(_this__u8e3s4, first, second);
+  ProbSolve.prototype.l2g = function (_this__u8e3s4, first, second) {
+    return this.z2q(_this__u8e3s4, first, second);
   };
   var ProbSolve_instance;
   function ProbSolve_getInstance() {
@@ -4139,27 +4139,27 @@
     return it instanceof ProbExplanationTerm;
   }
   function ProbSolveEvidence$computeOne$lambda_2(t) {
-    return t.h3c_1;
+    return t.k3c_1;
   }
   function ProbSolveEvidence() {
     ProbSolveEvidence_instance = this;
     ProblogLib_getInstance();
     NonBacktrackable_1.call(this, 'prob' + '_solve_evidence');
   }
-  ProbSolveEvidence.prototype.g2p = function (_this__u8e3s4, first) {
+  ProbSolveEvidence.prototype.j2p = function (_this__u8e3s4, first) {
     var tmp = Companion_getInstance_13();
     ProblogLib_getInstance();
     var evidenceIndicator = tmp.ofString('evidence', 2);
     if (!_this__u8e3s4.context.y1u().containsIndicator(evidenceIndicator) ? !_this__u8e3s4.context.z1u().containsIndicator(evidenceIndicator) : false) {
-      var tmp_0 = Companion_getInstance_19().b2h(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_21().l3d_1));
-      return _this__u8e3s4.g2g(tmp_0, null, [], 6, null);
+      var tmp_0 = Companion_getInstance_19().e2h(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_21().o3d_1));
+      return _this__u8e3s4.j2g(tmp_0, null, [], 6, null);
     }
     var evidenceTermVar = Companion_getInstance_1().of('TermVar');
     var evidenceTruthVar = Companion_getInstance_1().of('TruthVar');
     var tmp_1 = Companion_getInstance_3();
     ProblogLib_getInstance();
     var subQuery = tmp_1.of('evidence', [evidenceTermVar, evidenceTruthVar]);
-    var tmp_2 = ProbSetConfig_getInstance().t3g(_this__u8e3s4.context);
+    var tmp_2 = ProbSetConfig_getInstance().w3g(_this__u8e3s4.context);
     Companion_getInstance_5();
     var subOptions = tmp_2.setLimit(-1).setLazy(false);
     var tmp$ret$10;
@@ -4190,7 +4190,7 @@
         tmp_5 = !(!(truth == null) ? isInterface(truth, Truth) : false);
       }
       if (tmp_5) {
-        tmp_4 = Companion_getInstance_21().k3d_1;
+        tmp_4 = Companion_getInstance_21().n3d_1;
       } else {
         var tmp_6 = Companion_getInstance_1();
         ProblogLib_getInstance();
@@ -4205,7 +4205,7 @@
         var tmp0__get_functor__thl4dk = ProbSolve_getInstance();
         tmp$ret$1 = tmp0__get_functor__thl4dk.signature.name;
         var tmp_8 = tmp_7.of(tmp$ret$1, [explanationVar, term]);
-        var tmp_9 = _this__u8e3s4.e2j(tmp_8, new Long(0, 0), 2, null);
+        var tmp_9 = _this__u8e3s4.h2j(tmp_8, new Long(0, 0), 2, null);
         var tmp1_filterIsInstance = map(tmp_9, ProbSolveEvidence$computeOne$lambda_0(explanationVar));
         var tmp_10 = filter(tmp1_filterIsInstance, ProbSolveEvidence$computeOne$lambda_1);
         tmp$ret$2 = isInterface(tmp_10, Sequence) ? tmp_10 : THROW_CCE();
@@ -4220,7 +4220,7 @@
           // Inline function 'it.unibo.tuprolog.solve.problog.lib.primitive.ProbSolveEvidence.computeOne.<anonymous>.<anonymous>' call
           var tmp3__anonymous__ufb84q = accumulator;
           var tmp4__anonymous__pkmkx7 = iterator.p();
-          tmp$ret$3 = tmp4__anonymous__pkmkx7.x3d() === 1.0 ? tmp3__anonymous__ufb84q : tmp3__anonymous__ufb84q.x3d() === 1.0 ? tmp4__anonymous__pkmkx7 : tmp4__anonymous__pkmkx7.or(tmp3__anonymous__ufb84q);
+          tmp$ret$3 = tmp4__anonymous__pkmkx7.a3e() === 1.0 ? tmp3__anonymous__ufb84q : tmp3__anonymous__ufb84q.a3e() === 1.0 ? tmp4__anonymous__pkmkx7 : tmp4__anonymous__pkmkx7.or(tmp3__anonymous__ufb84q);
           accumulator = tmp$ret$3;
         }
         tmp$ret$4 = accumulator;
@@ -4241,7 +4241,7 @@
       var element = tmp0_iterator_0.p();
       var tmp$ret$8;
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.primitive.ProbSolveEvidence.computeOne.<anonymous>' call
-      tmp$ret$8 = !equals(element, Companion_getInstance_21().k3d_1);
+      tmp$ret$8 = !equals(element, Companion_getInstance_21().n3d_1);
       if (tmp$ret$8) {
         tmp0_filterTo.g(element);
       }
@@ -4251,7 +4251,7 @@
     var result = tmp$ret$10;
     var tmp_12;
     if (result.d()) {
-      tmp_12 = Companion_getInstance_21().l3d_1;
+      tmp_12 = Companion_getInstance_21().o3d_1;
     } else {
       var tmp$ret$12;
       // Inline function 'kotlin.collections.reduce' call
@@ -4271,11 +4271,11 @@
       tmp_12 = tmp$ret$12;
     }
     var resultExplanation = tmp_12;
-    var tmp_13 = Companion_getInstance_19().b2h(_this__u8e3s4, first, new ProbExplanationTerm(resultExplanation));
-    return _this__u8e3s4.g2g(tmp_13, null, [], 6, null);
+    var tmp_13 = Companion_getInstance_19().e2h(_this__u8e3s4, first, new ProbExplanationTerm(resultExplanation));
+    return _this__u8e3s4.j2g(tmp_13, null, [], 6, null);
   };
-  ProbSolveEvidence.prototype.a2k = function (_this__u8e3s4, first) {
-    return this.g2p(_this__u8e3s4, first);
+  ProbSolveEvidence.prototype.d2k = function (_this__u8e3s4, first) {
+    return this.j2p(_this__u8e3s4, first);
   };
   var ProbSolveEvidence_instance;
   function ProbSolveEvidence_getInstance() {
@@ -4289,22 +4289,22 @@
     };
   }
   function ProbSolveWithEvidence$computeAllSubstitutions$slambda($solutions, $goalExplanationVar, $evidenceExplanationTerm, $this_computeAllSubstitutions, $first, $second, resultContinuation) {
-    this.v3h_1 = $solutions;
-    this.w3h_1 = $goalExplanationVar;
-    this.x3h_1 = $evidenceExplanationTerm;
-    this.y3h_1 = $this_computeAllSubstitutions;
-    this.z3h_1 = $first;
-    this.a3i_1 = $second;
+    this.y3h_1 = $solutions;
+    this.z3h_1 = $goalExplanationVar;
+    this.a3i_1 = $evidenceExplanationTerm;
+    this.b3i_1 = $this_computeAllSubstitutions;
+    this.c3i_1 = $first;
+    this.d3i_1 = $second;
     CoroutineImpl.call(this, resultContinuation);
   }
-  ProbSolveWithEvidence$computeAllSubstitutions$slambda.prototype.t2t = function ($this$sequence, $cont) {
-    var tmp = this.u2t($this$sequence, $cont);
+  ProbSolveWithEvidence$computeAllSubstitutions$slambda.prototype.w2t = function ($this$sequence, $cont) {
+    var tmp = this.x2t($this$sequence, $cont);
     tmp.ei_1 = Unit_getInstance();
     tmp.fi_1 = null;
     return tmp.ki();
   };
   ProbSolveWithEvidence$computeAllSubstitutions$slambda.prototype.wi = function (p1, $cont) {
-    return this.t2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
+    return this.w2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
   };
   ProbSolveWithEvidence$computeAllSubstitutions$slambda.prototype.ki = function () {
     var suspendResult = this.ei_1;
@@ -4314,57 +4314,57 @@
         switch (tmp) {
           case 0:
             this.di_1 = 6;
-            this.c3i_1 = this.v3h_1.j();
+            this.f3i_1 = this.y3h_1.j();
             this.ci_1 = 1;
             continue $sm;
           case 1:
-            if (!this.c3i_1.m()) {
+            if (!this.f3i_1.m()) {
               this.ci_1 = 5;
               continue $sm;
             }
 
-            this.d3i_1 = this.c3i_1.p();
-            if (this.d3i_1.f1w())
-              throw ensureNotNull(this.d3i_1.c1w());
-            this.e3i_1 = this.d3i_1.r1u().a3(this.w3h_1);
+            this.g3i_1 = this.f3i_1.p();
+            if (this.g3i_1.f1w())
+              throw ensureNotNull(this.g3i_1.c1w());
+            this.h3i_1 = this.g3i_1.r1u().a3(this.z3h_1);
             var tmp_0;
             var tmp_1;
             var tmp_2;
-            if (this.x3h_1 == null) {
+            if (this.a3i_1 == null) {
               tmp_2 = true;
             } else {
-              var tmp_3 = this.x3h_1;
+              var tmp_3 = this.a3i_1;
               tmp_2 = !(tmp_3 instanceof ProbExplanationTerm);
             }
 
             if (tmp_2) {
               tmp_1 = true;
             } else {
-              tmp_1 = this.e3i_1 == null;
+              tmp_1 = this.h3i_1 == null;
             }
 
             if (tmp_1) {
               tmp_0 = true;
             } else {
-              var tmp_4 = this.e3i_1;
+              var tmp_4 = this.h3i_1;
               tmp_0 = !(tmp_4 instanceof ProbExplanationTerm);
             }
 
             if (tmp_0) {
               this.ci_1 = 3;
-              suspendResult = this.b3i_1.z4(Companion_getInstance_9().failed(), this);
+              suspendResult = this.e3i_1.z4(Companion_getInstance_9().failed(), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.f3i_1 = new ProbExplanationTerm(this.e3i_1.h3c_1.and(this.x3h_1.h3c_1));
+              this.i3i_1 = new ProbExplanationTerm(this.h3i_1.k3c_1.and(this.a3i_1.k3c_1));
               this.ci_1 = 2;
               var tmp_5 = Companion_getInstance_9();
-              var tmp_6 = Companion_getInstance_19().b2h(this.y3h_1, this.z3h_1, this.f3i_1);
-              var tmp_7 = Companion_getInstance_19().b2h(this.y3h_1, this.a3i_1, this.x3h_1);
-              var tmp_8 = this.d3i_1.r1u();
-              suspendResult = this.b3i_1.z4(tmp_5.ofSubstitution(tmp_6, [tmp_7, tmp_8.filter(ProbSolveWithEvidence$computeAllSubstitutions$slambda$lambda(this.w3h_1))]), this);
+              var tmp_6 = Companion_getInstance_19().e2h(this.b3i_1, this.c3i_1, this.i3i_1);
+              var tmp_7 = Companion_getInstance_19().e2h(this.b3i_1, this.d3i_1, this.a3i_1);
+              var tmp_8 = this.g3i_1.r1u();
+              suspendResult = this.e3i_1.z4(tmp_5.ofSubstitution(tmp_6, [tmp_7, tmp_8.filter(ProbSolveWithEvidence$computeAllSubstitutions$slambda$lambda(this.z3h_1))]), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
@@ -4396,15 +4396,15 @@
       }
      while (true);
   };
-  ProbSolveWithEvidence$computeAllSubstitutions$slambda.prototype.u2t = function ($this$sequence, completion) {
-    var i = new ProbSolveWithEvidence$computeAllSubstitutions$slambda(this.v3h_1, this.w3h_1, this.x3h_1, this.y3h_1, this.z3h_1, this.a3i_1, completion);
-    i.b3i_1 = $this$sequence;
+  ProbSolveWithEvidence$computeAllSubstitutions$slambda.prototype.x2t = function ($this$sequence, completion) {
+    var i = new ProbSolveWithEvidence$computeAllSubstitutions$slambda(this.y3h_1, this.z3h_1, this.a3i_1, this.b3i_1, this.c3i_1, this.d3i_1, completion);
+    i.e3i_1 = $this$sequence;
     return i;
   };
   function ProbSolveWithEvidence$computeAllSubstitutions$slambda_0($solutions, $goalExplanationVar, $evidenceExplanationTerm, $this_computeAllSubstitutions, $first, $second, resultContinuation) {
     var i = new ProbSolveWithEvidence$computeAllSubstitutions$slambda($solutions, $goalExplanationVar, $evidenceExplanationTerm, $this_computeAllSubstitutions, $first, $second, resultContinuation);
     var l = function ($this$sequence, $cont) {
-      return i.t2t($this$sequence, $cont);
+      return i.w2t($this$sequence, $cont);
     };
     l.$arity = 1;
     return l;
@@ -4414,13 +4414,13 @@
     ProblogLib_getInstance();
     WithoutSideEffects.call(this, 'prob' + '_solve_with_evidence');
   }
-  ProbSolveWithEvidence.prototype.r2p = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_19().h2h(_this__u8e3s4, 2);
-    Companion_getInstance_19().n2h(_this__u8e3s4, 2);
+  ProbSolveWithEvidence.prototype.u2p = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_19().k2h(_this__u8e3s4, 2);
+    Companion_getInstance_19().q2h(_this__u8e3s4, 2);
     var evidenceExplanationVar = Companion_getInstance_1().of('EvidenceExplanation');
     var tmp;
-    if (ProbSetConfig_getInstance().s3e(_this__u8e3s4.context)) {
-      tmp = toTerm(Companion_getInstance_21().l3d_1);
+    if (ProbSetConfig_getInstance().v3e(_this__u8e3s4.context)) {
+      tmp = toTerm(Companion_getInstance_21().o3d_1);
     } else {
       var tmp_0 = Companion_getInstance_3();
       var tmp$ret$0;
@@ -4428,7 +4428,7 @@
       var tmp0__get_functor__thl4dk = ProbSolveEvidence_getInstance();
       tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
       var subQuery = tmp_0.of(tmp$ret$0, [evidenceExplanationVar]);
-      var solution = _this__u8e3s4.subSolver().solveOnceWithOptions(subQuery, ProbSetConfig_getInstance().t3g(_this__u8e3s4.context));
+      var solution = _this__u8e3s4.subSolver().solveOnceWithOptions(subQuery, ProbSetConfig_getInstance().w3g(_this__u8e3s4.context));
       tmp = solution.r1u().a3(evidenceExplanationVar);
     }
     var evidenceExplanationTerm = tmp;
@@ -4439,11 +4439,11 @@
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp1__get_functor__4k11yf = ProbSolve_getInstance();
     tmp$ret$1 = tmp1__get_functor__4k11yf.signature.name;
-    var solutions = tmp_1.solveWithOptions(tmp_2.of(tmp$ret$1, [goalExplanationVar, third]), ProbSetConfig_getInstance().t3g(_this__u8e3s4.context));
+    var solutions = tmp_1.solveWithOptions(tmp_2.of(tmp$ret$1, [goalExplanationVar, third]), ProbSetConfig_getInstance().w3g(_this__u8e3s4.context));
     return sequence(ProbSolveWithEvidence$computeAllSubstitutions$slambda_0(solutions, goalExplanationVar, evidenceExplanationTerm, _this__u8e3s4, first, second, null));
   };
-  ProbSolveWithEvidence.prototype.n2j = function (_this__u8e3s4, first, second, third) {
-    return this.r2p(_this__u8e3s4, first, second, third);
+  ProbSolveWithEvidence.prototype.q2j = function (_this__u8e3s4, first, second, third) {
+    return this.u2p(_this__u8e3s4, first, second, third);
   };
   var ProbSolveWithEvidence_instance;
   function ProbSolveWithEvidence_getInstance() {
@@ -4456,10 +4456,10 @@
     ProblogLib_getInstance();
     RuleWrapper_init_$Init$('prob', 2, false, 4, null, this);
   }
-  Prob.prototype.g2k = function (_this__u8e3s4) {
+  Prob.prototype.j2k = function (_this__u8e3s4) {
     return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('EXPL'), _this__u8e3s4.varOf('GOAL')]);
   };
-  Prob.prototype.h2k = function (_this__u8e3s4) {
+  Prob.prototype.k2k = function (_this__u8e3s4) {
     var expl = _this__u8e3s4.varOf('EXPL');
     var goal = _this__u8e3s4.varOf('GOAL');
     var newGoal = _this__u8e3s4.varOf('NEW_GOAL');
@@ -4507,21 +4507,21 @@
   DefaultBuiltins.prototype.containsOperator = containsOperator;
   DefaultBuiltins.prototype.hasPrimitive = hasPrimitive;
   DefaultBuiltins.prototype.hasFunction = hasFunction;
-  DefaultBuiltins.prototype.j2e = get_ruleSignatures;
+  DefaultBuiltins.prototype.p2e = get_ruleSignatures;
   DefaultBuiltins.prototype.hasProtected = hasProtected;
   MinimalBuiltins.prototype.containsSignature = containsSignature;
   MinimalBuiltins.prototype.containsOperator = containsOperator;
   MinimalBuiltins.prototype.hasPrimitive = hasPrimitive;
   MinimalBuiltins.prototype.hasFunction = hasFunction;
-  MinimalBuiltins.prototype.j2e = get_ruleSignatures;
+  MinimalBuiltins.prototype.p2e = get_ruleSignatures;
   MinimalBuiltins.prototype.hasProtected = hasProtected;
   ProblogLib.prototype.containsSignature = containsSignature;
   ProblogLib.prototype.containsOperator = containsOperator;
   ProblogLib.prototype.hasPrimitive = hasPrimitive;
   ProblogLib.prototype.hasFunction = hasFunction;
-  ProblogLib.prototype.j2e = get_ruleSignatures;
+  ProblogLib.prototype.p2e = get_ruleSignatures;
   ProblogLib.prototype.hasProtected = hasProtected;
-  BinaryDecisionDiagramExplanation.prototype.y3d = get_probabilityOrNull;
+  BinaryDecisionDiagramExplanation.prototype.b3e = get_probabilityOrNull;
   //endregion
   //region block: init
   ANNOTATION_FUNCTOR = '::';