@tuprolog/2p-full 0.32.4 → 1.0.0

package/2p-solve-problog.js

@@ -217,7 +217,7 @@
   function get_probabilityOrNull() {
     var tmp;
     try {
-      tmp = this.w3c();
+      tmp = this.n3d();
     } catch ($p) {
       var tmp_0;
       if ($p instanceof Error) {
@@ -263,160 +263,160 @@
   //endregion
   function MutableProblogSolver(solver) {
     ProblogSolver.call(this, solver);
-    this.r3a_1 = solver;
+    this.i3b_1 = solver;
   }
-  protoOf(MutableProblogSolver).e36 = function (library) {
-    this.r3a_1.loadLibrary(library);
+  protoOf(MutableProblogSolver).v36 = function (library) {
+    this.i3b_1.loadLibrary(library);
   };
   protoOf(MutableProblogSolver).loadLibrary = function (library) {
-    return this.e36(library);
+    return this.v36(library);
   };
-  protoOf(MutableProblogSolver).f36 = function (library) {
-    this.r3a_1.unloadLibrary(library);
+  protoOf(MutableProblogSolver).w36 = function (library) {
+    this.i3b_1.unloadLibrary(library);
   };
   protoOf(MutableProblogSolver).unloadLibrary = function (library) {
-    return this.f36(library);
+    return this.w36(library);
   };
-  protoOf(MutableProblogSolver).g36 = function (libraries) {
-    this.r3a_1.setLibraries(libraries);
+  protoOf(MutableProblogSolver).x36 = function (libraries) {
+    this.i3b_1.setLibraries(libraries);
   };
   protoOf(MutableProblogSolver).setLibraries = function (libraries) {
-    return this.g36(libraries);
+    return this.x36(libraries);
   };
-  protoOf(MutableProblogSolver).h36 = function (theory) {
-    this.r3a_1.loadStaticKb(Companion_instance_11.ofIterable(this.r3a_1.j1l(), theory));
+  protoOf(MutableProblogSolver).y36 = function (theory) {
+    this.i3b_1.loadStaticKb(Companion_instance_11.ofIterable(this.i3b_1.f1l(), theory));
   };
   protoOf(MutableProblogSolver).loadStaticKb = function (theory) {
-    return this.h36(theory);
+    return this.y36(theory);
   };
-  protoOf(MutableProblogSolver).i36 = function (theory) {
-    this.r3a_1.appendStaticKb(Companion_instance_11.ofIterable(this.r3a_1.j1l(), theory));
+  protoOf(MutableProblogSolver).z36 = function (theory) {
+    this.i3b_1.appendStaticKb(Companion_instance_11.ofIterable(this.i3b_1.f1l(), theory));
   };
   protoOf(MutableProblogSolver).appendStaticKb = function (theory) {
-    return this.i36(theory);
+    return this.z36(theory);
   };
-  protoOf(MutableProblogSolver).j36 = function () {
-    this.r3a_1.resetStaticKb();
+  protoOf(MutableProblogSolver).a37 = function () {
+    this.i3b_1.resetStaticKb();
   };
   protoOf(MutableProblogSolver).resetStaticKb = function () {
-    return this.j36();
+    return this.a37();
   };
-  protoOf(MutableProblogSolver).k36 = function (theory) {
-    this.r3a_1.loadDynamicKb(Companion_instance_11.ofIterable(this.r3a_1.j1l(), theory));
+  protoOf(MutableProblogSolver).b37 = function (theory) {
+    this.i3b_1.loadDynamicKb(Companion_instance_11.ofIterable(this.i3b_1.f1l(), theory));
   };
   protoOf(MutableProblogSolver).loadDynamicKb = function (theory) {
-    return this.k36(theory);
+    return this.b37(theory);
   };
-  protoOf(MutableProblogSolver).l36 = function (theory) {
-    this.r3a_1.appendDynamicKb(Companion_instance_11.ofIterable(this.r3a_1.j1l(), theory));
+  protoOf(MutableProblogSolver).c37 = function (theory) {
+    this.i3b_1.appendDynamicKb(Companion_instance_11.ofIterable(this.i3b_1.f1l(), theory));
   };
   protoOf(MutableProblogSolver).appendDynamicKb = function (theory) {
-    return this.l36(theory);
+    return this.c37(theory);
   };
-  protoOf(MutableProblogSolver).m36 = function () {
-    this.r3a_1.resetDynamicKb();
+  protoOf(MutableProblogSolver).d37 = function () {
+    this.i3b_1.resetDynamicKb();
   };
   protoOf(MutableProblogSolver).resetDynamicKb = function () {
-    return this.m36();
+    return this.d37();
   };
-  protoOf(MutableProblogSolver).v1m = function (clause) {
-    this.r3a_1.assertA(first(Companion_instance_11.of(this.r3a_1.j1l(), [clause]).t1l()));
+  protoOf(MutableProblogSolver).r1m = function (clause) {
+    this.i3b_1.assertA(first(Companion_instance_11.of(this.i3b_1.f1l(), [clause]).p1l()));
   };
   protoOf(MutableProblogSolver).assertA = function (clause) {
-    return this.v1m(clause);
+    return this.r1m(clause);
   };
-  protoOf(MutableProblogSolver).n36 = function (fact) {
-    this.r3a_1.assertA(first(Companion_instance_11.of(this.r3a_1.j1l(), [Companion_instance.of(fact)]).t1l()));
+  protoOf(MutableProblogSolver).e37 = function (fact) {
+    this.i3b_1.assertA(first(Companion_instance_11.of(this.i3b_1.f1l(), [Companion_instance.of(fact)]).p1l()));
   };
   protoOf(MutableProblogSolver).assertAFact = function (fact) {
-    return this.n36(fact);
+    return this.e37(fact);
   };
-  protoOf(MutableProblogSolver).w1l = function (clause) {
-    this.r3a_1.assertZ(first(Companion_instance_11.of(this.r3a_1.j1l(), [clause]).t1l()));
+  protoOf(MutableProblogSolver).s1l = function (clause) {
+    this.i3b_1.assertZ(first(Companion_instance_11.of(this.i3b_1.f1l(), [clause]).p1l()));
   };
   protoOf(MutableProblogSolver).assertZ = function (clause) {
-    return this.w1l(clause);
+    return this.s1l(clause);
   };
-  protoOf(MutableProblogSolver).o36 = function (fact) {
-    this.r3a_1.assertA(first(Companion_instance_11.of(this.r3a_1.j1l(), [Companion_instance.of(fact)]).t1l()));
+  protoOf(MutableProblogSolver).f37 = function (fact) {
+    this.i3b_1.assertA(first(Companion_instance_11.of(this.i3b_1.f1l(), [Companion_instance.of(fact)]).p1l()));
   };
   protoOf(MutableProblogSolver).assertZFact = function (fact) {
-    return this.o36(fact);
+    return this.f37(fact);
   };
-  protoOf(MutableProblogSolver).d1t = function (clause) {
-    return this.r3a_1.retract(first(Companion_instance_11.of(this.r3a_1.j1l(), [clause]).t1l()));
+  protoOf(MutableProblogSolver).l1t = function (clause) {
+    return this.i3b_1.retract(first(Companion_instance_11.of(this.i3b_1.f1l(), [clause]).p1l()));
   };
   protoOf(MutableProblogSolver).retract = function (clause) {
-    return this.d1t(clause);
+    return this.l1t(clause);
   };
-  protoOf(MutableProblogSolver).e1t = function (fact) {
-    return this.r3a_1.retract(first(Companion_instance_11.of(this.r3a_1.j1l(), [Companion_instance.of(fact)]).t1l()));
+  protoOf(MutableProblogSolver).m1t = function (fact) {
+    return this.i3b_1.retract(first(Companion_instance_11.of(this.i3b_1.f1l(), [Companion_instance.of(fact)]).p1l()));
   };
   protoOf(MutableProblogSolver).retractByHead = function (fact) {
-    return this.e1t(fact);
+    return this.m1t(fact);
   };
-  protoOf(MutableProblogSolver).b1m = function (clause) {
-    return this.r3a_1.retractAll(first(Companion_instance_11.of(this.r3a_1.j1l(), [clause]).t1l()));
+  protoOf(MutableProblogSolver).x1l = function (clause) {
+    return this.i3b_1.retractAll(first(Companion_instance_11.of(this.i3b_1.f1l(), [clause]).p1l()));
   };
   protoOf(MutableProblogSolver).retractAll = function (clause) {
-    return this.b1m(clause);
+    return this.x1l(clause);
   };
-  protoOf(MutableProblogSolver).p36 = function (fact) {
-    return this.r3a_1.retractAll(first(Companion_instance_11.of(this.r3a_1.j1l(), [Companion_instance.of(fact)]).t1l()));
+  protoOf(MutableProblogSolver).g37 = function (fact) {
+    return this.i3b_1.retractAll(first(Companion_instance_11.of(this.i3b_1.f1l(), [Companion_instance.of(fact)]).p1l()));
   };
   protoOf(MutableProblogSolver).retractAllBeHead = function (fact) {
-    return this.p36(fact);
+    return this.g37(fact);
   };
-  protoOf(MutableProblogSolver).q36 = function (name, value) {
-    this.r3a_1.setFlag(name, value);
+  protoOf(MutableProblogSolver).h37 = function (name, value) {
+    this.i3b_1.setFlag(name, value);
   };
   protoOf(MutableProblogSolver).setFlag = function (name, value) {
-    return this.q36(name, value);
+    return this.h37(name, value);
   };
-  protoOf(MutableProblogSolver).r36 = function (flag) {
-    this.r3a_1.setFlagPair(flag);
+  protoOf(MutableProblogSolver).i37 = function (flag) {
+    this.i3b_1.setFlagPair(flag);
   };
   protoOf(MutableProblogSolver).setFlagPair = function (flag) {
-    return this.r36(flag);
+    return this.i37(flag);
   };
-  protoOf(MutableProblogSolver).s36 = function (flag) {
-    this.r3a_1.setFlagNotable(flag);
+  protoOf(MutableProblogSolver).j37 = function (flag) {
+    this.i3b_1.setFlagNotable(flag);
   };
   protoOf(MutableProblogSolver).setFlagNotable = function (flag) {
-    return this.s36(flag);
+    return this.j37(flag);
   };
-  protoOf(MutableProblogSolver).t36 = function (stdIn) {
-    this.r3a_1.setStandardInput(stdIn);
+  protoOf(MutableProblogSolver).k37 = function (stdIn) {
+    this.i3b_1.setStandardInput(stdIn);
   };
   protoOf(MutableProblogSolver).setStandardInput = function (stdIn) {
-    return this.t36(stdIn);
+    return this.k37(stdIn);
   };
-  protoOf(MutableProblogSolver).u36 = function (stdErr) {
-    this.r3a_1.setStandardError(stdErr);
+  protoOf(MutableProblogSolver).l37 = function (stdErr) {
+    this.i3b_1.setStandardError(stdErr);
   };
   protoOf(MutableProblogSolver).setStandardError = function (stdErr) {
-    return this.u36(stdErr);
+    return this.l37(stdErr);
   };
-  protoOf(MutableProblogSolver).v36 = function (stdOut) {
-    this.r3a_1.setStandardOutput(stdOut);
+  protoOf(MutableProblogSolver).m37 = function (stdOut) {
+    this.i3b_1.setStandardOutput(stdOut);
   };
   protoOf(MutableProblogSolver).setStandardOutput = function (stdOut) {
-    return this.v36(stdOut);
+    return this.m37(stdOut);
   };
-  protoOf(MutableProblogSolver).w36 = function (warnings) {
-    this.r3a_1.setWarnings(warnings);
+  protoOf(MutableProblogSolver).n37 = function (warnings) {
+    this.i3b_1.setWarnings(warnings);
   };
   protoOf(MutableProblogSolver).setWarnings = function (warnings) {
-    return this.w36(warnings);
+    return this.n37(warnings);
   };
-  protoOf(MutableProblogSolver).l1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new MutableProblogSolver(this.r3a_1.l1v(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings));
+  protoOf(MutableProblogSolver).t1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+    return new MutableProblogSolver(this.i3b_1.t1v(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings));
   };
-  protoOf(MutableProblogSolver).y1s = function () {
-    return new MutableProblogSolver(this.r3a_1.y1s());
+  protoOf(MutableProblogSolver).u1s = function () {
+    return new MutableProblogSolver(this.i3b_1.u1s());
   };
   protoOf(MutableProblogSolver).clone = function () {
-    return this.y1s();
+    return this.u1s();
   };
   function get_ANNOTATION_OPERATOR() {
     _init_properties_Operators_kt__ggskrn();
@@ -448,11 +448,11 @@
     var tmp_0 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = ProbSetConfig_getInstance().signature.name;
-    var tmp_1 = tmp_0.of(tmp$ret$0, [ProbSetConfig_getInstance().f3b(options)]);
+    var tmp_1 = tmp_0.of(tmp$ret$0, [ProbSetConfig_getInstance().w3b(options)]);
     var tmp_2 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$1 = Prob_getInstance().signature.name;
-    var tmp_3 = $this.s3a_1.solveWithOptions(tmp.of(tmp_1, tmp_2.of(tmp$ret$1, [anonVar, goal])), options);
+    var tmp_3 = $this.j3b_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) {
@@ -461,7 +461,7 @@
     var tmp = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = ProbQuery_getInstance().signature.name;
-    var tmp_0 = $this.s3a_1.solveWithOptions(tmp.of(tmp$ret$0, [probabilityVar, goal, ProbSetConfig_getInstance().f3b(options), bddVar]), options);
+    var tmp_0 = $this.j3b_1.solveWithOptions(tmp.of(tmp$ret$0, [probabilityVar, goal, ProbSetConfig_getInstance().w3b(options), bddVar]), options);
     return map(tmp_0, ProblogSolver$solveProbabilistically$lambda(probabilityVar, bddVar, goal, options));
   }
   function ProblogSolver$solveNonProbabilistically$lambda$lambda($anonVar) {
@@ -474,11 +474,11 @@
       var tmp;
       if (isInterface(it, Yes)) {
         var tmp_0 = Companion_instance_1;
-        var tmp_1 = it.q1u();
-        tmp = tmp_0.g1w($goal, tmp_1.r12(ProblogSolver$solveNonProbabilistically$lambda$lambda($anonVar)));
+        var tmp_1 = it.y1u();
+        tmp = tmp_0.o1w($goal, tmp_1.r12(ProblogSolver$solveNonProbabilistically$lambda$lambda($anonVar)));
       } else {
         if (isInterface(it, Halt)) {
-          tmp = Companion_instance_1.halt($goal, it.x1v());
+          tmp = Companion_instance_1.halt($goal, it.f1w());
         } else {
           tmp = Companion_instance_1.no($goal);
         }
@@ -493,16 +493,16 @@
   }
   function ProblogSolver$solveProbabilistically$lambda($probabilityVar, $bddVar, $goal, $options) {
     return function (it) {
-      var probabilityTerm = it.q1u().x2($probabilityVar);
-      var bddTerm = it.q1u().x2($bddVar);
+      var probabilityTerm = it.y1u().x2($probabilityVar);
+      var bddTerm = it.y1u().x2($bddVar);
       var tmp;
       if (isInterface(it, Yes)) {
         var tmp_0 = Companion_instance_1;
-        var tmp_1 = it.q1u();
-        tmp = tmp_0.g1w($goal, tmp_1.r12(ProblogSolver$solveProbabilistically$lambda$lambda($probabilityVar, $bddVar)));
+        var tmp_1 = it.y1u();
+        tmp = tmp_0.o1w($goal, tmp_1.r12(ProblogSolver$solveProbabilistically$lambda$lambda($probabilityVar, $bddVar)));
       } else {
         if (isInterface(it, Halt)) {
-          tmp = Companion_instance_1.halt($goal, it.x1v());
+          tmp = Companion_instance_1.halt($goal, it.f1w());
         } else {
           tmp = Companion_instance_1.no($goal);
         }
@@ -527,9 +527,9 @@
           tmp_5 = false;
         }
         if (tmp_5) {
-          var explanation = bddTerm.g3b_1;
+          var explanation = bddTerm.x3b_1;
           if (explanation instanceof BinaryDecisionDiagramExplanation) {
-            newSolution = setBinaryDecisionDiagram(newSolution, explanation.i3b_1);
+            newSolution = setBinaryDecisionDiagram(newSolution, explanation.z3b_1);
           }
         }
         tmp_2 = newSolution;
@@ -538,45 +538,45 @@
     };
   }
   function ProblogSolver(solver) {
-    this.s3a_1 = solver;
+    this.j3b_1 = solver;
   }
-  protoOf(ProblogSolver).x1u = function () {
-    return this.s3a_1.x1u();
+  protoOf(ProblogSolver).f1v = function () {
+    return this.j3b_1.f1v();
   };
-  protoOf(ProblogSolver).v1u = function () {
-    return this.s3a_1.v1u();
+  protoOf(ProblogSolver).d1v = function () {
+    return this.j3b_1.d1v();
   };
-  protoOf(ProblogSolver).y1u = function () {
-    return this.s3a_1.y1u();
+  protoOf(ProblogSolver).g1v = function () {
+    return this.j3b_1.g1v();
   };
-  protoOf(ProblogSolver).u1u = function () {
-    return this.s3a_1.u1u();
+  protoOf(ProblogSolver).c1v = function () {
+    return this.j3b_1.c1v();
   };
-  protoOf(ProblogSolver).d1v = function () {
-    return this.s3a_1.d1v();
+  protoOf(ProblogSolver).l1v = function () {
+    return this.j3b_1.l1v();
   };
-  protoOf(ProblogSolver).z1u = function () {
-    return this.s3a_1.z1u();
+  protoOf(ProblogSolver).h1v = function () {
+    return this.j3b_1.h1v();
   };
-  protoOf(ProblogSolver).g1v = function () {
-    return this.s3a_1.g1v();
+  protoOf(ProblogSolver).o1v = function () {
+    return this.j3b_1.o1v();
   };
-  protoOf(ProblogSolver).e1v = function () {
-    return this.s3a_1.e1v();
+  protoOf(ProblogSolver).m1v = function () {
+    return this.j3b_1.m1v();
   };
-  protoOf(ProblogSolver).f1v = function () {
-    return this.s3a_1.f1v();
+  protoOf(ProblogSolver).n1v = function () {
+    return this.j3b_1.n1v();
   };
-  protoOf(ProblogSolver).w1u = function () {
-    return this.s3a_1.w1u();
+  protoOf(ProblogSolver).e1v = function () {
+    return this.j3b_1.e1v();
   };
-  protoOf(ProblogSolver).j1l = function () {
-    return this.s3a_1.j1l();
+  protoOf(ProblogSolver).f1l = function () {
+    return this.j3b_1.f1l();
   };
-  protoOf(ProblogSolver).h1v = function () {
-    return this.s3a_1.h1v();
+  protoOf(ProblogSolver).p1v = function () {
+    return this.j3b_1.p1v();
   };
-  protoOf(ProblogSolver).h2b = function (goal, options) {
+  protoOf(ProblogSolver).p2b = function (goal, options) {
     var tmp;
     if (!get_isProbabilistic(options)) {
       tmp = solveNonProbabilistically(this, goal, options);
@@ -586,64 +586,64 @@
     return tmp;
   };
   protoOf(ProblogSolver).solveWithOptions = function (goal, options) {
-    return this.h2b(goal, options);
+    return this.p2b(goal, options);
   };
-  protoOf(ProblogSolver).t3a = function (goal, timeout) {
-    return this.h2b(goal, Companion_getInstance_2().allLazilyWithTimeout(timeout));
+  protoOf(ProblogSolver).k3b = function (goal, timeout) {
+    return this.p2b(goal, Companion_getInstance_2().allLazilyWithTimeout(timeout));
   };
   protoOf(ProblogSolver).solveWithTimeout = function (goal, timeout) {
-    return this.t3a(goal, timeout);
+    return this.k3b(goal, timeout);
   };
-  protoOf(ProblogSolver).u3a = function (goal) {
-    return this.h2b(goal, Companion_getInstance_2().DEFAULT);
+  protoOf(ProblogSolver).l3b = function (goal) {
+    return this.p2b(goal, Companion_getInstance_2().DEFAULT);
   };
   protoOf(ProblogSolver).solve = function (goal) {
-    return this.u3a(goal);
+    return this.l3b(goal);
   };
-  protoOf(ProblogSolver).v3a = function (goal, timeout) {
-    return toList(this.t3a(goal, timeout));
+  protoOf(ProblogSolver).m3b = function (goal, timeout) {
+    return toList(this.k3b(goal, timeout));
   };
   protoOf(ProblogSolver).solveListWithTimeout = function (goal, timeout) {
-    return this.v3a(goal, timeout);
+    return this.m3b(goal, timeout);
   };
-  protoOf(ProblogSolver).w3a = function (goal) {
-    return toList(this.u3a(goal));
+  protoOf(ProblogSolver).n3b = function (goal) {
+    return toList(this.l3b(goal));
   };
   protoOf(ProblogSolver).solveList = function (goal) {
-    return this.w3a(goal);
+    return this.n3b(goal);
   };
-  protoOf(ProblogSolver).x3a = function (goal, options) {
-    return toList(this.h2b(goal, options));
+  protoOf(ProblogSolver).o3b = function (goal, options) {
+    return toList(this.p2b(goal, options));
   };
   protoOf(ProblogSolver).solveListWithOptions = function (goal, options) {
-    return this.x3a(goal, options);
+    return this.o3b(goal, options);
   };
-  protoOf(ProblogSolver).y3a = function (goal, timeout) {
-    return first_0(this.h2b(goal, Companion_getInstance_2().someLazilyWithTimeout(1, timeout)));
+  protoOf(ProblogSolver).p3b = function (goal, timeout) {
+    return first_0(this.p2b(goal, Companion_getInstance_2().someLazilyWithTimeout(1, timeout)));
   };
   protoOf(ProblogSolver).solveOnceWithTimeout = function (goal, timeout) {
-    return this.y3a(goal, timeout);
+    return this.p3b(goal, timeout);
   };
-  protoOf(ProblogSolver).z3a = function (goal) {
-    return first_0(this.h2b(goal, Companion_getInstance_2().someLazily(1)));
+  protoOf(ProblogSolver).q3b = function (goal) {
+    return first_0(this.p2b(goal, Companion_getInstance_2().someLazily(1)));
   };
   protoOf(ProblogSolver).solveOnce = function (goal) {
-    return this.z3a(goal);
+    return this.q3b(goal);
   };
-  protoOf(ProblogSolver).a3b = function (goal, options) {
-    return first_0(this.h2b(goal, options.setLimit(1)));
+  protoOf(ProblogSolver).r3b = function (goal, options) {
+    return first_0(this.p2b(goal, options.setLimit(1)));
   };
   protoOf(ProblogSolver).solveOnceWithOptions = function (goal, options) {
-    return this.a3b(goal, options);
+    return this.r3b(goal, options);
   };
-  protoOf(ProblogSolver).l1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new ProblogSolver(this.s3a_1.l1v(unificator, libraries, flags, Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
+  protoOf(ProblogSolver).t1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+    return new ProblogSolver(this.j3b_1.t1v(unificator, libraries, flags, Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
   };
-  protoOf(ProblogSolver).y1s = function () {
-    return new ProblogSolver(this.s3a_1.clone());
+  protoOf(ProblogSolver).u1s = function () {
+    return new ProblogSolver(this.j3b_1.clone());
   };
   protoOf(ProblogSolver).clone = function () {
-    return this.y1s();
+    return this.u1s();
   };
   function ensureVariablesTracking($this, flags) {
     var tmp = TrackVariables_getInstance();
@@ -653,7 +653,7 @@
     var tmp;
     // Inline function 'kotlin.collections.contains' call
     // Inline function 'kotlin.collections.containsKey' call
-    var key = ProblogLib_getInstance().s2d();
+    var key = ProblogLib_getInstance().j2e();
     if (!(isInterface(libraries, Map) ? libraries : THROW_CCE()).u2(key)) {
       tmp = libraries.plusLibrary(MinimalBuiltins_getInstance());
     } else {
@@ -662,27 +662,27 @@
     return tmp;
   }
   function ProblogSolverFactory$ensureVariablesTracking$lambda($this$invoke) {
-    return $this$invoke.z28_1;
+    return $this$invoke.h29_1;
   }
   function ProblogSolverFactory() {
   }
-  protoOf(ProblogSolverFactory).v1x = function () {
+  protoOf(ProblogSolverFactory).d1y = function () {
     return DefaultBuiltins_getInstance_0();
   };
-  protoOf(ProblogSolverFactory).x1x = function () {
+  protoOf(ProblogSolverFactory).f1y = function () {
     return ensureVariablesTracking(this, get_defaultFlags.call(this));
   };
-  protoOf(ProblogSolverFactory).g1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
-    return new ProblogSolver(ClassicSolverFactory_instance.g1y(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), inputs, outputs));
+  protoOf(ProblogSolverFactory).o1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+    return new ProblogSolver(ClassicSolverFactory_instance.o1y(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), inputs, outputs));
   };
-  protoOf(ProblogSolverFactory).m1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new ProblogSolver(ClassicSolverFactory_instance.m1y(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
+  protoOf(ProblogSolverFactory).u1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+    return new ProblogSolver(ClassicSolverFactory_instance.u1y(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
   };
-  protoOf(ProblogSolverFactory).o1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new MutableProblogSolver(ClassicSolverFactory_instance.o1y(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
+  protoOf(ProblogSolverFactory).w1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+    return new MutableProblogSolver(ClassicSolverFactory_instance.w1y(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
   };
-  protoOf(ProblogSolverFactory).q1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
-    return new MutableProblogSolver(ClassicSolverFactory_instance.q1y(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), inputs, outputs));
+  protoOf(ProblogSolverFactory).y1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+    return new MutableProblogSolver(ClassicSolverFactory_instance.y1y(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_11.ofIterable(unificator, staticKb), Companion_instance_11.ofIterable(unificator, dynamicKb), inputs, outputs));
   };
   var ProblogSolverFactory_instance;
   function ProblogSolverFactory_getInstance() {
@@ -692,17 +692,17 @@
     DefaultBuiltins_instance = this;
     ExtensionLibrary.call(this, DefaultBuiltins_getInstance());
   }
-  protoOf(DefaultBuiltins).s2d = function () {
-    return ProblogLib_getInstance().s2d();
+  protoOf(DefaultBuiltins).j2e = function () {
+    return ProblogLib_getInstance().j2e();
   };
-  protoOf(DefaultBuiltins).d2e = function () {
-    return ProblogLib_getInstance().d2e();
+  protoOf(DefaultBuiltins).u2e = function () {
+    return ProblogLib_getInstance().u2e();
   };
-  protoOf(DefaultBuiltins).f2e = function () {
-    return ProblogLib_getInstance().f2e();
+  protoOf(DefaultBuiltins).w2e = function () {
+    return ProblogLib_getInstance().w2e();
   };
-  protoOf(DefaultBuiltins).e2e = function () {
-    return ProblogLib_getInstance().e2e();
+  protoOf(DefaultBuiltins).v2e = function () {
+    return ProblogLib_getInstance().v2e();
   };
   var DefaultBuiltins_instance;
   function DefaultBuiltins_getInstance_0() {
@@ -714,10 +714,10 @@
     MinimalBuiltins_instance = this;
     ExtensionLibrary.call(this, ProblogLib_getInstance());
   }
-  protoOf(MinimalBuiltins).f2e = function () {
+  protoOf(MinimalBuiltins).w2e = function () {
     return listOf(EnsureExecutable_getInstance());
   };
-  protoOf(MinimalBuiltins).e2e = function () {
+  protoOf(MinimalBuiltins).v2e = function () {
     return listOf(Call_getInstance());
   };
   var MinimalBuiltins_instance;
@@ -729,17 +729,17 @@
   function ProblogLib() {
     ProblogLib_instance = this;
     ExtensionLibrary.call(this, Companion_getInstance_3().of('problog.lang'));
-    this.z3b_1 = 'EXPL';
-    this.a3c_1 = 'evidence';
-    this.b3c_1 = 'prob';
+    this.q3c_1 = 'EXPL';
+    this.r3c_1 = 'evidence';
+    this.s3c_1 = 'prob';
   }
-  protoOf(ProblogLib).d2e = function () {
+  protoOf(ProblogLib).u2e = function () {
     return get_PROBLOG_SPECIFIC_OPERATORS();
   };
-  protoOf(ProblogLib).e2e = function () {
+  protoOf(ProblogLib).v2e = function () {
     return listOf(Prob_getInstance());
   };
-  protoOf(ProblogLib).f2e = function () {
+  protoOf(ProblogLib).w2e = function () {
     return listOf_0([ProbHelper_getInstance(), ProbSolve_getInstance(), ProbExplAnd_getInstance(), ProbQuery_getInstance(), ProbSolveEvidence_getInstance(), ProbSolveWithEvidence_getInstance(), ProbNegationAsFailure_getInstance(), ProbSetConfig_getInstance()]);
   };
   var ProblogLib_instance;
@@ -752,10 +752,10 @@
     cause = cause === VOID ? null : cause;
     TuPrologException_init_$Init$(cause, this);
     captureStack(this, ClauseMappingException);
-    this.i3c_1 = message;
+    this.z3c_1 = message;
   }
   protoOf(ClauseMappingException).na = function () {
-    return this.i3c_1;
+    return this.z3c_1;
   };
   function Companion() {
   }
@@ -792,11 +792,11 @@
   }
   function Companion_0() {
     Companion_instance_10 = this;
-    this.j3c_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(false), Companion_getInstance_13().m3c_1);
-    this.k3c_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(true), Companion_getInstance_13().n3c_1);
+    this.a3d_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(false), Companion_getInstance_13().d3d_1);
+    this.b3d_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(true), Companion_getInstance_13().e3d_1);
   }
-  protoOf(Companion_0).o3c = function (term) {
-    return new BinaryDecisionDiagramExplanation(bddOf(term), new ComputedValue(term.q3c_1));
+  protoOf(Companion_0).f3d = function (term) {
+    return new BinaryDecisionDiagramExplanation(bddOf(term), new ComputedValue(term.h3d_1));
   };
   var Companion_instance_10;
   function Companion_getInstance_11() {
@@ -820,284 +820,284 @@
     };
   }
   function ProbExplanationTerm(explanation) {
-    this.g3b_1 = explanation;
-    this.h3b_1 = Companion_getInstance_4().of('<expl:' + explanation + '>');
+    this.x3b_1 = explanation;
+    this.y3b_1 = Companion_getInstance_4().of('<expl:' + explanation + '>');
   }
   protoOf(ProbExplanationTerm).rw = function () {
-    return this.h3b_1.rw();
+    return this.y3b_1.rw();
   };
   protoOf(ProbExplanationTerm).jx = function () {
-    return this.h3b_1.jx();
+    return this.y3b_1.jx();
   };
   protoOf(ProbExplanationTerm).kw = function () {
-    return this.h3b_1.kw();
+    return this.y3b_1.kw();
   };
   protoOf(ProbExplanationTerm).qw = function () {
-    return this.h3b_1.qw();
+    return this.y3b_1.qw();
   };
   protoOf(ProbExplanationTerm).ix = function () {
-    return this.h3b_1.ix();
+    return this.y3b_1.ix();
   };
   protoOf(ProbExplanationTerm).lw = function () {
-    return this.h3b_1.lw();
+    return this.y3b_1.lw();
   };
   protoOf(ProbExplanationTerm).xw = function () {
-    return this.h3b_1.xw();
+    return this.y3b_1.xw();
   };
   protoOf(ProbExplanationTerm).dx = function () {
-    return this.h3b_1.dx();
+    return this.y3b_1.dx();
   };
   protoOf(ProbExplanationTerm).mw = function () {
-    return this.h3b_1.mw();
+    return this.y3b_1.mw();
   };
   protoOf(ProbExplanationTerm).nw = function () {
-    return this.h3b_1.nw();
+    return this.y3b_1.nw();
   };
   protoOf(ProbExplanationTerm).hx = function () {
-    return this.h3b_1.hx();
+    return this.y3b_1.hx();
   };
   protoOf(ProbExplanationTerm).fx = function () {
-    return this.h3b_1.fx();
+    return this.y3b_1.fx();
   };
   protoOf(ProbExplanationTerm).rx = function () {
-    return this.h3b_1.rx();
+    return this.y3b_1.rx();
   };
   protoOf(ProbExplanationTerm).cx = function () {
-    return this.h3b_1.cx();
+    return this.y3b_1.cx();
   };
   protoOf(ProbExplanationTerm).qx = function () {
-    return this.h3b_1.qx();
+    return this.y3b_1.qx();
   };
   protoOf(ProbExplanationTerm).sx = function () {
-    return this.h3b_1.sx();
+    return this.y3b_1.sx();
   };
   protoOf(ProbExplanationTerm).ox = function () {
-    return this.h3b_1.ox();
+    return this.y3b_1.ox();
   };
   protoOf(ProbExplanationTerm).yw = function () {
-    return this.h3b_1.yw();
+    return this.y3b_1.yw();
   };
   protoOf(ProbExplanationTerm).ww = function () {
-    return this.h3b_1.ww();
+    return this.y3b_1.ww();
   };
   protoOf(ProbExplanationTerm).ow = function () {
-    return this.h3b_1.ow();
+    return this.y3b_1.ow();
   };
   protoOf(ProbExplanationTerm).nx = function () {
-    return this.h3b_1.nx();
+    return this.y3b_1.nx();
   };
   protoOf(ProbExplanationTerm).bx = function () {
-    return this.h3b_1.bx();
+    return this.y3b_1.bx();
   };
   protoOf(ProbExplanationTerm).mx = function () {
-    return this.h3b_1.mx();
+    return this.y3b_1.mx();
   };
   protoOf(ProbExplanationTerm).vt = function () {
-    return this.h3b_1.vt();
+    return this.y3b_1.vt();
   };
   protoOf(ProbExplanationTerm).r2 = function () {
-    return this.h3b_1.r2();
+    return this.y3b_1.r2();
   };
   protoOf(ProbExplanationTerm).sw = function () {
-    return this.h3b_1.sw();
+    return this.y3b_1.sw();
   };
   protoOf(ProbExplanationTerm).accept = function (visitor) {
-    return this.h3b_1.accept(visitor);
+    return this.y3b_1.accept(visitor);
   };
   protoOf(ProbExplanationTerm).addFirst = function (argument) {
-    return this.h3b_1.addFirst(argument);
+    return this.y3b_1.addFirst(argument);
   };
   protoOf(ProbExplanationTerm).addLast = function (argument) {
-    return this.h3b_1.addLast(argument);
+    return this.y3b_1.addLast(argument);
   };
   protoOf(ProbExplanationTerm).append = function (argument) {
-    return this.h3b_1.append(argument);
+    return this.y3b_1.append(argument);
   };
   protoOf(ProbExplanationTerm).vw = function () {
-    return this.h3b_1.vw();
+    return this.y3b_1.vw();
   };
   protoOf(ProbExplanationTerm).asAtom = function () {
     return this.vw();
   };
   protoOf(ProbExplanationTerm).asBlock = function () {
-    return this.h3b_1.asBlock();
+    return this.y3b_1.asBlock();
   };
   protoOf(ProbExplanationTerm).asClause = function () {
-    return this.h3b_1.asClause();
+    return this.y3b_1.asClause();
   };
   protoOf(ProbExplanationTerm).asCons = function () {
-    return this.h3b_1.asCons();
+    return this.y3b_1.asCons();
   };
   protoOf(ProbExplanationTerm).asDirective = function () {
-    return this.h3b_1.asDirective();
+    return this.y3b_1.asDirective();
   };
   protoOf(ProbExplanationTerm).asEmptyBlock = function () {
-    return this.h3b_1.asEmptyBlock();
+    return this.y3b_1.asEmptyBlock();
   };
   protoOf(ProbExplanationTerm).asEmptyList = function () {
-    return this.h3b_1.asEmptyList();
+    return this.y3b_1.asEmptyList();
   };
   protoOf(ProbExplanationTerm).asFact = function () {
-    return this.h3b_1.asFact();
+    return this.y3b_1.asFact();
   };
   protoOf(ProbExplanationTerm).asIndicator = function () {
-    return this.h3b_1.asIndicator();
+    return this.y3b_1.asIndicator();
   };
   protoOf(ProbExplanationTerm).asInteger = function () {
-    return this.h3b_1.asInteger();
+    return this.y3b_1.asInteger();
   };
   protoOf(ProbExplanationTerm).asList = function () {
-    return this.h3b_1.asList();
+    return this.y3b_1.asList();
   };
   protoOf(ProbExplanationTerm).asNumeric = function () {
-    return this.h3b_1.asNumeric();
+    return this.y3b_1.asNumeric();
   };
   protoOf(ProbExplanationTerm).asReal = function () {
-    return this.h3b_1.asReal();
+    return this.y3b_1.asReal();
   };
   protoOf(ProbExplanationTerm).asRecursive = function () {
-    return this.h3b_1.asRecursive();
+    return this.y3b_1.asRecursive();
   };
   protoOf(ProbExplanationTerm).asRule = function () {
-    return this.h3b_1.asRule();
+    return this.y3b_1.asRule();
   };
   protoOf(ProbExplanationTerm).gx = function () {
-    return this.h3b_1.gx();
+    return this.y3b_1.gx();
   };
   protoOf(ProbExplanationTerm).asStruct = function () {
     return this.gx();
   };
   protoOf(ProbExplanationTerm).asTerm = function () {
-    return this.h3b_1.asTerm();
+    return this.y3b_1.asTerm();
   };
   protoOf(ProbExplanationTerm).asTruth = function () {
-    return this.h3b_1.asTruth();
+    return this.y3b_1.asTruth();
   };
   protoOf(ProbExplanationTerm).asTuple = function () {
-    return this.h3b_1.asTuple();
+    return this.y3b_1.asTuple();
   };
   protoOf(ProbExplanationTerm).asVar = function () {
-    return this.h3b_1.asVar();
+    return this.y3b_1.asVar();
   };
   protoOf(ProbExplanationTerm).kx = function () {
-    return this.h3b_1.kx();
+    return this.y3b_1.kx();
   };
   protoOf(ProbExplanationTerm).br = function () {
     return this.kx();
   };
   protoOf(ProbExplanationTerm).castToAtom = function () {
-    return this.h3b_1.castToAtom();
+    return this.y3b_1.castToAtom();
   };
   protoOf(ProbExplanationTerm).castToBlock = function () {
-    return this.h3b_1.castToBlock();
+    return this.y3b_1.castToBlock();
   };
   protoOf(ProbExplanationTerm).castToClause = function () {
-    return this.h3b_1.castToClause();
+    return this.y3b_1.castToClause();
   };
   protoOf(ProbExplanationTerm).castToCons = function () {
-    return this.h3b_1.castToCons();
+    return this.y3b_1.castToCons();
   };
   protoOf(ProbExplanationTerm).castToConstant = function () {
-    return this.h3b_1.castToConstant();
+    return this.y3b_1.castToConstant();
   };
   protoOf(ProbExplanationTerm).castToDirective = function () {
-    return this.h3b_1.castToDirective();
+    return this.y3b_1.castToDirective();
   };
   protoOf(ProbExplanationTerm).castToEmptyBlock = function () {
-    return this.h3b_1.castToEmptyBlock();
+    return this.y3b_1.castToEmptyBlock();
   };
   protoOf(ProbExplanationTerm).castToEmptyList = function () {
-    return this.h3b_1.castToEmptyList();
+    return this.y3b_1.castToEmptyList();
   };
   protoOf(ProbExplanationTerm).castToFact = function () {
-    return this.h3b_1.castToFact();
+    return this.y3b_1.castToFact();
   };
   protoOf(ProbExplanationTerm).castToIndicator = function () {
-    return this.h3b_1.castToIndicator();
+    return this.y3b_1.castToIndicator();
   };
   protoOf(ProbExplanationTerm).castToInteger = function () {
-    return this.h3b_1.castToInteger();
+    return this.y3b_1.castToInteger();
   };
   protoOf(ProbExplanationTerm).castToList = function () {
-    return this.h3b_1.castToList();
+    return this.y3b_1.castToList();
   };
   protoOf(ProbExplanationTerm).castToNumeric = function () {
-    return this.h3b_1.castToNumeric();
+    return this.y3b_1.castToNumeric();
   };
   protoOf(ProbExplanationTerm).castToReal = function () {
-    return this.h3b_1.castToReal();
+    return this.y3b_1.castToReal();
   };
   protoOf(ProbExplanationTerm).castToRecursive = function () {
-    return this.h3b_1.castToRecursive();
+    return this.y3b_1.castToRecursive();
   };
   protoOf(ProbExplanationTerm).castToRule = function () {
-    return this.h3b_1.castToRule();
+    return this.y3b_1.castToRule();
   };
   protoOf(ProbExplanationTerm).castToStruct = function () {
-    return this.h3b_1.castToStruct();
+    return this.y3b_1.castToStruct();
   };
   protoOf(ProbExplanationTerm).castToTerm = function () {
-    return this.h3b_1.castToTerm();
+    return this.y3b_1.castToTerm();
   };
   protoOf(ProbExplanationTerm).castToTruth = function () {
-    return this.h3b_1.castToTruth();
+    return this.y3b_1.castToTruth();
   };
   protoOf(ProbExplanationTerm).castToTuple = function () {
-    return this.h3b_1.castToTuple();
+    return this.y3b_1.castToTuple();
   };
   protoOf(ProbExplanationTerm).castToVar = function () {
-    return this.h3b_1.castToVar();
+    return this.y3b_1.castToVar();
   };
   protoOf(ProbExplanationTerm).lx = function (other) {
-    return this.h3b_1.lx(other);
+    return this.y3b_1.lx(other);
   };
   protoOf(ProbExplanationTerm).d = function (other) {
     return this.lx((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   protoOf(ProbExplanationTerm).containsTag = function (name) {
-    return this.h3b_1.containsTag(name);
+    return this.y3b_1.containsTag(name);
   };
   protoOf(ProbExplanationTerm).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.h3b_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.y3b_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(ProbExplanationTerm).equals = function (other) {
-    return this.h3b_1.equals(other);
+    return this.y3b_1.equals(other);
   };
   protoOf(ProbExplanationTerm).get = function (index) {
-    return this.h3b_1.get(index);
+    return this.y3b_1.get(index);
   };
   protoOf(ProbExplanationTerm).getArgAt = function (index) {
-    return this.h3b_1.getArgAt(index);
+    return this.y3b_1.getArgAt(index);
   };
   protoOf(ProbExplanationTerm).getTag = function (name) {
-    return this.h3b_1.getTag(name);
+    return this.y3b_1.getTag(name);
   };
   protoOf(ProbExplanationTerm).hashCode = function () {
-    return this.h3b_1.hashCode();
+    return this.y3b_1.hashCode();
   };
   protoOf(ProbExplanationTerm).insertAt = function (index, argument) {
-    return this.h3b_1.insertAt(index, argument);
+    return this.y3b_1.insertAt(index, argument);
   };
   protoOf(ProbExplanationTerm).resetTags = function (tags) {
-    return this.h3b_1.resetTags(tags);
+    return this.y3b_1.resetTags(tags);
   };
   protoOf(ProbExplanationTerm).setArgs = function (args) {
-    return this.h3b_1.setArgs(args);
+    return this.y3b_1.setArgs(args);
   };
   protoOf(ProbExplanationTerm).setArgsIterable = function (args) {
-    return this.h3b_1.setArgsIterable(args);
+    return this.y3b_1.setArgsIterable(args);
   };
   protoOf(ProbExplanationTerm).setArgsSequence = function (args) {
-    return this.h3b_1.setArgsSequence(args);
+    return this.y3b_1.setArgsSequence(args);
   };
   protoOf(ProbExplanationTerm).setFunctor = function (functor) {
-    return this.h3b_1.setFunctor(functor);
+    return this.y3b_1.setFunctor(functor);
   };
   protoOf(ProbExplanationTerm).structurallyEquals = function (other) {
-    return this.h3b_1.structurallyEquals(other);
+    return this.y3b_1.structurallyEquals(other);
   };
   protoOf(ProbExplanationTerm).toString = function () {
-    return this.h3b_1.toString();
+    return this.y3b_1.toString();
   };
   protoOf(ProbExplanationTerm).px = function () {
     return false;
@@ -1109,35 +1109,35 @@
     return this.tx();
   };
   protoOf(ProbExplanationTerm).tw = function () {
-    return new ProbExplanationTerm(this.g3b_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda));
+    return new ProbExplanationTerm(this.x3b_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda));
   };
   protoOf(ProbExplanationTerm).freshCopy = function () {
     return this.tw();
   };
   protoOf(ProbExplanationTerm).uw = function (scope) {
-    return new ProbExplanationTerm(this.g3b_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda_0(scope)));
+    return new ProbExplanationTerm(this.x3b_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda_0(scope)));
   };
   protoOf(ProbExplanationTerm).freshCopyFromScope = function (scope) {
     return this.uw(scope);
   };
-  protoOf(ProbExplanationTerm).a2o = function (substitution, substitutions) {
-    return this.b2o(substitution, substitutions.slice());
+  protoOf(ProbExplanationTerm).r2o = function (substitution, substitutions) {
+    return this.s2o(substitution, substitutions.slice());
   };
   protoOf(ProbExplanationTerm).getSubstituted = function (substitution, substitutions) {
-    return this.a2o(substitution, substitutions);
+    return this.r2o(substitution, substitutions);
   };
-  protoOf(ProbExplanationTerm).b2o = function (substitution, substitutions) {
+  protoOf(ProbExplanationTerm).s2o = function (substitution, substitutions) {
     return this.w16(Companion_getInstance_5().ofSubstitution(substitution, substitutions.slice()));
   };
   protoOf(ProbExplanationTerm).apply = function (substitution, substitutions) {
-    return this.b2o(substitution, substitutions);
+    return this.s2o(substitution, substitutions);
   };
   protoOf(ProbExplanationTerm).w16 = function (substitution) {
     var tmp;
     if (substitution.y() ? true : this.ux()) {
       tmp = this;
     } else {
-      tmp = new ProbExplanationTerm(this.g3b_1.applyTransformation(ProbExplanationTerm$apply$lambda(substitution)));
+      tmp = new ProbExplanationTerm(this.x3b_1.applyTransformation(ProbExplanationTerm$apply$lambda(substitution)));
     }
     return tmp;
   };
@@ -1145,22 +1145,22 @@
     return this.w16(substitution);
   };
   protoOf(ProbExplanationTerm).ux = function () {
-    return !this.g3b_1.y3c();
+    return !this.x3b_1.p3d();
   };
   function _get_cachedHashCode__d7x0zy($this) {
     // Inline function 'kotlin.getValue' call
-    var this_0 = $this.v3c_1;
+    var this_0 = $this.m3d_1;
     cachedHashCode$factory();
     return this_0.r2();
   }
   function ProbTerm$isGround$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (this$0.r3c_1.ux()) {
+      if (this$0.i3d_1.ux()) {
         var tmp$ret$0;
         $l$block_0: {
           // Inline function 'kotlin.collections.any' call
-          var this_0 = this$0.s3c_1;
+          var this_0 = this$0.j3d_1;
           var tmp_0;
           if (isInterface(this_0, Collection)) {
             tmp_0 = this_0.y();
@@ -1191,230 +1191,230 @@
   }
   function ProbTerm$cachedHashCode$delegate$lambda(this$0) {
     return function () {
-      var result = this$0.p3c_1.hashCode();
-      result = imul(31, result) + getNumberHashCode(this$0.q3c_1) | 0;
-      result = imul(31, result) + this$0.r3c_1.hashCode() | 0;
-      result = imul(31, result) + hashCode(this$0.s3c_1) | 0;
+      var result = this$0.g3d_1.hashCode();
+      result = imul(31, result) + getNumberHashCode(this$0.h3d_1) | 0;
+      result = imul(31, result) + this$0.i3d_1.hashCode() | 0;
+      result = imul(31, result) + hashCode(this$0.j3d_1) | 0;
       return result;
     };
   }
   function ProbTerm(id, probability, term, extraVariables) {
     extraVariables = extraVariables === VOID ? emptySet() : extraVariables;
-    this.p3c_1 = id;
-    this.q3c_1 = probability;
-    this.r3c_1 = term;
-    this.s3c_1 = extraVariables;
-    this.t3c_1 = Companion_getInstance_1().of(get_ANNOTATION_FUNCTOR(), [Companion_getInstance_6().ofDouble(probability), term]);
+    this.g3d_1 = id;
+    this.h3d_1 = probability;
+    this.i3d_1 = term;
+    this.j3d_1 = extraVariables;
+    this.k3d_1 = Companion_getInstance_1().of(get_ANNOTATION_FUNCTOR(), [Companion_getInstance_6().ofDouble(probability), term]);
     var tmp = this;
-    tmp.u3c_1 = lazy(ProbTerm$isGround$delegate$lambda(this));
+    tmp.l3d_1 = lazy(ProbTerm$isGround$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.v3c_1 = lazy(ProbTerm$cachedHashCode$delegate$lambda(this));
+    tmp_0.m3d_1 = lazy(ProbTerm$cachedHashCode$delegate$lambda(this));
   }
   protoOf(ProbTerm).lw = function () {
-    return this.t3c_1.lw();
+    return this.k3d_1.lw();
   };
   protoOf(ProbTerm).xw = function () {
-    return this.t3c_1.xw();
+    return this.k3d_1.xw();
   };
   protoOf(ProbTerm).dx = function () {
-    return this.t3c_1.dx();
+    return this.k3d_1.dx();
   };
   protoOf(ProbTerm).px = function () {
-    return this.t3c_1.px();
+    return this.k3d_1.px();
   };
   protoOf(ProbTerm).mw = function () {
-    return this.t3c_1.mw();
+    return this.k3d_1.mw();
   };
   protoOf(ProbTerm).nw = function () {
-    return this.t3c_1.nw();
+    return this.k3d_1.nw();
   };
   protoOf(ProbTerm).fx = function () {
-    return this.t3c_1.fx();
+    return this.k3d_1.fx();
   };
   protoOf(ProbTerm).rx = function () {
-    return this.t3c_1.rx();
+    return this.k3d_1.rx();
   };
   protoOf(ProbTerm).cx = function () {
-    return this.t3c_1.cx();
+    return this.k3d_1.cx();
   };
   protoOf(ProbTerm).qx = function () {
-    return this.t3c_1.qx();
+    return this.k3d_1.qx();
   };
   protoOf(ProbTerm).sx = function () {
-    return this.t3c_1.sx();
+    return this.k3d_1.sx();
   };
   protoOf(ProbTerm).ww = function () {
-    return this.t3c_1.ww();
+    return this.k3d_1.ww();
   };
   protoOf(ProbTerm).ow = function () {
-    return this.t3c_1.ow();
+    return this.k3d_1.ow();
   };
   protoOf(ProbTerm).bx = function () {
-    return this.t3c_1.bx();
+    return this.k3d_1.bx();
   };
   protoOf(ProbTerm).mx = function () {
-    return this.t3c_1.mx();
+    return this.k3d_1.mx();
   };
   protoOf(ProbTerm).vt = function () {
-    return this.t3c_1.vt();
+    return this.k3d_1.vt();
   };
   protoOf(ProbTerm).sw = function () {
-    return this.t3c_1.sw();
+    return this.k3d_1.sw();
   };
   protoOf(ProbTerm).accept = function (visitor) {
-    return this.t3c_1.accept(visitor);
+    return this.k3d_1.accept(visitor);
   };
   protoOf(ProbTerm).asAtom = function () {
-    return this.t3c_1.asAtom();
+    return this.k3d_1.asAtom();
   };
   protoOf(ProbTerm).asBlock = function () {
-    return this.t3c_1.asBlock();
+    return this.k3d_1.asBlock();
   };
   protoOf(ProbTerm).asClause = function () {
-    return this.t3c_1.asClause();
+    return this.k3d_1.asClause();
   };
   protoOf(ProbTerm).asCons = function () {
-    return this.t3c_1.asCons();
+    return this.k3d_1.asCons();
   };
   protoOf(ProbTerm).asConstant = function () {
-    return this.t3c_1.asConstant();
+    return this.k3d_1.asConstant();
   };
   protoOf(ProbTerm).asDirective = function () {
-    return this.t3c_1.asDirective();
+    return this.k3d_1.asDirective();
   };
   protoOf(ProbTerm).asEmptyBlock = function () {
-    return this.t3c_1.asEmptyBlock();
+    return this.k3d_1.asEmptyBlock();
   };
   protoOf(ProbTerm).asEmptyList = function () {
-    return this.t3c_1.asEmptyList();
+    return this.k3d_1.asEmptyList();
   };
   protoOf(ProbTerm).asFact = function () {
-    return this.t3c_1.asFact();
+    return this.k3d_1.asFact();
   };
   protoOf(ProbTerm).asIndicator = function () {
-    return this.t3c_1.asIndicator();
+    return this.k3d_1.asIndicator();
   };
   protoOf(ProbTerm).asInteger = function () {
-    return this.t3c_1.asInteger();
+    return this.k3d_1.asInteger();
   };
   protoOf(ProbTerm).asList = function () {
-    return this.t3c_1.asList();
+    return this.k3d_1.asList();
   };
   protoOf(ProbTerm).asNumeric = function () {
-    return this.t3c_1.asNumeric();
+    return this.k3d_1.asNumeric();
   };
   protoOf(ProbTerm).asReal = function () {
-    return this.t3c_1.asReal();
+    return this.k3d_1.asReal();
   };
   protoOf(ProbTerm).asRecursive = function () {
-    return this.t3c_1.asRecursive();
+    return this.k3d_1.asRecursive();
   };
   protoOf(ProbTerm).asRule = function () {
-    return this.t3c_1.asRule();
+    return this.k3d_1.asRule();
   };
   protoOf(ProbTerm).asStruct = function () {
-    return this.t3c_1.gx();
+    return this.k3d_1.gx();
   };
   protoOf(ProbTerm).asTerm = function () {
-    return this.t3c_1.asTerm();
+    return this.k3d_1.asTerm();
   };
   protoOf(ProbTerm).asTruth = function () {
-    return this.t3c_1.asTruth();
+    return this.k3d_1.asTruth();
   };
   protoOf(ProbTerm).asTuple = function () {
-    return this.t3c_1.asTuple();
+    return this.k3d_1.asTuple();
   };
   protoOf(ProbTerm).asVar = function () {
-    return this.t3c_1.asVar();
+    return this.k3d_1.asVar();
   };
   protoOf(ProbTerm).kx = function () {
-    return this.t3c_1.kx();
+    return this.k3d_1.kx();
   };
   protoOf(ProbTerm).br = function () {
     return this.kx();
   };
   protoOf(ProbTerm).castToAtom = function () {
-    return this.t3c_1.castToAtom();
+    return this.k3d_1.castToAtom();
   };
   protoOf(ProbTerm).castToBlock = function () {
-    return this.t3c_1.castToBlock();
+    return this.k3d_1.castToBlock();
   };
   protoOf(ProbTerm).castToClause = function () {
-    return this.t3c_1.castToClause();
+    return this.k3d_1.castToClause();
   };
   protoOf(ProbTerm).castToCons = function () {
-    return this.t3c_1.castToCons();
+    return this.k3d_1.castToCons();
   };
   protoOf(ProbTerm).castToConstant = function () {
-    return this.t3c_1.castToConstant();
+    return this.k3d_1.castToConstant();
   };
   protoOf(ProbTerm).castToDirective = function () {
-    return this.t3c_1.castToDirective();
+    return this.k3d_1.castToDirective();
   };
   protoOf(ProbTerm).castToEmptyBlock = function () {
-    return this.t3c_1.castToEmptyBlock();
+    return this.k3d_1.castToEmptyBlock();
   };
   protoOf(ProbTerm).castToEmptyList = function () {
-    return this.t3c_1.castToEmptyList();
+    return this.k3d_1.castToEmptyList();
   };
   protoOf(ProbTerm).castToFact = function () {
-    return this.t3c_1.castToFact();
+    return this.k3d_1.castToFact();
   };
   protoOf(ProbTerm).castToIndicator = function () {
-    return this.t3c_1.castToIndicator();
+    return this.k3d_1.castToIndicator();
   };
   protoOf(ProbTerm).castToInteger = function () {
-    return this.t3c_1.castToInteger();
+    return this.k3d_1.castToInteger();
   };
   protoOf(ProbTerm).castToList = function () {
-    return this.t3c_1.castToList();
+    return this.k3d_1.castToList();
   };
   protoOf(ProbTerm).castToNumeric = function () {
-    return this.t3c_1.castToNumeric();
+    return this.k3d_1.castToNumeric();
   };
   protoOf(ProbTerm).castToReal = function () {
-    return this.t3c_1.castToReal();
+    return this.k3d_1.castToReal();
   };
   protoOf(ProbTerm).castToRecursive = function () {
-    return this.t3c_1.castToRecursive();
+    return this.k3d_1.castToRecursive();
   };
   protoOf(ProbTerm).castToRule = function () {
-    return this.t3c_1.castToRule();
+    return this.k3d_1.castToRule();
   };
   protoOf(ProbTerm).castToStruct = function () {
-    return this.t3c_1.castToStruct();
+    return this.k3d_1.castToStruct();
   };
   protoOf(ProbTerm).castToTerm = function () {
-    return this.t3c_1.castToTerm();
+    return this.k3d_1.castToTerm();
   };
   protoOf(ProbTerm).castToTruth = function () {
-    return this.t3c_1.castToTruth();
+    return this.k3d_1.castToTruth();
   };
   protoOf(ProbTerm).castToTuple = function () {
-    return this.t3c_1.castToTuple();
+    return this.k3d_1.castToTuple();
   };
   protoOf(ProbTerm).castToVar = function () {
-    return this.t3c_1.castToVar();
+    return this.k3d_1.castToVar();
   };
   protoOf(ProbTerm).containsTag = function (name) {
-    return this.t3c_1.containsTag(name);
+    return this.k3d_1.containsTag(name);
   };
   protoOf(ProbTerm).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.t3c_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.k3d_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(ProbTerm).getTag = function (name) {
-    return this.t3c_1.getTag(name);
+    return this.k3d_1.getTag(name);
   };
   protoOf(ProbTerm).resetTags = function (tags) {
-    return this.t3c_1.resetTags(tags);
+    return this.k3d_1.resetTags(tags);
   };
   protoOf(ProbTerm).structurallyEquals = function (other) {
-    return this.t3c_1.structurallyEquals(other);
+    return this.k3d_1.structurallyEquals(other);
   };
   protoOf(ProbTerm).tw = function () {
-    var termCopy = this.r3c_1.freshCopy();
+    var termCopy = this.i3d_1.freshCopy();
     // Inline function 'kotlin.collections.map' call
-    var this_0 = this.s3c_1;
+    var this_0 = this.j3d_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var tmp0_iterator = this_0.r();
@@ -1424,15 +1424,15 @@
       var tmp$ret$0 = item.freshCopy();
       destination.o(tmp$ret$0);
     }
-    return new ProbTerm(this.p3c_1, this.q3c_1, termCopy, toSet(destination));
+    return new ProbTerm(this.g3d_1, this.h3d_1, termCopy, toSet(destination));
   };
   protoOf(ProbTerm).freshCopy = function () {
     return this.tw();
   };
   protoOf(ProbTerm).uw = function (scope) {
-    var termCopy = this.r3c_1.freshCopyFromScope(scope);
+    var termCopy = this.i3d_1.freshCopyFromScope(scope);
     // Inline function 'kotlin.collections.map' call
-    var this_0 = this.s3c_1;
+    var this_0 = this.j3d_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var tmp0_iterator = this_0.r();
@@ -1442,22 +1442,22 @@
       var tmp$ret$0 = item.freshCopyFromScope(scope);
       destination.o(tmp$ret$0);
     }
-    return new ProbTerm(this.p3c_1, this.q3c_1, termCopy, toSet(destination));
+    return new ProbTerm(this.g3d_1, this.h3d_1, termCopy, toSet(destination));
   };
   protoOf(ProbTerm).freshCopyFromScope = function (scope) {
     return this.uw(scope);
   };
-  protoOf(ProbTerm).a2o = function (substitution, substitutions) {
-    return this.b2o(substitution, substitutions.slice());
+  protoOf(ProbTerm).r2o = function (substitution, substitutions) {
+    return this.s2o(substitution, substitutions.slice());
   };
   protoOf(ProbTerm).getSubstituted = function (substitution, substitutions) {
-    return this.a2o(substitution, substitutions);
+    return this.r2o(substitution, substitutions);
   };
-  protoOf(ProbTerm).b2o = function (substitution, substitutions) {
+  protoOf(ProbTerm).s2o = function (substitution, substitutions) {
     return this.w16(Companion_getInstance_5().ofSubstitution(substitution, substitutions.slice()));
   };
   protoOf(ProbTerm).apply = function (substitution, substitutions) {
-    return this.b2o(substitution, substitutions);
+    return this.s2o(substitution, substitutions);
   };
   protoOf(ProbTerm).w16 = function (substitution) {
     var tmp;
@@ -1468,7 +1468,7 @@
       var tmp$ret$0;
       $l$block_0: {
         // Inline function 'kotlin.collections.any' call
-        var this_0 = this.s3c_1;
+        var this_0 = this.j3d_1;
         var tmp_1;
         if (isInterface(this_0, Collection)) {
           tmp_1 = this_0.y();
@@ -1491,11 +1491,11 @@
         tmp$ret$0 = false;
       }
       if (!tmp$ret$0) {
-        tmp_0 = this.s3c_1;
+        tmp_0 = this.j3d_1;
       } else {
         // Inline function 'kotlin.collections.mapNotNull' call
         // Inline function 'kotlin.collections.mapNotNullTo' call
-        var this_1 = this.s3c_1;
+        var this_1 = this.j3d_1;
         var destination = ArrayList_init_$Create$_0();
         // Inline function 'kotlin.collections.forEach' call
         var tmp0_iterator_0 = this_1.r();
@@ -1515,7 +1515,7 @@
         tmp_0 = toSet(destination);
       }
       var newExtraVars = tmp_0;
-      tmp = new ProbTerm(this.p3c_1, this.q3c_1, this.r3c_1.applySubstitution(substitution), newExtraVars);
+      tmp = new ProbTerm(this.g3d_1, this.h3d_1, this.i3d_1.applySubstitution(substitution), newExtraVars);
     }
     return tmp;
   };
@@ -1524,7 +1524,7 @@
   };
   protoOf(ProbTerm).ux = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.u3c_1;
+    var this_0 = this.l3d_1;
     isGround$factory();
     return this_0.r2();
   };
@@ -1532,16 +1532,16 @@
     if (!(other instanceof ProbTerm)) {
       return compareTo.call(this, other);
     }
-    var res = this.p3c_1.q6(other.p3c_1);
+    var res = this.g3d_1.q6(other.g3d_1);
     if (!(res === 0))
       return res;
-    res = this.r3c_1.lx(other.r3c_1);
+    res = this.i3d_1.lx(other.i3d_1);
     if (!(res === 0))
       return res;
-    res = equals(this.s3c_1, other.s3c_1) ? 0 : -1;
+    res = equals(this.j3d_1, other.j3d_1) ? 0 : -1;
     if (!(res === 0))
       return res;
-    res = compareTo_0(this.q3c_1, other.q3c_1);
+    res = compareTo_0(this.h3d_1, other.h3d_1);
     return res;
   };
   protoOf(ProbTerm).d = function (other) {
@@ -1560,7 +1560,7 @@
     return _get_cachedHashCode__d7x0zy(this);
   };
   protoOf(ProbTerm).toString = function () {
-    return '' + round(this.q3c_1 * 100) / 100.0 + '::' + this.r3c_1;
+    return '' + round(this.h3d_1 * 100) / 100.0 + '::' + this.i3d_1;
   };
   function isGround$factory() {
     return getPropertyCallableRef('isGround', 1, KProperty1, function (receiver) {
@@ -1669,7 +1669,7 @@
   }
   function AnnotatedDisjunctionClauseMapper() {
   }
-  protoOf(AnnotatedDisjunctionClauseMapper).z3c = function (clause) {
+  protoOf(AnnotatedDisjunctionClauseMapper).q3d = function (clause) {
     var tmp;
     if (isInterface(clause, Rule)) {
       var tmp_0 = clause.wy().qw();
@@ -1679,7 +1679,7 @@
     }
     return tmp;
   };
-  protoOf(AnnotatedDisjunctionClauseMapper).a3d = function (clause) {
+  protoOf(AnnotatedDisjunctionClauseMapper).r3d = function (clause) {
     if (!isInterface(clause, Rule)) {
       throw new ClauseMappingException('Clause is not an instance of Rule: ' + clause);
     }
@@ -1707,11 +1707,11 @@
       }
       var curRuleHead = tmp_0;
       probSum = probSum + curProb;
-      var tmp$ret$1 = ProbabilisticClauseMapper_instance.b3d(Companion_instance_4.of(Companion_getInstance_1().of(get_ANNOTATION_FUNCTOR(), [Companion_getInstance_6().ofDouble(curProb / (1.0 - (probSum - curProb))), curRuleHead]), [body]));
+      var tmp$ret$1 = ProbabilisticClauseMapper_instance.s3d(Companion_instance_4.of(Companion_getInstance_1().of(get_ANNOTATION_FUNCTOR(), [Companion_getInstance_6().ofDouble(curProb / (1.0 - (probSum - curProb))), curRuleHead]), [body]));
       destination.o(tmp$ret$1);
     }
     var mappedRules = toList_0(destination);
-    var explanation = Companion_getInstance_11().k3c_1;
+    var explanation = Companion_getInstance_11().b3d_1;
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination_0 = ArrayList_init_$Create$(collectionSizeOrDefault(mappedRules, 10));
@@ -1719,10 +1719,10 @@
     while (tmp0_iterator_0.s()) {
       var item_0 = tmp0_iterator_0.u();
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.AnnotatedDisjunctionClauseMapper.apply.<anonymous>' call
-      var thisExplanation = Companion_getInstance_11().o3c(item_0.ze_1);
+      var thisExplanation = Companion_getInstance_11().f3d(item_0.ze_1);
       var resultExplanation = thisExplanation.and(explanation);
       explanation = explanation.and(thisExplanation.not());
-      var tmp$ret$4 = ProbabilisticClauseMapper_instance.c3d(item_0.ye_1, resultExplanation);
+      var tmp$ret$4 = ProbabilisticClauseMapper_instance.t3d(item_0.ye_1, resultExplanation);
       destination_0.o(tmp$ret$4);
     }
     return destination_0;
@@ -1732,13 +1732,13 @@
     return AnnotatedDisjunctionClauseMapper_instance;
   }
   function ComputedValue(probability) {
-    this.d3d_1 = probability;
+    this.u3d_1 = probability;
   }
   protoOf(ComputedValue).toString = function () {
-    return 'ComputedValue(probability=' + this.d3d_1 + ')';
+    return 'ComputedValue(probability=' + this.u3d_1 + ')';
   };
   protoOf(ComputedValue).hashCode = function () {
-    return this.d3d_1 == null ? 0 : getNumberHashCode(this.d3d_1);
+    return this.u3d_1 == null ? 0 : getNumberHashCode(this.u3d_1);
   };
   protoOf(ComputedValue).equals = function (other) {
     if (this === other)
@@ -1746,15 +1746,15 @@
     if (!(other instanceof ComputedValue))
       return false;
     var tmp0_other_with_cast = other instanceof ComputedValue ? other : THROW_CCE();
-    if (!equals(this.d3d_1, tmp0_other_with_cast.d3d_1))
+    if (!equals(this.u3d_1, tmp0_other_with_cast.u3d_1))
       return false;
     return true;
   };
   function Companion_2() {
     Companion_instance_12 = this;
-    this.l3c_1 = new ComputedValue(null);
-    this.m3c_1 = new ComputedValue(0.0);
-    this.n3c_1 = new ComputedValue(1.0);
+    this.c3d_1 = new ComputedValue(null);
+    this.d3d_1 = new ComputedValue(0.0);
+    this.e3d_1 = new ComputedValue(1.0);
   }
   var Companion_instance_12;
   function Companion_getInstance_13() {
@@ -1770,8 +1770,8 @@
   }
   function computeExpansion($this, value, low, high) {
     var tmp;
-    if (!(low.d3d_1 == null) ? !(high.d3d_1 == null) : false) {
-      tmp = value.q3c_1 * high.d3d_1 + (1.0 - value.q3c_1) * low.d3d_1;
+    if (!(low.u3d_1 == null) ? !(high.u3d_1 == null) : false) {
+      tmp = value.h3d_1 * high.u3d_1 + (1.0 - value.h3d_1) * low.u3d_1;
     } else {
       tmp = null;
     }
@@ -1779,7 +1779,7 @@
   }
   function _get_cachedNot__l38068($this) {
     // Inline function 'kotlin.getValue' call
-    var this_0 = $this.k3b_1;
+    var this_0 = $this.b3c_1;
     cachedNot$factory();
     return this_0.r2();
   }
@@ -1790,9 +1790,9 @@
   }
   function BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda(this$0) {
     return function () {
-      var tmp = Companion_getInstance_13().m3c_1;
-      var tmp_0 = Companion_getInstance_13().n3c_1;
-      var result = notThenExpansion(this$0.i3b_1, tmp, tmp_0, BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda$lambda(this$0));
+      var tmp = Companion_getInstance_13().d3d_1;
+      var tmp_0 = Companion_getInstance_13().e3d_1;
+      var result = notThenExpansion(this$0.z3b_1, tmp, tmp_0, BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda$lambda(this$0));
       return new BinaryDecisionDiagramExplanation(result.ye_1, result.ze_1);
     };
   }
@@ -1807,14 +1807,14 @@
     };
   }
   function BinaryDecisionDiagramExplanation$probability$delegate$lambda$lambda(node, low, high) {
-    return node.q3c_1 * high + (1.0 - node.q3c_1) * low;
+    return node.h3d_1 * high + (1.0 - node.h3d_1) * low;
   }
   function BinaryDecisionDiagramExplanation$probability$delegate$lambda(this$0) {
     return function () {
-      var tmp0_elvis_lhs = this$0.j3b_1.d3d_1;
+      var tmp0_elvis_lhs = this$0.a3c_1.u3d_1;
       var tmp;
       if (tmp0_elvis_lhs == null) {
-        tmp = expansion(this$0.i3b_1, 0.0, 1.0, BinaryDecisionDiagramExplanation$probability$delegate$lambda$lambda);
+        tmp = expansion(this$0.z3b_1, 0.0, 1.0, BinaryDecisionDiagramExplanation$probability$delegate$lambda$lambda);
       } else {
         tmp = tmp0_elvis_lhs;
       }
@@ -1826,7 +1826,7 @@
   }
   function BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda(this$0) {
     return function () {
-      return anyWhere(this$0.i3b_1, BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda$lambda);
+      return anyWhere(this$0.z3b_1, BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda$lambda);
     };
   }
   function BinaryDecisionDiagramExplanation$apply$lambda($transformation) {
@@ -1836,62 +1836,62 @@
   }
   function BinaryDecisionDiagramExplanation(diagram, computedValue) {
     Companion_getInstance_13();
-    computedValue = computedValue === VOID ? Companion_getInstance_13().l3c_1 : computedValue;
-    this.i3b_1 = diagram;
-    this.j3b_1 = computedValue;
+    computedValue = computedValue === VOID ? Companion_getInstance_13().c3d_1 : computedValue;
+    this.z3b_1 = diagram;
+    this.a3c_1 = computedValue;
     var tmp = this;
-    tmp.k3b_1 = lazy(BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda(this));
+    tmp.b3c_1 = lazy(BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.l3b_1 = lazy(BinaryDecisionDiagramExplanation$probability$delegate$lambda(this));
+    tmp_0.c3c_1 = lazy(BinaryDecisionDiagramExplanation$probability$delegate$lambda(this));
     var tmp_1 = this;
-    tmp_1.m3b_1 = lazy(BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda(this));
+    tmp_1.d3c_1 = lazy(BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda(this));
   }
-  protoOf(BinaryDecisionDiagramExplanation).e3d = function () {
+  protoOf(BinaryDecisionDiagramExplanation).v3d = function () {
     return _get_cachedNot__l38068(this);
   };
   protoOf(BinaryDecisionDiagramExplanation).not = function () {
-    return this.e3d();
+    return this.v3d();
   };
-  protoOf(BinaryDecisionDiagramExplanation).f3d = function (that) {
-    var tmp = getAsInternal(this, that).i3b_1;
-    var tmp_0 = Companion_getInstance_13().m3c_1;
-    var tmp_1 = Companion_getInstance_13().n3c_1;
-    var result = andThenExpansion(this.i3b_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$and$lambda(this));
+  protoOf(BinaryDecisionDiagramExplanation).w3d = function (that) {
+    var tmp = getAsInternal(this, that).z3b_1;
+    var tmp_0 = Companion_getInstance_13().d3d_1;
+    var tmp_1 = Companion_getInstance_13().e3d_1;
+    var result = andThenExpansion(this.z3b_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$and$lambda(this));
     return new BinaryDecisionDiagramExplanation(result.ye_1, result.ze_1);
   };
   protoOf(BinaryDecisionDiagramExplanation).and = function (that) {
-    return this.f3d(that);
+    return this.w3d(that);
   };
-  protoOf(BinaryDecisionDiagramExplanation).g3d = function (that) {
-    var tmp = getAsInternal(this, that).i3b_1;
-    var tmp_0 = Companion_getInstance_13().m3c_1;
-    var tmp_1 = Companion_getInstance_13().n3c_1;
-    var result = orThenExpansion(this.i3b_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$or$lambda(this));
+  protoOf(BinaryDecisionDiagramExplanation).x3d = function (that) {
+    var tmp = getAsInternal(this, that).z3b_1;
+    var tmp_0 = Companion_getInstance_13().d3d_1;
+    var tmp_1 = Companion_getInstance_13().e3d_1;
+    var result = orThenExpansion(this.z3b_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$or$lambda(this));
     return new BinaryDecisionDiagramExplanation(result.ye_1, result.ze_1);
   };
   protoOf(BinaryDecisionDiagramExplanation).or = function (that) {
-    return this.g3d(that);
+    return this.x3d(that);
   };
-  protoOf(BinaryDecisionDiagramExplanation).w3c = function () {
+  protoOf(BinaryDecisionDiagramExplanation).n3d = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.l3b_1;
+    var this_0 = this.c3c_1;
     probability$factory();
     return this_0.r2();
   };
-  protoOf(BinaryDecisionDiagramExplanation).y3c = function () {
+  protoOf(BinaryDecisionDiagramExplanation).p3d = function () {
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.m3b_1;
+    var this_0 = this.d3c_1;
     containsAnyNotGroundTerm$factory();
     return this_0.r2();
   };
   protoOf(BinaryDecisionDiagramExplanation).toString = function () {
-    return 'bdd:' + hashCode(this.i3b_1);
+    return 'bdd:' + hashCode(this.z3b_1);
   };
-  protoOf(BinaryDecisionDiagramExplanation).h3d = function (transformation) {
-    return new BinaryDecisionDiagramExplanation(map_0(this.i3b_1, BinaryDecisionDiagramExplanation$apply$lambda(transformation)));
+  protoOf(BinaryDecisionDiagramExplanation).y3d = function (transformation) {
+    return new BinaryDecisionDiagramExplanation(map_0(this.z3b_1, BinaryDecisionDiagramExplanation$apply$lambda(transformation)));
   };
   protoOf(BinaryDecisionDiagramExplanation).applyTransformation = function (transformation) {
-    return this.h3d(transformation);
+    return this.y3d(transformation);
   };
   function cachedNot$factory() {
     return getPropertyCallableRef('cachedNot', 1, KProperty1, function (receiver) {
@@ -1900,12 +1900,12 @@
   }
   function probability$factory() {
     return getPropertyCallableRef('probability', 1, KProperty1, function (receiver) {
-      return receiver.w3c();
+      return receiver.n3d();
     }, null);
   }
   function containsAnyNotGroundTerm$factory() {
     return getPropertyCallableRef('containsAnyNotGroundTerm', 1, KProperty1, function (receiver) {
-      return receiver.y3c();
+      return receiver.p3d();
     }, null);
   }
   function get_nonWrappableFunctors() {
@@ -1915,15 +1915,15 @@
   var nonWrappableFunctors;
   function ClauseMappingUtils() {
     ClauseMappingUtils_instance = this;
-    this.i3d_1 = new Long(1, 0);
-    this.j3d_1 = listOf_0([DirectiveClauseMapper_instance, AnnotatedDisjunctionClauseMapper_instance, ProbabilisticClauseMapper_instance, EvidenceClauseMapper_instance, PrologClauseMapper_instance, NothingClauseMapper_instance]);
+    this.z3d_1 = new Long(1, 0);
+    this.a3e_1 = listOf_0([DirectiveClauseMapper_instance, AnnotatedDisjunctionClauseMapper_instance, ProbabilisticClauseMapper_instance, EvidenceClauseMapper_instance, PrologClauseMapper_instance, NothingClauseMapper_instance]);
   }
-  protoOf(ClauseMappingUtils).k3d = function () {
-    var tmp1 = this.i3d_1;
-    this.i3d_1 = tmp1.tb();
+  protoOf(ClauseMappingUtils).b3e = function () {
+    var tmp1 = this.z3d_1;
+    this.z3d_1 = tmp1.tb();
     return tmp1;
   };
-  protoOf(ClauseMappingUtils).l3d = function (clause) {
+  protoOf(ClauseMappingUtils).c3e = function (clause) {
     var tmp;
     if (get_isMappedAsProblog(clause)) {
       tmp = listOf(clause);
@@ -1932,18 +1932,18 @@
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.collections.first' call
-        var tmp0_iterator = this.j3d_1.r();
+        var tmp0_iterator = this.a3e_1.r();
         while (tmp0_iterator.s()) {
           var element = tmp0_iterator.u();
           // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.ClauseMappingUtils.map.<anonymous>' call
-          if (element.z3c(clause)) {
+          if (element.q3d(clause)) {
             tmp$ret$1 = element;
             break $l$block;
           }
         }
         throw NoSuchElementException_init_$Create$('Collection contains no element matching the predicate.');
       }
-      var this_0 = tmp$ret$1.a3d(clause);
+      var this_0 = tmp$ret$1.r3d(clause);
       // Inline function 'kotlin.collections.mapTo' call
       var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
       var tmp0_iterator_0 = this_0.r();
@@ -1957,7 +1957,7 @@
     }
     return tmp;
   };
-  protoOf(ClauseMappingUtils).m3d = function (indicator) {
+  protoOf(ClauseMappingUtils).d3e = function (indicator) {
     var arityTerm = indicator.x10();
     var tmp = Companion_instance_5;
     var tmp_0 = indicator.w10();
@@ -2065,7 +2065,7 @@
   }
   function withExplanationNonWrappable(_this__u8e3s4, explanation) {
     _init_properties_ClauseMappingUtils_kt__go80e();
-    return Companion_instance_0.of(_this__u8e3s4, Companion_getInstance_1().of('=', [explanation, toTerm(Companion_getInstance_11().k3c_1)]));
+    return Companion_instance_0.of(_this__u8e3s4, Companion_getInstance_1().of('=', [explanation, toTerm(Companion_getInstance_11().b3d_1)]));
   }
   function wrapInPredicate(_this__u8e3s4, functor, explanation) {
     _init_properties_ClauseMappingUtils_kt__go80e();
@@ -2162,10 +2162,10 @@
   }
   function DirectiveClauseMapper() {
   }
-  protoOf(DirectiveClauseMapper).z3c = function (clause) {
+  protoOf(DirectiveClauseMapper).q3d = function (clause) {
     return clause.zw();
   };
-  protoOf(DirectiveClauseMapper).a3d = function (clause) {
+  protoOf(DirectiveClauseMapper).r3d = function (clause) {
     var body = clause.xy();
     if (!isInterface(clause, Directive)) {
       throw new ClauseMappingException('Clause is not an instance of Directive: ' + clause);
@@ -2205,7 +2205,7 @@
   }
   function EvidenceClauseMapper() {
   }
-  protoOf(EvidenceClauseMapper).z3c = function (clause) {
+  protoOf(EvidenceClauseMapper).q3d = function (clause) {
     var tmp;
     if (isInterface(clause, Rule)) {
       var tmp_0 = clause.wy().qw();
@@ -2216,7 +2216,7 @@
     }
     return tmp;
   };
-  protoOf(EvidenceClauseMapper).a3d = function (clause) {
+  protoOf(EvidenceClauseMapper).r3d = function (clause) {
     if (!isInterface(clause, Rule)) {
       throw new ClauseMappingException('Clause is not an instance of Rule: ' + clause);
     }
@@ -2251,7 +2251,7 @@
     return EvidenceClauseMapper_instance;
   }
   function MappedMutableProblogTheory(clauses, unificator, theory) {
-    unificator = unificator === VOID ? Companion_getInstance_8().g1l() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance_8().c1l() : unificator;
     var tmp;
     if (theory === VOID) {
       var tmp_0 = Companion_instance_7;
@@ -2266,7 +2266,7 @@
         while (tmp0_iterator.s()) {
           var element = tmp0_iterator.u();
           // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedMutableProblogTheory.<init>.<anonymous>' call
-          var list = ClauseMappingUtils_getInstance().l3d(element);
+          var list = ClauseMappingUtils_getInstance().c3e(element);
           addAll(destination, list);
         }
         tmp_1 = destination;
@@ -2277,118 +2277,118 @@
       tmp = theory;
     }
     theory = tmp;
-    this.n3d_1 = theory;
+    this.e3e_1 = theory;
   }
-  protoOf(MappedMutableProblogTheory).t1l = function () {
-    return this.n3d_1.t1l();
+  protoOf(MappedMutableProblogTheory).p1l = function () {
+    return this.e3e_1.p1l();
   };
-  protoOf(MappedMutableProblogTheory).m1l = function () {
-    return this.n3d_1.m1l();
+  protoOf(MappedMutableProblogTheory).i1l = function () {
+    return this.e3e_1.i1l();
   };
-  protoOf(MappedMutableProblogTheory).o1l = function () {
-    return this.n3d_1.o1l();
+  protoOf(MappedMutableProblogTheory).k1l = function () {
+    return this.e3e_1.k1l();
   };
-  protoOf(MappedMutableProblogTheory).j1s = function () {
-    return this.n3d_1.j1s();
+  protoOf(MappedMutableProblogTheory).f1s = function () {
+    return this.e3e_1.f1s();
   };
   protoOf(MappedMutableProblogTheory).l = function () {
-    return this.n3d_1.l();
+    return this.e3e_1.l();
   };
   protoOf(MappedMutableProblogTheory).vt = function () {
-    return this.n3d_1.vt();
+    return this.e3e_1.vt();
   };
-  protoOf(MappedMutableProblogTheory).j1l = function () {
-    return this.n3d_1.j1l();
+  protoOf(MappedMutableProblogTheory).f1l = function () {
+    return this.e3e_1.f1l();
   };
-  protoOf(MappedMutableProblogTheory).y1s = function () {
-    return this.n3d_1.y1s();
+  protoOf(MappedMutableProblogTheory).u1s = function () {
+    return this.e3e_1.u1s();
   };
   protoOf(MappedMutableProblogTheory).clone = function () {
-    return this.y1s();
+    return this.u1s();
   };
   protoOf(MappedMutableProblogTheory).contains = function (clause) {
-    return this.n3d_1.contains(clause);
+    return this.e3e_1.contains(clause);
   };
   protoOf(MappedMutableProblogTheory).containsIndicator = function (indicator) {
-    return this.n3d_1.containsIndicator(indicator);
+    return this.e3e_1.containsIndicator(indicator);
   };
   protoOf(MappedMutableProblogTheory).containsHead = function (head) {
-    return this.n3d_1.containsHead(head);
+    return this.e3e_1.containsHead(head);
   };
   protoOf(MappedMutableProblogTheory).containsTag = function (name) {
-    return this.n3d_1.containsTag(name);
+    return this.e3e_1.containsTag(name);
   };
   protoOf(MappedMutableProblogTheory).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.n3d_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.e3e_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(MappedMutableProblogTheory).get = function (clause) {
-    return this.n3d_1.get(clause);
+    return this.e3e_1.get(clause);
   };
   protoOf(MappedMutableProblogTheory).getByIndicator = function (indicator) {
-    return this.n3d_1.getByIndicator(indicator);
+    return this.e3e_1.getByIndicator(indicator);
   };
   protoOf(MappedMutableProblogTheory).getByHead = function (head) {
-    return this.n3d_1.getByHead(head);
+    return this.e3e_1.getByHead(head);
   };
   protoOf(MappedMutableProblogTheory).getTag = function (name) {
-    return this.n3d_1.getTag(name);
+    return this.e3e_1.getTag(name);
   };
   protoOf(MappedMutableProblogTheory).r = function () {
-    return this.n3d_1.r();
+    return this.e3e_1.r();
   };
   protoOf(MappedMutableProblogTheory).u12 = function (tags) {
-    return this.n3d_1.u12(tags);
+    return this.e3e_1.u12(tags);
   };
   protoOf(MappedMutableProblogTheory).resetTags = function (tags) {
     return this.u12(tags);
   };
-  protoOf(MappedMutableProblogTheory).k1s = function (unificator) {
-    return this.n3d_1.k1s(unificator);
+  protoOf(MappedMutableProblogTheory).g1s = function (unificator) {
+    return this.e3e_1.g1s(unificator);
   };
   protoOf(MappedMutableProblogTheory).setUnificator = function (unificator) {
-    return this.k1s(unificator);
+    return this.g1s(unificator);
   };
   protoOf(MappedMutableProblogTheory).toStringAsProlog = function (asPrologText) {
-    return this.n3d_1.toStringAsProlog(asPrologText);
+    return this.e3e_1.toStringAsProlog(asPrologText);
   };
-  protoOf(MappedMutableProblogTheory).z1s = function () {
+  protoOf(MappedMutableProblogTheory).v1s = function () {
     return false;
   };
-  protoOf(MappedMutableProblogTheory).a1t = function () {
-    return Companion_instance_9.ofIterable(this.j1l(), this);
+  protoOf(MappedMutableProblogTheory).i1t = function () {
+    return Companion_instance_9.ofIterable(this.f1l(), this);
   };
   protoOf(MappedMutableProblogTheory).toMutableTheory = function () {
-    return this.a1t();
+    return this.i1t();
   };
-  protoOf(MappedMutableProblogTheory).z1r = function () {
+  protoOf(MappedMutableProblogTheory).v1r = function () {
     return this;
   };
   protoOf(MappedMutableProblogTheory).toImmutableTheory = function () {
-    return this.z1r();
+    return this.v1r();
   };
-  protoOf(MappedMutableProblogTheory).o3d = function (theory) {
-    return new MappedMutableProblogTheory(null, this.j1l(), this.n3d_1.m1s(theory));
+  protoOf(MappedMutableProblogTheory).f3e = function (theory) {
+    return new MappedMutableProblogTheory(null, this.f1l(), this.e3e_1.i1s(theory));
   };
-  protoOf(MappedMutableProblogTheory).m1s = function (theory) {
+  protoOf(MappedMutableProblogTheory).i1s = function (theory) {
     var tmp;
     if (isInterface(theory, ProblogTheory)) {
-      tmp = this.o3d(theory);
+      tmp = this.f3e(theory);
     } else {
-      tmp = this.o3d(new MappedMutableProblogTheory(theory, this.j1l()));
+      tmp = this.f3e(new MappedMutableProblogTheory(theory, this.f1l()));
     }
     return tmp;
   };
   protoOf(MappedMutableProblogTheory).plusTheory = function (theory) {
-    return this.m1s(theory);
+    return this.i1s(theory);
   };
-  protoOf(MappedMutableProblogTheory).a1s = function (clause) {
-    var mapped = ClauseMappingUtils_getInstance().l3d(clause);
-    return new MappedMutableProblogTheory(null, this.j1l(), this.n3d_1.m1s(Companion_instance_8.indexedOfIterable(this.j1l(), mapped)));
+  protoOf(MappedMutableProblogTheory).w1r = function (clause) {
+    var mapped = ClauseMappingUtils_getInstance().c3e(clause);
+    return new MappedMutableProblogTheory(null, this.f1l(), this.e3e_1.i1s(Companion_instance_8.indexedOfIterable(this.f1l(), mapped)));
   };
   protoOf(MappedMutableProblogTheory).plus = function (clause) {
-    return this.a1s(clause);
+    return this.w1r(clause);
   };
-  protoOf(MappedMutableProblogTheory).q1s = function (clauses) {
+  protoOf(MappedMutableProblogTheory).m1s = function (clauses) {
     // Inline function 'kotlin.collections.flatMap' call
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination = ArrayList_init_$Create$_0();
@@ -2396,16 +2396,16 @@
     while (tmp0_iterator.s()) {
       var element = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedMutableProblogTheory.assertA.<anonymous>' call
-      var list = ClauseMappingUtils_getInstance().l3d(element);
+      var list = ClauseMappingUtils_getInstance().c3e(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    return new MappedMutableProblogTheory(null, this.j1l(), this.n3d_1.q1s(mapped));
+    return new MappedMutableProblogTheory(null, this.f1l(), this.e3e_1.m1s(mapped));
   };
   protoOf(MappedMutableProblogTheory).assertAIterable = function (clauses) {
-    return this.q1s(clauses);
+    return this.m1s(clauses);
   };
-  protoOf(MappedMutableProblogTheory).t1s = function (clauses) {
+  protoOf(MappedMutableProblogTheory).p1s = function (clauses) {
     // Inline function 'kotlin.collections.flatMap' call
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination = ArrayList_init_$Create$_0();
@@ -2413,16 +2413,16 @@
     while (tmp0_iterator.s()) {
       var element = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedMutableProblogTheory.assertZ.<anonymous>' call
-      var list = ClauseMappingUtils_getInstance().l3d(element);
+      var list = ClauseMappingUtils_getInstance().c3e(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    return new MappedMutableProblogTheory(null, this.j1l(), this.n3d_1.t1s(mapped));
+    return new MappedMutableProblogTheory(null, this.f1l(), this.e3e_1.p1s(mapped));
   };
   protoOf(MappedMutableProblogTheory).assertZIterable = function (clauses) {
-    return this.t1s(clauses);
+    return this.p1s(clauses);
   };
-  protoOf(MappedMutableProblogTheory).x1s = function (clauses) {
+  protoOf(MappedMutableProblogTheory).t1s = function (clauses) {
     // Inline function 'kotlin.collections.flatMap' call
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination = ArrayList_init_$Create$_0();
@@ -2430,24 +2430,24 @@
     while (tmp0_iterator.s()) {
       var element = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedMutableProblogTheory.retract.<anonymous>' call
-      var list = ClauseMappingUtils_getInstance().l3d(element);
+      var list = ClauseMappingUtils_getInstance().c3e(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    var result = this.n3d_1.x1s(mapped);
+    var result = this.e3e_1.t1s(mapped);
     var tmp;
     if (result instanceof Success) {
-      tmp = new Success(new MappedMutableProblogTheory(null, this.j1l(), result.g1s()), result.h1t_1);
+      tmp = new Success(new MappedMutableProblogTheory(null, this.f1l(), result.c1s()), result.p1t_1);
     } else {
-      tmp = new Failure(new MappedMutableProblogTheory(null, this.j1l(), result.g1s()));
+      tmp = new Failure(new MappedMutableProblogTheory(null, this.f1l(), result.c1s()));
     }
     return tmp;
   };
   protoOf(MappedMutableProblogTheory).retractIterable = function (clauses) {
-    return this.x1s(clauses);
+    return this.t1s(clauses);
   };
-  protoOf(MappedMutableProblogTheory).b1m = function (clause) {
-    var mappedClauses = ClauseMappingUtils_getInstance().l3d(clause);
+  protoOf(MappedMutableProblogTheory).x1l = function (clause) {
+    var mappedClauses = ClauseMappingUtils_getInstance().c3e(clause);
     var result = null;
     var tmp0_iterator = mappedClauses.r();
     while (tmp0_iterator.s()) {
@@ -2459,16 +2459,16 @@
         tmp = !(result instanceof Failure);
       }
       if (tmp) {
-        result = this.n3d_1.b1m(c);
+        result = this.e3e_1.x1l(c);
       }
     }
     var tmp1_subject = result;
     var tmp_0;
     if (tmp1_subject instanceof Success) {
-      tmp_0 = new Success(new MappedMutableProblogTheory(null, this.j1l(), result.g1s()), result.h1t_1);
+      tmp_0 = new Success(new MappedMutableProblogTheory(null, this.f1l(), result.c1s()), result.p1t_1);
     } else {
       if (tmp1_subject instanceof Failure) {
-        tmp_0 = new Failure(new MappedMutableProblogTheory(null, this.j1l(), result.g1s()));
+        tmp_0 = new Failure(new MappedMutableProblogTheory(null, this.f1l(), result.c1s()));
       } else {
         tmp_0 = new Failure(this);
       }
@@ -2476,76 +2476,76 @@
     return tmp_0;
   };
   protoOf(MappedMutableProblogTheory).retractAll = function (clause) {
-    return this.b1m(clause);
+    return this.x1l(clause);
   };
-  protoOf(MappedMutableProblogTheory).f1s = function (indicator) {
-    return new MappedMutableProblogTheory(null, this.j1l(), this.n3d_1.f1s(ClauseMappingUtils_getInstance().m3d(indicator)));
+  protoOf(MappedMutableProblogTheory).b1s = function (indicator) {
+    return new MappedMutableProblogTheory(null, this.f1l(), this.e3e_1.b1s(ClauseMappingUtils_getInstance().d3e(indicator)));
   };
   protoOf(MappedMutableProblogTheory).abolish = function (indicator) {
-    return this.f1s(indicator);
+    return this.b1s(indicator);
   };
-  protoOf(MappedMutableProblogTheory).b1t = function (struct) {
-    return this.o1s(Companion_instance.of(struct));
+  protoOf(MappedMutableProblogTheory).j1t = function (struct) {
+    return this.k1s(Companion_instance.of(struct));
   };
   protoOf(MappedMutableProblogTheory).assertAFact = function (struct) {
-    return this.b1t(struct);
+    return this.j1t(struct);
   };
-  protoOf(MappedMutableProblogTheory).c1t = function (struct) {
-    return this.s1s(Companion_instance.of(struct));
+  protoOf(MappedMutableProblogTheory).k1t = function (struct) {
+    return this.o1s(Companion_instance.of(struct));
   };
   protoOf(MappedMutableProblogTheory).assertZFact = function (struct) {
-    return this.c1t(struct);
+    return this.k1t(struct);
   };
-  protoOf(MappedMutableProblogTheory).o1s = function (clause) {
-    return this.q1s(listOf(clause));
+  protoOf(MappedMutableProblogTheory).k1s = function (clause) {
+    return this.m1s(listOf(clause));
   };
   protoOf(MappedMutableProblogTheory).assertA = function (clause) {
-    return this.o1s(clause);
+    return this.k1s(clause);
   };
-  protoOf(MappedMutableProblogTheory).r1s = function (clauses) {
-    return this.q1s(asIterable_0(clauses));
+  protoOf(MappedMutableProblogTheory).n1s = function (clauses) {
+    return this.m1s(asIterable_0(clauses));
   };
   protoOf(MappedMutableProblogTheory).assertASequence = function (clauses) {
-    return this.r1s(clauses);
+    return this.n1s(clauses);
   };
-  protoOf(MappedMutableProblogTheory).s1s = function (clause) {
-    return this.t1s(listOf(clause));
+  protoOf(MappedMutableProblogTheory).o1s = function (clause) {
+    return this.p1s(listOf(clause));
   };
   protoOf(MappedMutableProblogTheory).assertZ = function (clause) {
-    return this.s1s(clause);
+    return this.o1s(clause);
   };
-  protoOf(MappedMutableProblogTheory).u1s = function (clauses) {
-    return this.t1s(asIterable_0(clauses));
+  protoOf(MappedMutableProblogTheory).q1s = function (clauses) {
+    return this.p1s(asIterable_0(clauses));
   };
   protoOf(MappedMutableProblogTheory).assertZSequence = function (clauses) {
-    return this.u1s(clauses);
+    return this.q1s(clauses);
   };
-  protoOf(MappedMutableProblogTheory).e1t = function (head) {
-    return this.d1t(Companion_instance_4.of(head, [Companion_getInstance_0().anonymous()]));
+  protoOf(MappedMutableProblogTheory).m1t = function (head) {
+    return this.l1t(Companion_instance_4.of(head, [Companion_getInstance_0().anonymous()]));
   };
   protoOf(MappedMutableProblogTheory).retractByHead = function (head) {
-    return this.e1t(head);
+    return this.m1t(head);
   };
-  protoOf(MappedMutableProblogTheory).d1t = function (clause) {
-    return this.x1s(listOf(clause));
+  protoOf(MappedMutableProblogTheory).l1t = function (clause) {
+    return this.t1s(listOf(clause));
   };
   protoOf(MappedMutableProblogTheory).retract = function (clause) {
-    return this.d1t(clause);
+    return this.l1t(clause);
   };
-  protoOf(MappedMutableProblogTheory).w1s = function (clauses) {
-    return this.x1s(asIterable_0(clauses));
+  protoOf(MappedMutableProblogTheory).s1s = function (clauses) {
+    return this.t1s(asIterable_0(clauses));
   };
   protoOf(MappedMutableProblogTheory).retractSequence = function (clauses) {
-    return this.w1s(clauses);
+    return this.s1s(clauses);
   };
-  protoOf(MappedMutableProblogTheory).f1t = function (head) {
-    return this.b1m(Companion_instance_4.of(head, [Companion_getInstance_0().anonymous()]));
+  protoOf(MappedMutableProblogTheory).n1t = function (head) {
+    return this.x1l(Companion_instance_4.of(head, [Companion_getInstance_0().anonymous()]));
   };
   protoOf(MappedMutableProblogTheory).retractAllByHead = function (head) {
-    return this.f1t(head);
+    return this.n1t(head);
   };
   function MappedProblogTheory(clauses, unificator, theory) {
-    unificator = unificator === VOID ? Companion_getInstance_8().g1l() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance_8().c1l() : unificator;
     var tmp;
     if (theory === VOID) {
       var tmp_0 = Companion_instance_8;
@@ -2560,7 +2560,7 @@
         while (tmp0_iterator.s()) {
           var element = tmp0_iterator.u();
           // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedProblogTheory.<init>.<anonymous>' call
-          var list = ClauseMappingUtils_getInstance().l3d(element);
+          var list = ClauseMappingUtils_getInstance().c3e(element);
           addAll(destination, list);
         }
         tmp_1 = destination;
@@ -2571,109 +2571,109 @@
       tmp = theory;
     }
     theory = tmp;
-    this.p3d_1 = theory;
+    this.g3e_1 = theory;
   }
-  protoOf(MappedProblogTheory).t1l = function () {
-    return this.p3d_1.t1l();
+  protoOf(MappedProblogTheory).p1l = function () {
+    return this.g3e_1.p1l();
   };
-  protoOf(MappedProblogTheory).m1l = function () {
-    return this.p3d_1.m1l();
+  protoOf(MappedProblogTheory).i1l = function () {
+    return this.g3e_1.i1l();
   };
-  protoOf(MappedProblogTheory).o1l = function () {
-    return this.p3d_1.o1l();
+  protoOf(MappedProblogTheory).k1l = function () {
+    return this.g3e_1.k1l();
   };
-  protoOf(MappedProblogTheory).j1s = function () {
-    return this.p3d_1.j1s();
+  protoOf(MappedProblogTheory).f1s = function () {
+    return this.g3e_1.f1s();
   };
   protoOf(MappedProblogTheory).l = function () {
-    return this.p3d_1.l();
+    return this.g3e_1.l();
   };
   protoOf(MappedProblogTheory).vt = function () {
-    return this.p3d_1.vt();
+    return this.g3e_1.vt();
   };
-  protoOf(MappedProblogTheory).j1l = function () {
-    return this.p3d_1.j1l();
+  protoOf(MappedProblogTheory).f1l = function () {
+    return this.g3e_1.f1l();
   };
   protoOf(MappedProblogTheory).clone = function () {
-    return this.p3d_1.clone();
+    return this.g3e_1.clone();
   };
   protoOf(MappedProblogTheory).contains = function (clause) {
-    return this.p3d_1.contains(clause);
+    return this.g3e_1.contains(clause);
   };
   protoOf(MappedProblogTheory).containsIndicator = function (indicator) {
-    return this.p3d_1.containsIndicator(indicator);
+    return this.g3e_1.containsIndicator(indicator);
   };
   protoOf(MappedProblogTheory).containsHead = function (head) {
-    return this.p3d_1.containsHead(head);
+    return this.g3e_1.containsHead(head);
   };
   protoOf(MappedProblogTheory).containsTag = function (name) {
-    return this.p3d_1.containsTag(name);
+    return this.g3e_1.containsTag(name);
   };
   protoOf(MappedProblogTheory).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.p3d_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.g3e_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(MappedProblogTheory).get = function (clause) {
-    return this.p3d_1.get(clause);
+    return this.g3e_1.get(clause);
   };
   protoOf(MappedProblogTheory).getByIndicator = function (indicator) {
-    return this.p3d_1.getByIndicator(indicator);
+    return this.g3e_1.getByIndicator(indicator);
   };
   protoOf(MappedProblogTheory).getByHead = function (head) {
-    return this.p3d_1.getByHead(head);
+    return this.g3e_1.getByHead(head);
   };
   protoOf(MappedProblogTheory).getTag = function (name) {
-    return this.p3d_1.getTag(name);
+    return this.g3e_1.getTag(name);
   };
   protoOf(MappedProblogTheory).r = function () {
-    return this.p3d_1.r();
+    return this.g3e_1.r();
   };
   protoOf(MappedProblogTheory).resetTags = function (tags) {
-    return this.p3d_1.resetTags(tags);
+    return this.g3e_1.resetTags(tags);
   };
   protoOf(MappedProblogTheory).setUnificator = function (unificator) {
-    return this.p3d_1.setUnificator(unificator);
+    return this.g3e_1.setUnificator(unificator);
   };
   protoOf(MappedProblogTheory).toStringAsProlog = function (asPrologText) {
-    return this.p3d_1.toStringAsProlog(asPrologText);
+    return this.g3e_1.toStringAsProlog(asPrologText);
   };
-  protoOf(MappedProblogTheory).z1s = function () {
+  protoOf(MappedProblogTheory).v1s = function () {
     return false;
   };
-  protoOf(MappedProblogTheory).a1t = function () {
-    return Companion_instance_9.ofIterable(this.j1l(), this);
+  protoOf(MappedProblogTheory).i1t = function () {
+    return Companion_instance_9.ofIterable(this.f1l(), this);
   };
   protoOf(MappedProblogTheory).toMutableTheory = function () {
-    return this.a1t();
+    return this.i1t();
   };
-  protoOf(MappedProblogTheory).z1r = function () {
+  protoOf(MappedProblogTheory).v1r = function () {
     return this;
   };
   protoOf(MappedProblogTheory).toImmutableTheory = function () {
-    return this.z1r();
+    return this.v1r();
   };
-  protoOf(MappedProblogTheory).o3d = function (theory) {
-    return new MappedProblogTheory(null, this.j1l(), this.p3d_1.plusTheory(theory));
+  protoOf(MappedProblogTheory).f3e = function (theory) {
+    return new MappedProblogTheory(null, this.f1l(), this.g3e_1.plusTheory(theory));
   };
-  protoOf(MappedProblogTheory).m1s = function (theory) {
+  protoOf(MappedProblogTheory).i1s = function (theory) {
     var tmp;
     if (isInterface(theory, ProblogTheory)) {
-      tmp = this.o3d(theory);
+      tmp = this.f3e(theory);
     } else {
-      tmp = this.o3d(new MappedProblogTheory(theory, this.j1l()));
+      tmp = this.f3e(new MappedProblogTheory(theory, this.f1l()));
     }
     return tmp;
   };
   protoOf(MappedProblogTheory).plusTheory = function (theory) {
-    return this.m1s(theory);
+    return this.i1s(theory);
   };
-  protoOf(MappedProblogTheory).a1s = function (clause) {
-    var mapped = ClauseMappingUtils_getInstance().l3d(clause);
-    return new MappedProblogTheory(null, this.j1l(), this.p3d_1.plusTheory(Companion_instance_8.indexedOfIterable(this.j1l(), mapped)));
+  protoOf(MappedProblogTheory).w1r = function (clause) {
+    var mapped = ClauseMappingUtils_getInstance().c3e(clause);
+    return new MappedProblogTheory(null, this.f1l(), this.g3e_1.plusTheory(Companion_instance_8.indexedOfIterable(this.f1l(), mapped)));
   };
   protoOf(MappedProblogTheory).plus = function (clause) {
-    return this.a1s(clause);
+    return this.w1r(clause);
   };
-  protoOf(MappedProblogTheory).q1s = function (clauses) {
+  protoOf(MappedProblogTheory).m1s = function (clauses) {
     // Inline function 'kotlin.collections.flatMap' call
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination = ArrayList_init_$Create$_0();
@@ -2681,16 +2681,16 @@
     while (tmp0_iterator.s()) {
       var element = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedProblogTheory.assertA.<anonymous>' call
-      var list = ClauseMappingUtils_getInstance().l3d(element);
+      var list = ClauseMappingUtils_getInstance().c3e(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    return new MappedProblogTheory(null, this.j1l(), this.p3d_1.assertAIterable(mapped));
+    return new MappedProblogTheory(null, this.f1l(), this.g3e_1.assertAIterable(mapped));
   };
   protoOf(MappedProblogTheory).assertAIterable = function (clauses) {
-    return this.q1s(clauses);
+    return this.m1s(clauses);
   };
-  protoOf(MappedProblogTheory).t1s = function (clauses) {
+  protoOf(MappedProblogTheory).p1s = function (clauses) {
     // Inline function 'kotlin.collections.flatMap' call
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination = ArrayList_init_$Create$_0();
@@ -2698,16 +2698,16 @@
     while (tmp0_iterator.s()) {
       var element = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedProblogTheory.assertZ.<anonymous>' call
-      var list = ClauseMappingUtils_getInstance().l3d(element);
+      var list = ClauseMappingUtils_getInstance().c3e(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    return new MappedProblogTheory(null, this.j1l(), this.p3d_1.assertZIterable(mapped));
+    return new MappedProblogTheory(null, this.f1l(), this.g3e_1.assertZIterable(mapped));
   };
   protoOf(MappedProblogTheory).assertZIterable = function (clauses) {
-    return this.t1s(clauses);
+    return this.p1s(clauses);
   };
-  protoOf(MappedProblogTheory).x1s = function (clauses) {
+  protoOf(MappedProblogTheory).t1s = function (clauses) {
     // Inline function 'kotlin.collections.flatMap' call
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination = ArrayList_init_$Create$_0();
@@ -2715,24 +2715,24 @@
     while (tmp0_iterator.s()) {
       var element = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.knowledge.impl.MappedProblogTheory.retract.<anonymous>' call
-      var list = ClauseMappingUtils_getInstance().l3d(element);
+      var list = ClauseMappingUtils_getInstance().c3e(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    var result = this.p3d_1.retractIterable(mapped);
+    var result = this.g3e_1.retractIterable(mapped);
     var tmp;
     if (result instanceof Success) {
-      tmp = new Success(new MappedProblogTheory(null, this.j1l(), result.g1s()), result.h1t_1);
+      tmp = new Success(new MappedProblogTheory(null, this.f1l(), result.c1s()), result.p1t_1);
     } else {
-      tmp = new Failure(new MappedProblogTheory(null, this.j1l(), result.g1s()));
+      tmp = new Failure(new MappedProblogTheory(null, this.f1l(), result.c1s()));
     }
     return tmp;
   };
   protoOf(MappedProblogTheory).retractIterable = function (clauses) {
-    return this.x1s(clauses);
+    return this.t1s(clauses);
   };
-  protoOf(MappedProblogTheory).b1m = function (clause) {
-    var mappedClauses = ClauseMappingUtils_getInstance().l3d(clause);
+  protoOf(MappedProblogTheory).x1l = function (clause) {
+    var mappedClauses = ClauseMappingUtils_getInstance().c3e(clause);
     var result = null;
     var tmp0_iterator = mappedClauses.r();
     while (tmp0_iterator.s()) {
@@ -2744,92 +2744,92 @@
         tmp = !(result instanceof Failure);
       }
       if (tmp) {
-        result = this.p3d_1.retractAll(c);
+        result = this.g3e_1.retractAll(c);
       }
     }
     var tmp_0;
     if (result instanceof Success) {
-      tmp_0 = new Success(new MappedProblogTheory(null, this.j1l(), result.g1s()), result.h1t_1);
+      tmp_0 = new Success(new MappedProblogTheory(null, this.f1l(), result.c1s()), result.p1t_1);
     } else {
       tmp_0 = new Failure(this);
     }
     return tmp_0;
   };
   protoOf(MappedProblogTheory).retractAll = function (clause) {
-    return this.b1m(clause);
+    return this.x1l(clause);
   };
-  protoOf(MappedProblogTheory).f1s = function (indicator) {
-    return new MappedProblogTheory(null, this.j1l(), this.p3d_1.abolish(ClauseMappingUtils_getInstance().m3d(indicator)));
+  protoOf(MappedProblogTheory).b1s = function (indicator) {
+    return new MappedProblogTheory(null, this.f1l(), this.g3e_1.abolish(ClauseMappingUtils_getInstance().d3e(indicator)));
   };
   protoOf(MappedProblogTheory).abolish = function (indicator) {
-    return this.f1s(indicator);
+    return this.b1s(indicator);
   };
-  protoOf(MappedProblogTheory).b1t = function (struct) {
-    return this.o1s(Companion_instance.of(struct));
+  protoOf(MappedProblogTheory).j1t = function (struct) {
+    return this.k1s(Companion_instance.of(struct));
   };
   protoOf(MappedProblogTheory).assertAFact = function (struct) {
-    return this.b1t(struct);
+    return this.j1t(struct);
   };
-  protoOf(MappedProblogTheory).c1t = function (struct) {
-    return this.s1s(Companion_instance.of(struct));
+  protoOf(MappedProblogTheory).k1t = function (struct) {
+    return this.o1s(Companion_instance.of(struct));
   };
   protoOf(MappedProblogTheory).assertZFact = function (struct) {
-    return this.c1t(struct);
+    return this.k1t(struct);
   };
-  protoOf(MappedProblogTheory).o1s = function (clause) {
-    return this.q1s(listOf(clause));
+  protoOf(MappedProblogTheory).k1s = function (clause) {
+    return this.m1s(listOf(clause));
   };
   protoOf(MappedProblogTheory).assertA = function (clause) {
-    return this.o1s(clause);
+    return this.k1s(clause);
   };
-  protoOf(MappedProblogTheory).r1s = function (clauses) {
-    return this.q1s(asIterable_0(clauses));
+  protoOf(MappedProblogTheory).n1s = function (clauses) {
+    return this.m1s(asIterable_0(clauses));
   };
   protoOf(MappedProblogTheory).assertASequence = function (clauses) {
-    return this.r1s(clauses);
+    return this.n1s(clauses);
   };
-  protoOf(MappedProblogTheory).s1s = function (clause) {
-    return this.t1s(listOf(clause));
+  protoOf(MappedProblogTheory).o1s = function (clause) {
+    return this.p1s(listOf(clause));
   };
   protoOf(MappedProblogTheory).assertZ = function (clause) {
-    return this.s1s(clause);
+    return this.o1s(clause);
   };
-  protoOf(MappedProblogTheory).u1s = function (clauses) {
-    return this.t1s(asIterable_0(clauses));
+  protoOf(MappedProblogTheory).q1s = function (clauses) {
+    return this.p1s(asIterable_0(clauses));
   };
   protoOf(MappedProblogTheory).assertZSequence = function (clauses) {
-    return this.u1s(clauses);
+    return this.q1s(clauses);
   };
-  protoOf(MappedProblogTheory).e1t = function (head) {
-    return this.d1t(Companion_instance_4.of(head, [Companion_getInstance_0().anonymous()]));
+  protoOf(MappedProblogTheory).m1t = function (head) {
+    return this.l1t(Companion_instance_4.of(head, [Companion_getInstance_0().anonymous()]));
   };
   protoOf(MappedProblogTheory).retractByHead = function (head) {
-    return this.e1t(head);
+    return this.m1t(head);
   };
-  protoOf(MappedProblogTheory).d1t = function (clause) {
-    return this.x1s(listOf(clause));
+  protoOf(MappedProblogTheory).l1t = function (clause) {
+    return this.t1s(listOf(clause));
   };
   protoOf(MappedProblogTheory).retract = function (clause) {
-    return this.d1t(clause);
+    return this.l1t(clause);
   };
-  protoOf(MappedProblogTheory).w1s = function (clauses) {
-    return this.x1s(asIterable_0(clauses));
+  protoOf(MappedProblogTheory).s1s = function (clauses) {
+    return this.t1s(asIterable_0(clauses));
   };
   protoOf(MappedProblogTheory).retractSequence = function (clauses) {
-    return this.w1s(clauses);
+    return this.s1s(clauses);
   };
-  protoOf(MappedProblogTheory).f1t = function (head) {
-    return this.b1m(Companion_instance_4.of(head, [Companion_getInstance_0().anonymous()]));
+  protoOf(MappedProblogTheory).n1t = function (head) {
+    return this.x1l(Companion_instance_4.of(head, [Companion_getInstance_0().anonymous()]));
   };
   protoOf(MappedProblogTheory).retractAllByHead = function (head) {
-    return this.f1t(head);
+    return this.n1t(head);
   };
   function NothingClauseMapper() {
   }
-  protoOf(NothingClauseMapper).z3c = function (clause) {
+  protoOf(NothingClauseMapper).q3d = function (clause) {
     return true;
   };
-  protoOf(NothingClauseMapper).a3d = function (clause) {
+  protoOf(NothingClauseMapper).r3d = function (clause) {
     return listOf(clause);
   };
   var NothingClauseMapper_instance;
@@ -2838,7 +2838,7 @@
   }
   function ProbabilisticClauseMapper() {
   }
-  protoOf(ProbabilisticClauseMapper).z3c = function (clause) {
+  protoOf(ProbabilisticClauseMapper).q3d = function (clause) {
     var tmp;
     if (isInterface(clause, Rule)) {
       tmp = clause.wy().qw() === get_ANNOTATION_FUNCTOR();
@@ -2847,14 +2847,14 @@
     }
     return tmp;
   };
-  protoOf(ProbabilisticClauseMapper).a3d = function (clause) {
+  protoOf(ProbabilisticClauseMapper).r3d = function (clause) {
     if (!isInterface(clause, Rule)) {
       throw new ClauseMappingException('Clause is not an instance of Rule: ' + clause);
     }
-    var mapped = this.b3d(clause);
-    return listOf(this.c3d(mapped.ye_1, Companion_getInstance_11().o3c(mapped.ze_1)));
+    var mapped = this.s3d(clause);
+    return listOf(this.t3d(mapped.ye_1, Companion_getInstance_11().f3d(mapped.ze_1)));
   };
-  protoOf(ProbabilisticClauseMapper).b3d = function (rule) {
+  protoOf(ProbabilisticClauseMapper).s3d = function (rule) {
     if (!(rule.wy().kw() === 2)) {
       throw TuPrologException_init_$Create$('Invalid probabilistic rule: ' + rule.wy());
     }
@@ -2884,10 +2884,10 @@
     headTerm = anonVariablesFix.wy();
     bodyTerm = anonVariablesFix.xy();
     var extraVariables = get_extraVariables(Companion_instance_4.of(headTerm, [bodyTerm]));
-    var probTerm_0 = new ProbTerm(ClauseMappingUtils_getInstance().k3d(), probability, headTerm, extraVariables);
+    var probTerm_0 = new ProbTerm(ClauseMappingUtils_getInstance().b3e(), probability, headTerm, extraVariables);
     return new Pair(Companion_instance_4.of(headTerm, [bodyTerm]), probTerm_0);
   };
-  protoOf(ProbabilisticClauseMapper).c3d = function (rule, explanation) {
+  protoOf(ProbabilisticClauseMapper).t3d = function (rule, explanation) {
     var tmp = rule.xy();
     if (isInterface(tmp, Truth)) {
       return Companion_instance_4.of(withExplanation(rule.wy(), toTerm(explanation)), [rule.xy()]);
@@ -2913,16 +2913,16 @@
   }
   function PrologClauseMapper() {
   }
-  protoOf(PrologClauseMapper).z3c = function (clause) {
+  protoOf(PrologClauseMapper).q3d = function (clause) {
     return isInterface(clause, Rule);
   };
-  protoOf(PrologClauseMapper).a3d = function (clause) {
+  protoOf(PrologClauseMapper).r3d = function (clause) {
     if (!isInterface(clause, Rule)) {
       throw new ClauseMappingException('Clause is not an instance of Rule: ' + clause);
     }
     var tmp = clause.xy();
     if (isInterface(tmp, Truth)) {
-      return listOf(Companion_instance_4.of(withExplanation(clause.wy(), toTerm(Companion_getInstance_11().k3c_1)), [clause.xy()]));
+      return listOf(Companion_instance_4.of(withExplanation(clause.wy(), toTerm(Companion_getInstance_11().b3d_1)), [clause.xy()]));
     }
     var tmp_0 = Companion_getInstance_0();
     ProblogLib_getInstance();
@@ -2934,18 +2934,18 @@
     return PrologClauseMapper_instance;
   }
   function _get_prob__dc6m52(_this__u8e3s4, $this) {
-    return _this__u8e3s4.g3b_1.w3c();
+    return _this__u8e3s4.x3b_1.n3d();
   }
   function ProbExplAnd() {
     ProbExplAnd_instance = this;
     ProblogLib_getInstance();
     NonBacktrackable.call(this, 'prob' + '_expl_and');
   }
-  protoOf(ProbExplAnd).y2q = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_9().l2g(_this__u8e3s4, 1);
-    Companion_getInstance_9().r2g(_this__u8e3s4, 1);
-    if (ProbSetConfig_getInstance().r3d(_this__u8e3s4.context)) {
-      return _this__u8e3s4.replyWith(Companion_getInstance_9().f2g(_this__u8e3s4, first, toTerm(Companion_getInstance_11().k3c_1)), VOID, []);
+  protoOf(ProbExplAnd).p2r = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_9().c2h(_this__u8e3s4, 1);
+    Companion_getInstance_9().i2h(_this__u8e3s4, 1);
+    if (ProbSetConfig_getInstance().i3e(_this__u8e3s4.context)) {
+      return _this__u8e3s4.replyWith(Companion_getInstance_9().w2g(_this__u8e3s4, first, toTerm(Companion_getInstance_11().b3d_1)), VOID, []);
     }
     var tmp;
     var tmp_0;
@@ -2961,12 +2961,12 @@
       tmp_0 = false;
     }
     if (tmp_0) {
-      var explanation = (_get_prob__dc6m52(second, this) === 0.0 ? true : _get_prob__dc6m52(third, this) === 0.0) ? Companion_getInstance_11().j3c_1 : (_get_prob__dc6m52(second, this) === 1.0 ? _get_prob__dc6m52(third, this) === 1.0 : false) ? Companion_getInstance_11().k3c_1 : _get_prob__dc6m52(second, this) === 1.0 ? third.g3b_1 : _get_prob__dc6m52(third, this) === 1.0 ? second.g3b_1 : second.g3b_1.and(third.g3b_1);
+      var explanation = (_get_prob__dc6m52(second, this) === 0.0 ? true : _get_prob__dc6m52(third, this) === 0.0) ? Companion_getInstance_11().a3d_1 : (_get_prob__dc6m52(second, this) === 1.0 ? _get_prob__dc6m52(third, this) === 1.0 : false) ? Companion_getInstance_11().b3d_1 : _get_prob__dc6m52(second, this) === 1.0 ? third.x3b_1 : _get_prob__dc6m52(third, this) === 1.0 ? second.x3b_1 : second.x3b_1.and(third.x3b_1);
       var tmp_2;
-      if (explanation.w3c() === 0.0) {
+      if (explanation.n3d() === 0.0) {
         tmp_2 = _this__u8e3s4.replyWithCondition(false, VOID, []);
       } else {
-        tmp_2 = _this__u8e3s4.replyWith(Companion_getInstance_9().f2g(_this__u8e3s4, first, new ProbExplanationTerm(explanation)), VOID, []);
+        tmp_2 = _this__u8e3s4.replyWith(Companion_getInstance_9().w2g(_this__u8e3s4, first, new ProbExplanationTerm(explanation)), VOID, []);
       }
       tmp = tmp_2;
     } else {
@@ -2976,8 +2976,8 @@
     }
     return tmp;
   };
-  protoOf(ProbExplAnd).q2i = function (_this__u8e3s4, first, second, third) {
-    return this.y2q(_this__u8e3s4, first, second, third);
+  protoOf(ProbExplAnd).h2j = function (_this__u8e3s4, first, second, third) {
+    return this.p2r(_this__u8e3s4, first, second, third);
   };
   var ProbExplAnd_instance;
   function ProbExplAnd_getInstance() {
@@ -2986,22 +2986,22 @@
     return ProbExplAnd_instance;
   }
   function ProbHelper$computeAllSubstitutions$slambda($goal, $this_computeAllSubstitutions, $third, $first, $second, $goalSignature, resultContinuation) {
-    this.a3e_1 = $goal;
-    this.b3e_1 = $this_computeAllSubstitutions;
-    this.c3e_1 = $third;
-    this.d3e_1 = $first;
-    this.e3e_1 = $second;
-    this.f3e_1 = $goalSignature;
+    this.r3e_1 = $goal;
+    this.s3e_1 = $this_computeAllSubstitutions;
+    this.t3e_1 = $third;
+    this.u3e_1 = $first;
+    this.v3e_1 = $second;
+    this.w3e_1 = $goalSignature;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ProbHelper$computeAllSubstitutions$slambda).t2s = function ($this$sequence, $completion) {
-    var tmp = this.u2s($this$sequence, $completion);
+  protoOf(ProbHelper$computeAllSubstitutions$slambda).k2t = function ($this$sequence, $completion) {
+    var tmp = this.l2t($this$sequence, $completion);
     tmp.pc_1 = Unit_instance;
     tmp.qc_1 = null;
     return tmp.yc();
   };
   protoOf(ProbHelper$computeAllSubstitutions$slambda).ld = function (p1, $completion) {
-    return this.t2s(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.k2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ProbHelper$computeAllSubstitutions$slambda).yc = function () {
     var suspendResult = this.pc_1;
@@ -3011,91 +3011,91 @@
         switch (tmp) {
           case 0:
             this.oc_1 = 18;
-            this.h3e_1 = this.a3e_1.qw();
-            if (this.h3e_1 === '\\+' ? true : this.h3e_1 === 'not') {
+            this.y3e_1 = this.r3e_1.qw();
+            if (this.y3e_1 === '\\+' ? true : this.y3e_1 === 'not') {
               this.nc_1 = 16;
               var tmp_0;
-              if (ProbSetConfig_getInstance().r3d(this.b3e_1.context)) {
+              if (ProbSetConfig_getInstance().i3e(this.s3e_1.context)) {
                 var tmp_1 = Companion_getInstance_9();
                 var tmp_2 = Companion_getInstance_1();
-                var tmp_3 = this.a3e_1.qw();
+                var tmp_3 = this.r3e_1.qw();
                 var tmp_4 = Companion_getInstance_1();
                 var this_0 = Prob_getInstance();
-                tmp_0 = tmp_1.f2g(this.b3e_1, this.c3e_1, tmp_2.of(tmp_3, [tmp_4.of(this_0.signature.name, [Companion_getInstance_0().anonymous(), this.a3e_1.get(0)])])).plus(Companion_getInstance_9().f2g(this.b3e_1, this.d3e_1, toTerm(Companion_getInstance_11().k3c_1)));
+                tmp_0 = tmp_1.w2g(this.s3e_1, this.t3e_1, tmp_2.of(tmp_3, [tmp_4.of(this_0.signature.name, [Companion_getInstance_0().anonymous(), this.r3e_1.get(0)])])).plus(Companion_getInstance_9().w2g(this.s3e_1, this.u3e_1, toTerm(Companion_getInstance_11().b3d_1)));
               } else {
                 var tmp_5 = Companion_getInstance_9();
                 var tmp_6 = Companion_getInstance_1();
                 var this_1 = ProbNegationAsFailure_getInstance();
-                tmp_0 = tmp_5.f2g(this.b3e_1, this.c3e_1, tmp_6.of(this_1.signature.name, [this.d3e_1, this.a3e_1.get(0)]));
+                tmp_0 = tmp_5.w2g(this.s3e_1, this.t3e_1, tmp_6.of(this_1.signature.name, [this.u3e_1, this.r3e_1.get(0)]));
               }
-              suspendResult = this.g3e_1.ef(tmp_0, this);
+              suspendResult = this.x3e_1.ef(tmp_0, this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              if ((this.h3e_1 === ',' ? true : this.h3e_1 === ';') ? true : this.h3e_1 === '->') {
+              if ((this.y3e_1 === ',' ? true : this.y3e_1 === ';') ? true : this.y3e_1 === '->') {
                 this.nc_1 = 15;
                 var tmp_7;
-                if (ProbSetConfig_getInstance().r3d(this.b3e_1.context)) {
-                  tmp_7 = Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, withBodyExplanation(this.a3e_1, Companion_getInstance_0().anonymous())).plus(Companion_getInstance_9().f2g(this.b3e_1, this.d3e_1, toTerm(Companion_getInstance_11().k3c_1)));
+                if (ProbSetConfig_getInstance().i3e(this.s3e_1.context)) {
+                  tmp_7 = Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, withBodyExplanation(this.r3e_1, Companion_getInstance_0().anonymous())).plus(Companion_getInstance_9().w2g(this.s3e_1, this.u3e_1, toTerm(Companion_getInstance_11().b3d_1)));
                 } else {
-                  tmp_7 = Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, withBodyExplanation(this.a3e_1, this.d3e_1));
+                  tmp_7 = Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, withBodyExplanation(this.r3e_1, this.u3e_1));
                 }
-                suspendResult = this.g3e_1.ef(tmp_7, this);
+                suspendResult = this.x3e_1.ef(tmp_7, this);
                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                   return suspendResult;
                 }
                 continue $sm;
               } else {
-                if (this.h3e_1 === 'call') {
-                  this.i3e_1 = this.a3e_1.get(0);
+                if (this.y3e_1 === 'call') {
+                  this.z3e_1 = this.r3e_1.get(0);
                   this.nc_1 = 14;
-                  suspendResult = this.g3e_1.ef(Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, Companion_instance_0.of(Companion_getInstance_1().of('ensure_executable', [this.i3e_1]), Companion_getInstance_1().of(this.a3e_1.qw(), [withBodyExplanation(this.i3e_1, this.d3e_1)]))), this);
+                  suspendResult = this.x3e_1.ef(Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, Companion_instance_0.of(Companion_getInstance_1().of('ensure_executable', [this.z3e_1]), Companion_getInstance_1().of(this.r3e_1.qw(), [withBodyExplanation(this.z3e_1, this.u3e_1)]))), this);
                   if (suspendResult === get_COROUTINE_SUSPENDED()) {
                     return suspendResult;
                   }
                   continue $sm;
                 } else {
-                  if (this.h3e_1 === 'catch') {
+                  if (this.y3e_1 === 'catch') {
                     this.nc_1 = 13;
-                    suspendResult = this.g3e_1.ef(Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, Companion_getInstance_1().of(this.a3e_1.qw(), [withBodyExplanation(this.a3e_1.get(0), this.d3e_1), this.a3e_1.get(1), withBodyExplanation(this.a3e_1.get(2), this.d3e_1)])), this);
+                    suspendResult = this.x3e_1.ef(Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, Companion_getInstance_1().of(this.r3e_1.qw(), [withBodyExplanation(this.r3e_1.get(0), this.u3e_1), this.r3e_1.get(1), withBodyExplanation(this.r3e_1.get(2), this.u3e_1)])), this);
                     if (suspendResult === get_COROUTINE_SUSPENDED()) {
                       return suspendResult;
                     }
                     continue $sm;
                   } else {
-                    if (this.h3e_1 === 'findall') {
+                    if (this.y3e_1 === 'findall') {
                       var tmp_8 = this;
-                      var this_2 = this.a3e_1.rw();
-                      tmp_8.j3e_1 = copyToArray(this_2);
-                      this.j3e_1[1] = withBodyExplanation(this.j3e_1[1], Companion_getInstance_0().anonymous());
+                      var this_2 = this.r3e_1.rw();
+                      tmp_8.a3f_1 = copyToArray(this_2);
+                      this.a3f_1[1] = withBodyExplanation(this.a3f_1[1], Companion_getInstance_0().anonymous());
                       this.nc_1 = 12;
-                      suspendResult = this.g3e_1.ef(Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, Companion_getInstance_1().of(this.a3e_1.qw(), this.j3e_1.slice())).plus(Companion_getInstance_9().f2g(this.b3e_1, this.d3e_1, toTerm(Companion_getInstance_11().k3c_1))), this);
+                      suspendResult = this.x3e_1.ef(Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, Companion_getInstance_1().of(this.r3e_1.qw(), this.a3f_1.slice())).plus(Companion_getInstance_9().w2g(this.s3e_1, this.u3e_1, toTerm(Companion_getInstance_11().b3d_1))), this);
                       if (suspendResult === get_COROUTINE_SUSPENDED()) {
                         return suspendResult;
                       }
                       continue $sm;
                     } else {
-                      if ((this.h3e_1 === 'assert' ? true : this.h3e_1 === 'asserta') ? true : this.h3e_1 === 'assertz') {
-                        this.k3e_1 = this.a3e_1.get(0);
+                      if ((this.y3e_1 === 'assert' ? true : this.y3e_1 === 'asserta') ? true : this.y3e_1 === 'assertz') {
+                        this.b3f_1 = this.r3e_1.get(0);
                         var tmp_9 = this;
-                        var tmp1_subject = this.k3e_1;
+                        var tmp1_subject = this.b3f_1;
                         var tmp_10;
                         if (isInterface(tmp1_subject, Clause)) {
-                          tmp_10 = extractSignature(ensureNotNull(this.k3e_1.wy()));
+                          tmp_10 = extractSignature(ensureNotNull(this.b3f_1.wy()));
                         } else {
-                          tmp_10 = extractSignature(safeToStruct(this.k3e_1));
+                          tmp_10 = extractSignature(safeToStruct(this.b3f_1));
                         }
-                        tmp_9.l3e_1 = tmp_10;
+                        tmp_9.c3f_1 = tmp_10;
                         var tmp_11;
-                        if (this.b3e_1.context.u1u().containsSignature(this.l3e_1)) {
+                        if (this.s3e_1.context.c1v().containsSignature(this.c3f_1)) {
                           tmp_11 = true;
                         } else {
                           var tmp_12;
-                          var tmp_13 = this.k3e_1;
+                          var tmp_13 = this.b3f_1;
                           if (isInterface(tmp_13, Clause)) {
-                            tmp_12 = !this.k3e_1.gz();
+                            tmp_12 = !this.b3f_1.gz();
                           } else {
                             tmp_12 = false;
                           }
@@ -3103,20 +3103,20 @@
                         }
                         if (tmp_11) {
                           this.nc_1 = 10;
-                          suspendResult = this.g3e_1.ef(Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, this.a3e_1).plus(Companion_getInstance_9().f2g(this.b3e_1, this.d3e_1, toTerm(Companion_getInstance_11().k3c_1))), this);
+                          suspendResult = this.x3e_1.ef(Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, this.r3e_1).plus(Companion_getInstance_9().w2g(this.s3e_1, this.u3e_1, toTerm(Companion_getInstance_11().b3d_1))), this);
                           if (suspendResult === get_COROUTINE_SUSPENDED()) {
                             return suspendResult;
                           }
                           continue $sm;
                         } else {
                           var tmp_14 = this;
-                          var tmp2_subject = this.k3e_1;
+                          var tmp2_subject = this.b3f_1;
                           var tmp_15;
                           if (isInterface(tmp2_subject, Clause)) {
-                            tmp_15 = ClauseMappingUtils_getInstance().l3d(this.k3e_1);
+                            tmp_15 = ClauseMappingUtils_getInstance().c3e(this.b3f_1);
                           } else {
                             if (isInterface(tmp2_subject, Struct)) {
-                              var this_3 = ClauseMappingUtils_getInstance().l3d(Companion_instance.of(this.k3e_1));
+                              var this_3 = ClauseMappingUtils_getInstance().c3e(Companion_instance.of(this.b3f_1));
                               var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_3, 10));
                               var tmp0_iterator = this_3.r();
                               while (tmp0_iterator.s()) {
@@ -3125,41 +3125,41 @@
                               }
                               tmp_15 = destination;
                             } else {
-                              tmp_15 = listOf(this.k3e_1);
+                              tmp_15 = listOf(this.b3f_1);
                             }
                           }
-                          tmp_14.m3e_1 = tmp_15;
+                          tmp_14.d3f_1 = tmp_15;
                           this.nc_1 = 9;
-                          var this_4 = this.m3e_1;
+                          var this_4 = this.d3f_1;
                           var destination_0 = ArrayList_init_$Create$(collectionSizeOrDefault(this_4, 10));
                           var tmp0_iterator_0 = this_4.r();
                           while (tmp0_iterator_0.s()) {
                             var item_0 = tmp0_iterator_0.u();
-                            destination_0.o(Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, Companion_getInstance_1().of(this.a3e_1.qw(), [item_0])).plus(Companion_getInstance_9().f2g(this.b3e_1, this.d3e_1, toTerm(Companion_getInstance_11().k3c_1))));
+                            destination_0.o(Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, Companion_getInstance_1().of(this.r3e_1.qw(), [item_0])).plus(Companion_getInstance_9().w2g(this.s3e_1, this.u3e_1, toTerm(Companion_getInstance_11().b3d_1))));
                           }
-                          suspendResult = this.g3e_1.gf(destination_0, this);
+                          suspendResult = this.x3e_1.gf(destination_0, this);
                           if (suspendResult === get_COROUTINE_SUSPENDED()) {
                             return suspendResult;
                           }
                           continue $sm;
                         }
                       } else {
-                        if (this.h3e_1 === 'retract' ? true : this.h3e_1 === 'retractall') {
-                          this.n3e_1 = this.a3e_1.get(0);
+                        if (this.y3e_1 === 'retract' ? true : this.y3e_1 === 'retractall') {
+                          this.e3f_1 = this.r3e_1.get(0);
                           this.nc_1 = 8;
                           var tmp_16 = Companion_getInstance_9();
                           var tmp_17 = Companion_getInstance_1();
-                          var tmp_18 = this.a3e_1.qw();
+                          var tmp_18 = this.r3e_1.qw();
                           var tmp_19;
                           var tmp_20;
                           var tmp_21;
-                          if (this.n3e_1.xw()) {
+                          if (this.e3f_1.xw()) {
                             tmp_21 = true;
                           } else {
                             var tmp_22;
-                            var tmp_23 = this.n3e_1;
+                            var tmp_23 = this.e3f_1;
                             if (isInterface(tmp_23, Struct)) {
-                              tmp_22 = this.n3e_1.qw() === ':-';
+                              tmp_22 = this.e3f_1.qw() === ':-';
                             } else {
                               tmp_22 = false;
                             }
@@ -3168,38 +3168,38 @@
                           if (tmp_21) {
                             tmp_20 = true;
                           } else {
-                            tmp_20 = this.b3e_1.context.u1u().containsSignature(extractSignature(safeToStruct(this.n3e_1)));
+                            tmp_20 = this.s3e_1.context.c1v().containsSignature(extractSignature(safeToStruct(this.e3f_1)));
                           }
                           if (tmp_20) {
-                            tmp_19 = this.n3e_1;
+                            tmp_19 = this.e3f_1;
                           } else {
-                            tmp_19 = withExplanation(this.n3e_1, this.d3e_1);
+                            tmp_19 = withExplanation(this.e3f_1, this.u3e_1);
                           }
-                          suspendResult = this.g3e_1.ef(tmp_16.f2g(this.b3e_1, this.c3e_1, tmp_17.of(tmp_18, [tmp_19])), this);
+                          suspendResult = this.x3e_1.ef(tmp_16.w2g(this.s3e_1, this.t3e_1, tmp_17.of(tmp_18, [tmp_19])), this);
                           if (suspendResult === get_COROUTINE_SUSPENDED()) {
                             return suspendResult;
                           }
                           continue $sm;
                         } else {
-                          if (this.h3e_1 === 'clause') {
-                            this.o3e_1 = this.a3e_1.get(0);
+                          if (this.y3e_1 === 'clause') {
+                            this.f3f_1 = this.r3e_1.get(0);
                             var tmp_24;
-                            var tmp_25 = this.o3e_1;
+                            var tmp_25 = this.f3f_1;
                             if (!isInterface(tmp_25, Struct)) {
                               tmp_24 = true;
                             } else {
-                              tmp_24 = this.b3e_1.context.u1u().hasProtected(extractSignature(this.o3e_1));
+                              tmp_24 = this.s3e_1.context.c1v().hasProtected(extractSignature(this.f3f_1));
                             }
                             if (tmp_24) {
                               this.nc_1 = 6;
-                              suspendResult = this.g3e_1.ef(Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, this.a3e_1).plus(Companion_getInstance_9().f2g(this.b3e_1, this.d3e_1, toTerm(Companion_getInstance_11().k3c_1))), this);
+                              suspendResult = this.x3e_1.ef(Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, this.r3e_1).plus(Companion_getInstance_9().w2g(this.s3e_1, this.u3e_1, toTerm(Companion_getInstance_11().b3d_1))), this);
                               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                 return suspendResult;
                               }
                               continue $sm;
                             } else {
                               this.nc_1 = 5;
-                              suspendResult = this.g3e_1.ef(Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, Companion_getInstance_1().of(this.a3e_1.qw(), [withExplanation(this.a3e_1.get(0), this.d3e_1), this.a3e_1.get(1)])), this);
+                              suspendResult = this.x3e_1.ef(Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, Companion_getInstance_1().of(this.r3e_1.qw(), [withExplanation(this.r3e_1.get(0), this.u3e_1), this.r3e_1.get(1)])), this);
                               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                 return suspendResult;
                               }
@@ -3208,16 +3208,16 @@
                           } else {
                             var tmp_26 = this;
                             var tmp_27;
-                            var tmp_28 = this.e3e_1;
+                            var tmp_28 = this.v3e_1;
                             if (isInterface(tmp_28, Truth)) {
                               tmp_27 = true;
                             } else {
-                              tmp_27 = this.b3e_1.context.u1u().containsSignature(this.f3e_1);
+                              tmp_27 = this.s3e_1.context.c1v().containsSignature(this.w3e_1);
                             }
-                            tmp_26.p3e_1 = tmp_27;
-                            if ((this.p3e_1 ? true : this.b3e_1.context.w1u().containsIndicator(this.f3e_1.toIndicator())) ? true : this.b3e_1.context.x1u().containsIndicator(this.f3e_1.toIndicator())) {
+                            tmp_26.g3f_1 = tmp_27;
+                            if ((this.g3f_1 ? true : this.s3e_1.context.e1v().containsIndicator(this.w3e_1.toIndicator())) ? true : this.s3e_1.context.f1v().containsIndicator(this.w3e_1.toIndicator())) {
                               this.nc_1 = 1;
-                              suspendResult = this.g3e_1.ef(Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, this.a3e_1).plus(Companion_getInstance_9().f2g(this.b3e_1, this.d3e_1, toTerm(Companion_getInstance_11().k3c_1))), this);
+                              suspendResult = this.x3e_1.ef(Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, this.r3e_1).plus(Companion_getInstance_9().w2g(this.s3e_1, this.u3e_1, toTerm(Companion_getInstance_11().b3d_1))), this);
                               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                 return suspendResult;
                               }
@@ -3239,9 +3239,9 @@
             this.nc_1 = 2;
             continue $sm;
           case 2:
-            if (!this.p3e_1) {
+            if (!this.g3f_1) {
               this.nc_1 = 3;
-              suspendResult = this.g3e_1.ef(Companion_getInstance_9().f2g(this.b3e_1, this.c3e_1, withExplanation(this.a3e_1, this.d3e_1)), this);
+              suspendResult = this.x3e_1.ef(Companion_getInstance_9().w2g(this.s3e_1, this.t3e_1, withExplanation(this.r3e_1, this.u3e_1)), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
@@ -3309,15 +3309,15 @@
       }
      while (true);
   };
-  protoOf(ProbHelper$computeAllSubstitutions$slambda).u2s = function ($this$sequence, completion) {
-    var i = new ProbHelper$computeAllSubstitutions$slambda(this.a3e_1, this.b3e_1, this.c3e_1, this.d3e_1, this.e3e_1, this.f3e_1, completion);
-    i.g3e_1 = $this$sequence;
+  protoOf(ProbHelper$computeAllSubstitutions$slambda).l2t = function ($this$sequence, completion) {
+    var i = new ProbHelper$computeAllSubstitutions$slambda(this.r3e_1, this.s3e_1, this.t3e_1, this.u3e_1, this.v3e_1, this.w3e_1, completion);
+    i.x3e_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, $completion) {
-      return i.t2s($this$sequence, $completion);
+      return i.k2t($this$sequence, $completion);
     };
     l.$arity = 1;
     return l;
@@ -3327,15 +3327,15 @@
     ProblogLib_getInstance();
     WithoutSideEffects.call(this, 'prob' + '_helper');
   }
-  protoOf(ProbHelper).q2o = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_9().l2g(_this__u8e3s4, 1);
-    Companion_getInstance_9().r2g(_this__u8e3s4, 1);
+  protoOf(ProbHelper).h2p = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_9().c2h(_this__u8e3s4, 1);
+    Companion_getInstance_9().i2h(_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));
   };
-  protoOf(ProbHelper).m2i = function (_this__u8e3s4, first, second, third) {
-    return this.q2o(_this__u8e3s4, first, second, third);
+  protoOf(ProbHelper).d2j = function (_this__u8e3s4, first, second, third) {
+    return this.h2p(_this__u8e3s4, first, second, third);
   };
   var ProbHelper_instance;
   function ProbHelper_getInstance() {
@@ -3348,9 +3348,9 @@
     ProblogLib_getInstance();
     NonBacktrackable_0.call(this, 'prob' + '_negation_as_failure');
   }
-  protoOf(ProbNegationAsFailure).w2o = function (_this__u8e3s4, first, second) {
-    Companion_getInstance_9().l2g(_this__u8e3s4, 1);
-    Companion_getInstance_9().r2g(_this__u8e3s4, 1);
+  protoOf(ProbNegationAsFailure).n2p = function (_this__u8e3s4, first, second) {
+    Companion_getInstance_9().c2h(_this__u8e3s4, 1);
+    Companion_getInstance_9().i2h(_this__u8e3s4, 1);
     var tmp;
     if (!second.ux()) {
       tmp = _this__u8e3s4.replyException(ResolutionException_init_$Create$('Probabilistic negation does not support non-ground goals: ' + second, VOID, _this__u8e3s4.context, []), VOID, []);
@@ -3365,7 +3365,7 @@
       if (solution == null) {
         tmp_2 = _this__u8e3s4.replyFail(VOID, []);
       } else {
-        var explanationTerm = solution.q1u().x2(explanationTermVar);
+        var explanationTerm = solution.y1u().x2(explanationTermVar);
         var tmp_3;
         var tmp_4;
         if (explanationTerm == null) {
@@ -3376,7 +3376,7 @@
         if (tmp_4) {
           tmp_3 = _this__u8e3s4.replyException(ResolutionException_init_$Create$('No valid explanation has been solved for goal: ' + second, VOID, _this__u8e3s4.context, []), VOID, []);
         } else {
-          tmp_3 = _this__u8e3s4.replyWith(Companion_getInstance_5().ofSubstitution(Companion_getInstance_9().f2g(_this__u8e3s4, first, new ProbExplanationTerm(explanationTerm.g3b_1.not())), []), VOID, []);
+          tmp_3 = _this__u8e3s4.replyWith(Companion_getInstance_5().ofSubstitution(Companion_getInstance_9().w2g(_this__u8e3s4, first, new ProbExplanationTerm(explanationTerm.x3b_1.not())), []), VOID, []);
         }
         tmp_2 = tmp_3;
       }
@@ -3384,8 +3384,8 @@
     }
     return tmp;
   };
-  protoOf(ProbNegationAsFailure).h2f = function (_this__u8e3s4, first, second) {
-    return this.w2o(_this__u8e3s4, first, second);
+  protoOf(ProbNegationAsFailure).y2f = function (_this__u8e3s4, first, second) {
+    return this.n2p(_this__u8e3s4, first, second);
   };
   var ProbNegationAsFailure_instance;
   function ProbNegationAsFailure_getInstance() {
@@ -3399,22 +3399,22 @@
     };
   }
   function ProbQuery$computeAllSubstitutions$slambda($solutions, $queryWithEvidenceExplanation, $evidenceExplanation, $this_computeAllSubstitutions, $first, $fourth, resultContinuation) {
-    this.a3f_1 = $solutions;
-    this.b3f_1 = $queryWithEvidenceExplanation;
-    this.c3f_1 = $evidenceExplanation;
-    this.d3f_1 = $this_computeAllSubstitutions;
-    this.e3f_1 = $first;
-    this.f3f_1 = $fourth;
+    this.r3f_1 = $solutions;
+    this.s3f_1 = $queryWithEvidenceExplanation;
+    this.t3f_1 = $evidenceExplanation;
+    this.u3f_1 = $this_computeAllSubstitutions;
+    this.v3f_1 = $first;
+    this.w3f_1 = $fourth;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ProbQuery$computeAllSubstitutions$slambda).t2s = function ($this$sequence, $completion) {
-    var tmp = this.u2s($this$sequence, $completion);
+  protoOf(ProbQuery$computeAllSubstitutions$slambda).k2t = function ($this$sequence, $completion) {
+    var tmp = this.l2t($this$sequence, $completion);
     tmp.pc_1 = Unit_instance;
     tmp.qc_1 = null;
     return tmp.yc();
   };
   protoOf(ProbQuery$computeAllSubstitutions$slambda).ld = function (p1, $completion) {
-    return this.t2s(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.k2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ProbQuery$computeAllSubstitutions$slambda).yc = function () {
     var suspendResult = this.pc_1;
@@ -3424,67 +3424,67 @@
         switch (tmp) {
           case 0:
             this.oc_1 = 8;
-            this.h3f_1 = this.a3f_1.r();
+            this.y3f_1 = this.r3f_1.r();
             this.nc_1 = 1;
             continue $sm;
           case 1:
-            if (!this.h3f_1.s()) {
+            if (!this.y3f_1.s()) {
               this.nc_1 = 7;
               continue $sm;
             }
 
-            this.i3f_1 = this.h3f_1.u();
-            if (this.i3f_1.a1w())
-              throw ensureNotNull(this.i3f_1.x1v());
-            this.j3f_1 = this.i3f_1.q1u().x2(this.b3f_1);
-            this.k3f_1 = this.i3f_1.q1u().x2(this.c3f_1);
+            this.z3f_1 = this.y3f_1.u();
+            if (this.z3f_1.i1w())
+              throw ensureNotNull(this.z3f_1.f1w());
+            this.a3g_1 = this.z3f_1.y1u().x2(this.s3f_1);
+            this.b3g_1 = this.z3f_1.y1u().x2(this.t3f_1);
             var tmp_0;
             var tmp_1;
             var tmp_2;
-            if (this.j3f_1 == null) {
+            if (this.a3g_1 == null) {
               tmp_2 = true;
             } else {
-              var tmp_3 = this.j3f_1;
+              var tmp_3 = this.a3g_1;
               tmp_2 = !(tmp_3 instanceof ProbExplanationTerm);
             }
 
             if (tmp_2) {
               tmp_1 = true;
             } else {
-              tmp_1 = this.k3f_1 == null;
+              tmp_1 = this.b3g_1 == null;
             }
 
             if (tmp_1) {
               tmp_0 = true;
             } else {
-              var tmp_4 = this.k3f_1;
+              var tmp_4 = this.b3g_1;
               tmp_0 = !(tmp_4 instanceof ProbExplanationTerm);
             }
 
             if (tmp_0) {
               this.nc_1 = 5;
-              suspendResult = this.g3f_1.ef(Companion_getInstance_5().failed(), this);
+              suspendResult = this.x3f_1.ef(Companion_getInstance_5().failed(), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.l3f_1 = this.j3f_1.g3b_1.x3c();
-              this.m3f_1 = this.k3f_1.g3b_1.x3c();
-              if (this.l3f_1 == null ? true : this.m3f_1 == null) {
+              this.c3g_1 = this.a3g_1.x3b_1.o3d();
+              this.d3g_1 = this.b3g_1.x3b_1.o3d();
+              if (this.c3g_1 == null ? true : this.d3g_1 == null) {
                 this.nc_1 = 3;
-                suspendResult = this.g3f_1.ef(Companion_getInstance_5().failed(), this);
+                suspendResult = this.x3f_1.ef(Companion_getInstance_5().failed(), this);
                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                   return suspendResult;
                 }
                 continue $sm;
               } else {
                 var tmp_5 = this;
-                var tmp_6 = this.i3f_1.q1u();
-                tmp_5.n3f_1 = tmp_6.filter(ProbQuery$computeAllSubstitutions$slambda$lambda(this.c3f_1, this.b3f_1));
-                this.o3f_1 = Companion_getInstance_6().ofDouble(this.l3f_1 / this.m3f_1);
+                var tmp_6 = this.z3f_1.y1u();
+                tmp_5.e3g_1 = tmp_6.filter(ProbQuery$computeAllSubstitutions$slambda$lambda(this.t3f_1, this.s3f_1));
+                this.f3g_1 = Companion_getInstance_6().ofDouble(this.c3g_1 / this.d3g_1);
                 this.nc_1 = 2;
-                suspendResult = this.g3f_1.ef(Companion_getInstance_5().ofSubstitution(this.n3f_1, [Companion_getInstance_9().f2g(this.d3f_1, this.e3f_1, this.o3f_1), Companion_getInstance_9().f2g(this.d3f_1, this.f3f_1, this.j3f_1)]), this);
+                suspendResult = this.x3f_1.ef(Companion_getInstance_5().ofSubstitution(this.e3g_1, [Companion_getInstance_9().w2g(this.u3f_1, this.v3f_1, this.f3g_1), Companion_getInstance_9().w2g(this.u3f_1, this.w3f_1, this.a3g_1)]), this);
                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                   return suspendResult;
                 }
@@ -3523,15 +3523,15 @@
       }
      while (true);
   };
-  protoOf(ProbQuery$computeAllSubstitutions$slambda).u2s = function ($this$sequence, completion) {
-    var i = new ProbQuery$computeAllSubstitutions$slambda(this.a3f_1, this.b3f_1, this.c3f_1, this.d3f_1, this.e3f_1, this.f3f_1, completion);
-    i.g3f_1 = $this$sequence;
+  protoOf(ProbQuery$computeAllSubstitutions$slambda).l2t = function ($this$sequence, completion) {
+    var i = new ProbQuery$computeAllSubstitutions$slambda(this.r3f_1, this.s3f_1, this.t3f_1, this.u3f_1, this.v3f_1, this.w3f_1, completion);
+    i.x3f_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, $completion) {
-      return i.t2s($this$sequence, $completion);
+      return i.k2t($this$sequence, $completion);
     };
     l.$arity = 1;
     return l;
@@ -3541,11 +3541,11 @@
     ProblogLib_getInstance();
     WithoutSideEffects_0.call(this, 'prob' + '_query');
   }
-  protoOf(ProbQuery).q3f = function (_this__u8e3s4, first, second, third, fourth) {
-    Companion_getInstance_9().l2g(_this__u8e3s4, 1);
-    Companion_getInstance_9().r2g(_this__u8e3s4, 1);
-    Companion_getInstance_9().p2g(_this__u8e3s4, 1);
-    Companion_getInstance_9().l2g(_this__u8e3s4, 2);
+  protoOf(ProbQuery).h3g = function (_this__u8e3s4, first, second, third, fourth) {
+    Companion_getInstance_9().c2h(_this__u8e3s4, 1);
+    Companion_getInstance_9().i2h(_this__u8e3s4, 1);
+    Companion_getInstance_9().g2h(_this__u8e3s4, 1);
+    Companion_getInstance_9().c2h(_this__u8e3s4, 2);
     var queryWithEvidenceExplanation = Companion_getInstance_0().of('QueryWithEvidenceExplanation');
     var evidenceExplanation = Companion_getInstance_0().of('EvidenceExplanation');
     var tmp = _this__u8e3s4.subSolver();
@@ -3557,11 +3557,11 @@
     var tmp_3 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$1 = ProbSolveWithEvidence_getInstance().signature.name;
-    var solutions = tmp.solveWithOptions(tmp_0.of(tmp_2, tmp_3.of(tmp$ret$1, [queryWithEvidenceExplanation, evidenceExplanation, second])), ProbSetConfig_getInstance().r3f(third));
+    var solutions = tmp.solveWithOptions(tmp_0.of(tmp_2, tmp_3.of(tmp$ret$1, [queryWithEvidenceExplanation, evidenceExplanation, second])), ProbSetConfig_getInstance().i3g(third));
     return sequence(ProbQuery$computeAllSubstitutions$slambda_0(solutions, queryWithEvidenceExplanation, evidenceExplanation, _this__u8e3s4, first, fourth, null));
   };
-  protoOf(ProbQuery).h2h = function (_this__u8e3s4, first, second, third, fourth) {
-    return this.q3f(_this__u8e3s4, first, second, third, fourth);
+  protoOf(ProbQuery).y2h = function (_this__u8e3s4, first, second, third, fourth) {
+    return this.h3g(_this__u8e3s4, first, second, third, fourth);
   };
   var ProbQuery_instance;
   function ProbQuery_getInstance() {
@@ -3575,40 +3575,40 @@
     NonBacktrackable_1.call(this, 'prob' + '_set_config');
     var tmp = this;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-    tmp.c3b_1 = this.signature.name + '_flag';
+    tmp.t3b_1 = this.signature.name + '_flag';
     var tmp_0 = this;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-    tmp_0.d3b_1 = this.signature.name + '_term';
+    tmp_0.u3b_1 = this.signature.name + '_term';
     var tmp_1 = this;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-    tmp_1.e3b_1 = 'it.unibo.tuprolog.solve.probability' + this.signature.name + '_tag';
+    tmp_1.v3b_1 = 'it.unibo.tuprolog.solve.probability' + this.signature.name + '_tag';
   }
-  protoOf(ProbSetConfig).f2o = function (_this__u8e3s4, first) {
-    Companion_getInstance_9().l2g(_this__u8e3s4, 0);
-    Companion_getInstance_9().u2g(_this__u8e3s4, 0);
+  protoOf(ProbSetConfig).w2o = function (_this__u8e3s4, first) {
+    Companion_getInstance_9().c2h(_this__u8e3s4, 0);
+    Companion_getInstance_9().l2h(_this__u8e3s4, 0);
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    var tmp$ret$2 = [SetFlags_init_$Create$([new Pair(this.c3b_1, first)])];
+    var tmp$ret$2 = [SetFlags_init_$Create$([new Pair(this.t3b_1, first)])];
     return _this__u8e3s4.replySuccess(VOID, VOID, tmp$ret$2.slice());
   };
-  protoOf(ProbSetConfig).z2i = function (_this__u8e3s4, first) {
-    return this.f2o(_this__u8e3s4, first);
+  protoOf(ProbSetConfig).q2j = function (_this__u8e3s4, first) {
+    return this.w2o(_this__u8e3s4, first);
   };
-  protoOf(ProbSetConfig).r3f = function (_this__u8e3s4) {
-    var tmp0_elvis_lhs = _this__u8e3s4.getTag(this.e3b_1);
+  protoOf(ProbSetConfig).i3g = function (_this__u8e3s4) {
+    var tmp0_elvis_lhs = _this__u8e3s4.getTag(this.v3b_1);
     return tmp0_elvis_lhs == null ? Companion_getInstance_2().DEFAULT : tmp0_elvis_lhs;
   };
-  protoOf(ProbSetConfig).f3b = function (_this__u8e3s4) {
-    return setTag(Companion_getInstance_4().of(this.d3b_1), this.e3b_1, _this__u8e3s4);
+  protoOf(ProbSetConfig).w3b = function (_this__u8e3s4) {
+    return setTag(Companion_getInstance_4().of(this.u3b_1), this.v3b_1, _this__u8e3s4);
   };
-  protoOf(ProbSetConfig).s3f = function (_this__u8e3s4) {
-    var tmp0_safe_receiver = _this__u8e3s4.v1u().l9(this.c3b_1);
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.r3f(tmp0_safe_receiver);
+  protoOf(ProbSetConfig).j3g = function (_this__u8e3s4) {
+    var tmp0_safe_receiver = _this__u8e3s4.d1v().l9(this.t3b_1);
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.i3g(tmp0_safe_receiver);
     return tmp1_elvis_lhs == null ? Companion_getInstance_2().DEFAULT : tmp1_elvis_lhs;
   };
-  protoOf(ProbSetConfig).r3d = function (_this__u8e3s4) {
-    return !get_isProbabilistic(this.s3f(_this__u8e3s4));
+  protoOf(ProbSetConfig).i3e = function (_this__u8e3s4) {
+    return !get_isProbabilistic(this.j3g(_this__u8e3s4));
   };
   var ProbSetConfig_instance;
   function ProbSetConfig_getInstance() {
@@ -3617,9 +3617,9 @@
     return ProbSetConfig_instance;
   }
   function ProbSolve$computeAllSubstitutions$lambda(it) {
-    if (it.a1w())
-      throw ensureNotNull(it.x1v());
-    return it.q1u();
+    if (it.i1w())
+      throw ensureNotNull(it.f1w());
+    return it.y1u();
   }
   function ProbSolve$computeAllSubstitutions$lambda_0(it) {
     return !(it == null) ? isInterface(it, Halt) : false;
@@ -3630,20 +3630,20 @@
     };
   }
   function ProbSolve$computeAllSubstitutions$slambda($solutionGroups, $explanationVar, $this_computeAllSubstitutions, $first, resultContinuation) {
-    this.b3g_1 = $solutionGroups;
-    this.c3g_1 = $explanationVar;
-    this.d3g_1 = $this_computeAllSubstitutions;
-    this.e3g_1 = $first;
+    this.s3g_1 = $solutionGroups;
+    this.t3g_1 = $explanationVar;
+    this.u3g_1 = $this_computeAllSubstitutions;
+    this.v3g_1 = $first;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ProbSolve$computeAllSubstitutions$slambda).t2s = function ($this$sequence, $completion) {
-    var tmp = this.u2s($this$sequence, $completion);
+  protoOf(ProbSolve$computeAllSubstitutions$slambda).k2t = function ($this$sequence, $completion) {
+    var tmp = this.l2t($this$sequence, $completion);
     tmp.pc_1 = Unit_instance;
     tmp.qc_1 = null;
     return tmp.yc();
   };
   protoOf(ProbSolve$computeAllSubstitutions$slambda).ld = function (p1, $completion) {
-    return this.t2s(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.k2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ProbSolve$computeAllSubstitutions$slambda).yc = function () {
     var suspendResult = this.pc_1;
@@ -3654,23 +3654,23 @@
           case 0:
             this.oc_1 = 4;
             var tmp_0 = this;
-            tmp_0.g3g_1 = this.b3g_1.p2().r();
+            tmp_0.x3g_1 = this.s3g_1.p2().r();
             this.nc_1 = 1;
             continue $sm;
           case 1:
-            if (!this.g3g_1.s()) {
+            if (!this.x3g_1.s()) {
               this.nc_1 = 3;
               continue $sm;
             }
 
-            this.h3g_1 = this.g3g_1.u();
+            this.y3g_1 = this.x3g_1.u();
             var tmp_1 = this;
-            var this_0 = this.h3g_1.r2();
+            var this_0 = this.y3g_1.r2();
             var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
             var tmp0_iterator = this_0.r();
             while (tmp0_iterator.s()) {
               var item = tmp0_iterator.u();
-              destination.o(item.q1u().x2(this.c3g_1));
+              destination.o(item.y1u().x2(this.t3g_1));
             }
 
             var destination_0 = ArrayList_init_$Create$_0();
@@ -3686,7 +3686,7 @@
             var tmp0_iterator_1 = destination_0.r();
             while (tmp0_iterator_1.s()) {
               var item_0 = tmp0_iterator_1.u();
-              destination_1.o(item_0.g3b_1);
+              destination_1.o(item_0.x3b_1);
             }
 
             var iterator = destination_1.r();
@@ -3696,13 +3696,13 @@
             while (iterator.s()) {
               var acc = accumulator;
               var expl = iterator.u();
-              accumulator = expl.w3c() === 1.0 ? acc : acc.w3c() === 1.0 ? expl : acc.or(expl);
+              accumulator = expl.n3d() === 1.0 ? acc : acc.n3d() === 1.0 ? expl : acc.or(expl);
             }
 
-            tmp_1.i3g_1 = accumulator;
-            this.j3g_1 = Companion_getInstance_5().ofSubstitution(this.h3g_1.q2(), [Companion_getInstance_9().f2g(this.d3g_1, this.e3g_1, new ProbExplanationTerm(this.i3g_1))]);
+            tmp_1.z3g_1 = accumulator;
+            this.a3h_1 = Companion_getInstance_5().ofSubstitution(this.y3g_1.q2(), [Companion_getInstance_9().w2g(this.u3g_1, this.v3g_1, new ProbExplanationTerm(this.z3g_1))]);
             this.nc_1 = 2;
-            suspendResult = this.f3g_1.ef(this.j3g_1, this);
+            suspendResult = this.w3g_1.ef(this.a3h_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -3727,15 +3727,15 @@
       }
      while (true);
   };
-  protoOf(ProbSolve$computeAllSubstitutions$slambda).u2s = function ($this$sequence, completion) {
-    var i = new ProbSolve$computeAllSubstitutions$slambda(this.b3g_1, this.c3g_1, this.d3g_1, this.e3g_1, completion);
-    i.f3g_1 = $this$sequence;
+  protoOf(ProbSolve$computeAllSubstitutions$slambda).l2t = function ($this$sequence, completion) {
+    var i = new ProbSolve$computeAllSubstitutions$slambda(this.s3g_1, this.t3g_1, this.u3g_1, this.v3g_1, completion);
+    i.w3g_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, $completion) {
-      return i.t2s($this$sequence, $completion);
+      return i.k2t($this$sequence, $completion);
     };
     l.$arity = 1;
     return l;
@@ -3745,15 +3745,15 @@
     ProblogLib_getInstance();
     WithoutSideEffects_1.call(this, 'prob' + '_solve');
   }
-  protoOf(ProbSolve).v2p = function (_this__u8e3s4, first, second) {
-    Companion_getInstance_9().l2g(_this__u8e3s4, 1);
-    Companion_getInstance_9().r2g(_this__u8e3s4, 1);
-    if (ProbSetConfig_getInstance().r3d(_this__u8e3s4.context)) {
+  protoOf(ProbSolve).m2q = function (_this__u8e3s4, first, second) {
+    Companion_getInstance_9().c2h(_this__u8e3s4, 1);
+    Companion_getInstance_9().i2h(_this__u8e3s4, 1);
+    if (ProbSetConfig_getInstance().i3e(_this__u8e3s4.context)) {
       var tmp = _this__u8e3s4.subSolver();
       var tmp_0 = Companion_getInstance_1();
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
       var tmp$ret$0 = Prob_getInstance().signature.name;
-      var tmp_1 = tmp.solveWithOptions(tmp_0.of(tmp$ret$0, [first, second]), ProbSetConfig_getInstance().s3f(_this__u8e3s4.context));
+      var tmp_1 = tmp.solveWithOptions(tmp_0.of(tmp$ret$0, [first, second]), ProbSetConfig_getInstance().j3g(_this__u8e3s4.context));
       return map(tmp_1, ProbSolve$computeAllSubstitutions$lambda);
     }
     var tmp_2 = Companion_getInstance_0();
@@ -3763,14 +3763,14 @@
     var tmp_4 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$1 = Prob_getInstance().signature.name;
-    var solutions = toList(tmp_3.solveWithOptions(tmp_4.of(tmp$ret$1, [explanationVar, second]), ProbSetConfig_getInstance().s3f(_this__u8e3s4.context)));
+    var solutions = toList(tmp_3.solveWithOptions(tmp_4.of(tmp$ret$1, [explanationVar, second]), ProbSetConfig_getInstance().j3g(_this__u8e3s4.context)));
     // Inline function 'kotlin.sequences.filterIsInstance' call
     var this_0 = asSequence(solutions);
     var tmp_5 = filter(this_0, ProbSolve$computeAllSubstitutions$lambda_0);
     var tmp$ret$2 = isInterface(tmp_5, Sequence) ? tmp_5 : THROW_CCE();
     var error = firstOrNull(tmp$ret$2);
     if (!(error == null))
-      throw error.x1v();
+      throw error.f1w();
     var tmp_6;
     var tmp$ret$3;
     $l$block_0: {
@@ -3797,7 +3797,7 @@
       tmp$ret$3 = false;
     }
     if (!tmp$ret$3) {
-      tmp_6 = sequenceOf([Companion_getInstance_5().ofSubstitution(Companion_getInstance_9().f2g(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_11().j3c_1)), [])]);
+      tmp_6 = sequenceOf([Companion_getInstance_5().ofSubstitution(Companion_getInstance_9().w2g(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_11().a3d_1)), [])]);
     } else {
       // Inline function 'kotlin.collections.groupBy' call
       // Inline function 'kotlin.collections.filterIsInstance' call
@@ -3816,7 +3816,7 @@
       while (tmp0_iterator_1.s()) {
         var element_1 = tmp0_iterator_1.u();
         // Inline function 'it.unibo.tuprolog.solve.problog.lib.primitive.ProbSolve.computeAllSubstitutions.<anonymous>' call
-        var tmp_8 = element_1.q1u();
+        var tmp_8 = element_1.y1u();
         var key = tmp_8.r12(ProbSolve$computeAllSubstitutions$lambda_1(explanationVar));
         // Inline function 'kotlin.collections.getOrPut' call
         var value = destination_0.x2(key);
@@ -3837,8 +3837,8 @@
     }
     return tmp_6;
   };
-  protoOf(ProbSolve).o2f = function (_this__u8e3s4, first, second) {
-    return this.v2p(_this__u8e3s4, first, second);
+  protoOf(ProbSolve).f2g = function (_this__u8e3s4, first, second) {
+    return this.m2q(_this__u8e3s4, first, second);
   };
   var ProbSolve_instance;
   function ProbSolve_getInstance() {
@@ -3851,33 +3851,33 @@
   }
   function ProbSolveEvidence$computeOne$lambda_0($explanationVar) {
     return function (s) {
-      return s.q1u().x2($explanationVar);
+      return s.y1u().x2($explanationVar);
     };
   }
   function ProbSolveEvidence$computeOne$lambda_1(it) {
     return it instanceof ProbExplanationTerm;
   }
   function ProbSolveEvidence$computeOne$lambda_2(t) {
-    return t.g3b_1;
+    return t.x3b_1;
   }
   function ProbSolveEvidence() {
     ProbSolveEvidence_instance = this;
     ProblogLib_getInstance();
     NonBacktrackable_1.call(this, 'prob' + '_solve_evidence');
   }
-  protoOf(ProbSolveEvidence).f2o = function (_this__u8e3s4, first) {
+  protoOf(ProbSolveEvidence).w2o = function (_this__u8e3s4, first) {
     var tmp = Companion_instance_5;
     ProblogLib_getInstance();
     var evidenceIndicator = tmp.ofString('evidence', 2);
-    if (!_this__u8e3s4.context.w1u().containsIndicator(evidenceIndicator) ? !_this__u8e3s4.context.x1u().containsIndicator(evidenceIndicator) : false) {
-      return _this__u8e3s4.replyWith(Companion_getInstance_9().f2g(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_11().k3c_1)), VOID, []);
+    if (!_this__u8e3s4.context.e1v().containsIndicator(evidenceIndicator) ? !_this__u8e3s4.context.f1v().containsIndicator(evidenceIndicator) : false) {
+      return _this__u8e3s4.replyWith(Companion_getInstance_9().w2g(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_11().b3d_1)), VOID, []);
     }
     var evidenceTermVar = Companion_getInstance_0().of('TermVar');
     var evidenceTruthVar = Companion_getInstance_0().of('TruthVar');
     var tmp_0 = Companion_getInstance_1();
     ProblogLib_getInstance();
     var subQuery = tmp_0.of('evidence', [evidenceTermVar, evidenceTruthVar]);
-    var tmp_1 = ProbSetConfig_getInstance().s3f(_this__u8e3s4.context);
+    var tmp_1 = ProbSetConfig_getInstance().j3g(_this__u8e3s4.context);
     Companion_getInstance_2();
     var subOptions = tmp_1.setLimit(-1).setLazy(false);
     // Inline function 'kotlin.collections.filter' call
@@ -3893,8 +3893,8 @@
     while (tmp0_iterator.s()) {
       var item = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.primitive.ProbSolveEvidence.computeOne.<anonymous>' call
-      var truth = item.q1u().x2(evidenceTruthVar);
-      var term = item.q1u().x2(evidenceTermVar);
+      var truth = item.y1u().x2(evidenceTruthVar);
+      var term = item.y1u().x2(evidenceTermVar);
       var tmp_3;
       var tmp_4;
       if ((term == null ? true : term.mx()) ? true : truth == null) {
@@ -3903,7 +3903,7 @@
         tmp_4 = !(!(truth == null) ? isInterface(truth, Truth) : false);
       }
       if (tmp_4) {
-        tmp_3 = Companion_getInstance_11().j3c_1;
+        tmp_3 = Companion_getInstance_11().a3d_1;
       } else {
         var tmp_5 = Companion_getInstance_0();
         ProblogLib_getInstance();
@@ -3925,7 +3925,7 @@
           // Inline function 'it.unibo.tuprolog.solve.problog.lib.primitive.ProbSolveEvidence.computeOne.<anonymous>.<anonymous>' call
           var acc = accumulator;
           var t = iterator.u();
-          accumulator = t.w3c() === 1.0 ? acc : acc.w3c() === 1.0 ? t : t.or(acc);
+          accumulator = t.n3d() === 1.0 ? acc : acc.n3d() === 1.0 ? t : t.or(acc);
         }
         var totalExplanation = accumulator;
         tmp_3 = truth.ow() ? totalExplanation : totalExplanation.not();
@@ -3939,14 +3939,14 @@
     while (tmp0_iterator_0.s()) {
       var element = tmp0_iterator_0.u();
       // Inline function 'it.unibo.tuprolog.solve.problog.lib.primitive.ProbSolveEvidence.computeOne.<anonymous>' call
-      if (!equals(element, Companion_getInstance_11().j3c_1)) {
+      if (!equals(element, Companion_getInstance_11().a3d_1)) {
         destination_0.o(element);
       }
     }
     var result = destination_0;
     var tmp_10;
     if (result.y()) {
-      tmp_10 = Companion_getInstance_11().k3c_1;
+      tmp_10 = Companion_getInstance_11().b3d_1;
     } else {
       // Inline function 'kotlin.collections.reduce' call
       var iterator_0 = result.r();
@@ -3961,10 +3961,10 @@
       tmp_10 = accumulator_0;
     }
     var resultExplanation = tmp_10;
-    return _this__u8e3s4.replyWith(Companion_getInstance_9().f2g(_this__u8e3s4, first, new ProbExplanationTerm(resultExplanation)), VOID, []);
+    return _this__u8e3s4.replyWith(Companion_getInstance_9().w2g(_this__u8e3s4, first, new ProbExplanationTerm(resultExplanation)), VOID, []);
   };
-  protoOf(ProbSolveEvidence).z2i = function (_this__u8e3s4, first) {
-    return this.f2o(_this__u8e3s4, first);
+  protoOf(ProbSolveEvidence).q2j = function (_this__u8e3s4, first) {
+    return this.w2o(_this__u8e3s4, first);
   };
   var ProbSolveEvidence_instance;
   function ProbSolveEvidence_getInstance() {
@@ -3978,22 +3978,22 @@
     };
   }
   function ProbSolveWithEvidence$computeAllSubstitutions$slambda($solutions, $goalExplanationVar, $evidenceExplanationTerm, $this_computeAllSubstitutions, $first, $second, resultContinuation) {
-    this.u3g_1 = $solutions;
-    this.v3g_1 = $goalExplanationVar;
-    this.w3g_1 = $evidenceExplanationTerm;
-    this.x3g_1 = $this_computeAllSubstitutions;
-    this.y3g_1 = $first;
-    this.z3g_1 = $second;
+    this.l3h_1 = $solutions;
+    this.m3h_1 = $goalExplanationVar;
+    this.n3h_1 = $evidenceExplanationTerm;
+    this.o3h_1 = $this_computeAllSubstitutions;
+    this.p3h_1 = $first;
+    this.q3h_1 = $second;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).t2s = function ($this$sequence, $completion) {
-    var tmp = this.u2s($this$sequence, $completion);
+  protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).k2t = function ($this$sequence, $completion) {
+    var tmp = this.l2t($this$sequence, $completion);
     tmp.pc_1 = Unit_instance;
     tmp.qc_1 = null;
     return tmp.yc();
   };
   protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).ld = function (p1, $completion) {
-    return this.t2s(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.k2t(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).yc = function () {
     var suspendResult = this.pc_1;
@@ -4003,57 +4003,57 @@
         switch (tmp) {
           case 0:
             this.oc_1 = 6;
-            this.b3h_1 = this.u3g_1.r();
+            this.s3h_1 = this.l3h_1.r();
             this.nc_1 = 1;
             continue $sm;
           case 1:
-            if (!this.b3h_1.s()) {
+            if (!this.s3h_1.s()) {
               this.nc_1 = 5;
               continue $sm;
             }
 
-            this.c3h_1 = this.b3h_1.u();
-            if (this.c3h_1.a1w())
-              throw ensureNotNull(this.c3h_1.x1v());
-            this.d3h_1 = this.c3h_1.q1u().x2(this.v3g_1);
+            this.t3h_1 = this.s3h_1.u();
+            if (this.t3h_1.i1w())
+              throw ensureNotNull(this.t3h_1.f1w());
+            this.u3h_1 = this.t3h_1.y1u().x2(this.m3h_1);
             var tmp_0;
             var tmp_1;
             var tmp_2;
-            if (this.w3g_1 == null) {
+            if (this.n3h_1 == null) {
               tmp_2 = true;
             } else {
-              var tmp_3 = this.w3g_1;
+              var tmp_3 = this.n3h_1;
               tmp_2 = !(tmp_3 instanceof ProbExplanationTerm);
             }
 
             if (tmp_2) {
               tmp_1 = true;
             } else {
-              tmp_1 = this.d3h_1 == null;
+              tmp_1 = this.u3h_1 == null;
             }
 
             if (tmp_1) {
               tmp_0 = true;
             } else {
-              var tmp_4 = this.d3h_1;
+              var tmp_4 = this.u3h_1;
               tmp_0 = !(tmp_4 instanceof ProbExplanationTerm);
             }
 
             if (tmp_0) {
               this.nc_1 = 3;
-              suspendResult = this.a3h_1.ef(Companion_getInstance_5().failed(), this);
+              suspendResult = this.r3h_1.ef(Companion_getInstance_5().failed(), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.e3h_1 = new ProbExplanationTerm(this.d3h_1.g3b_1.and(this.w3g_1.g3b_1));
+              this.v3h_1 = new ProbExplanationTerm(this.u3h_1.x3b_1.and(this.n3h_1.x3b_1));
               this.nc_1 = 2;
               var tmp_5 = Companion_getInstance_5();
-              var tmp_6 = Companion_getInstance_9().f2g(this.x3g_1, this.y3g_1, this.e3h_1);
-              var tmp_7 = Companion_getInstance_9().f2g(this.x3g_1, this.z3g_1, this.w3g_1);
-              var tmp_8 = this.c3h_1.q1u();
-              suspendResult = this.a3h_1.ef(tmp_5.ofSubstitution(tmp_6, [tmp_7, tmp_8.filter(ProbSolveWithEvidence$computeAllSubstitutions$slambda$lambda(this.v3g_1))]), this);
+              var tmp_6 = Companion_getInstance_9().w2g(this.o3h_1, this.p3h_1, this.v3h_1);
+              var tmp_7 = Companion_getInstance_9().w2g(this.o3h_1, this.q3h_1, this.n3h_1);
+              var tmp_8 = this.t3h_1.y1u();
+              suspendResult = this.r3h_1.ef(tmp_5.ofSubstitution(tmp_6, [tmp_7, tmp_8.filter(ProbSolveWithEvidence$computeAllSubstitutions$slambda$lambda(this.m3h_1))]), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
@@ -4085,15 +4085,15 @@
       }
      while (true);
   };
-  protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).u2s = function ($this$sequence, completion) {
-    var i = new ProbSolveWithEvidence$computeAllSubstitutions$slambda(this.u3g_1, this.v3g_1, this.w3g_1, this.x3g_1, this.y3g_1, this.z3g_1, completion);
-    i.a3h_1 = $this$sequence;
+  protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).l2t = function ($this$sequence, completion) {
+    var i = new ProbSolveWithEvidence$computeAllSubstitutions$slambda(this.l3h_1, this.m3h_1, this.n3h_1, this.o3h_1, this.p3h_1, this.q3h_1, completion);
+    i.r3h_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, $completion) {
-      return i.t2s($this$sequence, $completion);
+      return i.k2t($this$sequence, $completion);
     };
     l.$arity = 1;
     return l;
@@ -4103,20 +4103,20 @@
     ProblogLib_getInstance();
     WithoutSideEffects.call(this, 'prob' + '_solve_with_evidence');
   }
-  protoOf(ProbSolveWithEvidence).q2o = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_9().l2g(_this__u8e3s4, 2);
-    Companion_getInstance_9().r2g(_this__u8e3s4, 2);
+  protoOf(ProbSolveWithEvidence).h2p = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_9().c2h(_this__u8e3s4, 2);
+    Companion_getInstance_9().i2h(_this__u8e3s4, 2);
     var evidenceExplanationVar = Companion_getInstance_0().of('EvidenceExplanation');
     var tmp;
-    if (ProbSetConfig_getInstance().r3d(_this__u8e3s4.context)) {
-      tmp = toTerm(Companion_getInstance_11().k3c_1);
+    if (ProbSetConfig_getInstance().i3e(_this__u8e3s4.context)) {
+      tmp = toTerm(Companion_getInstance_11().b3d_1);
     } else {
       var tmp_0 = Companion_getInstance_1();
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
       var tmp$ret$0 = ProbSolveEvidence_getInstance().signature.name;
       var subQuery = tmp_0.of(tmp$ret$0, [evidenceExplanationVar]);
-      var solution = _this__u8e3s4.subSolver().solveOnceWithOptions(subQuery, ProbSetConfig_getInstance().s3f(_this__u8e3s4.context));
-      tmp = solution.q1u().x2(evidenceExplanationVar);
+      var solution = _this__u8e3s4.subSolver().solveOnceWithOptions(subQuery, ProbSetConfig_getInstance().j3g(_this__u8e3s4.context));
+      tmp = solution.y1u().x2(evidenceExplanationVar);
     }
     var evidenceExplanationTerm = tmp;
     var goalExplanationVar = Companion_getInstance_0().of('GoalExplanation');
@@ -4124,11 +4124,11 @@
     var tmp_2 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$1 = ProbSolve_getInstance().signature.name;
-    var solutions = tmp_1.solveWithOptions(tmp_2.of(tmp$ret$1, [goalExplanationVar, third]), ProbSetConfig_getInstance().s3f(_this__u8e3s4.context));
+    var solutions = tmp_1.solveWithOptions(tmp_2.of(tmp$ret$1, [goalExplanationVar, third]), ProbSetConfig_getInstance().j3g(_this__u8e3s4.context));
     return sequence(ProbSolveWithEvidence$computeAllSubstitutions$slambda_0(solutions, goalExplanationVar, evidenceExplanationTerm, _this__u8e3s4, first, second, null));
   };
-  protoOf(ProbSolveWithEvidence).m2i = function (_this__u8e3s4, first, second, third) {
-    return this.q2o(_this__u8e3s4, first, second, third);
+  protoOf(ProbSolveWithEvidence).d2j = function (_this__u8e3s4, first, second, third) {
+    return this.h2p(_this__u8e3s4, first, second, third);
   };
   var ProbSolveWithEvidence_instance;
   function ProbSolveWithEvidence_getInstance() {
@@ -4141,10 +4141,10 @@
     ProblogLib_getInstance();
     RuleWrapper_init_$Init$('prob', 2, VOID, this);
   }
-  protoOf(Prob).f2j = function (_this__u8e3s4) {
-    return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('EXPL'), _this__u8e3s4.varOf('GOAL')]);
+  protoOf(Prob).w2j = function (_this__u8e3s4) {
+    return listOf_0([_this__u8e3s4.varOf('EXPL'), _this__u8e3s4.varOf('GOAL')]);
   };
-  protoOf(Prob).g2j = function (_this__u8e3s4) {
+  protoOf(Prob).x2j = function (_this__u8e3s4) {
     var expl = _this__u8e3s4.varOf('EXPL');
     var goal = _this__u8e3s4.varOf('GOAL');
     var newGoal = _this__u8e3s4.varOf('NEW_GOAL');
@@ -4173,22 +4173,22 @@
   protoOf(ProblogSolverFactory).mutableSolverOf = mutableSolverOf;
   protoOf(ProblogSolverFactory).rawMutableSolverOf = rawMutableSolverOf;
   protoOf(ProblogSolverFactory).newBuilder = newBuilder;
-  protoOf(ProblogSolverFactory).u1x = get_defaultRuntime;
-  protoOf(ProblogSolverFactory).w1x = get_defaultUnificator;
-  protoOf(ProblogSolverFactory).a1y = get_defaultStaticKb;
-  protoOf(ProblogSolverFactory).b1y = get_defaultDynamicKb;
-  protoOf(ProblogSolverFactory).c1y = get_defaultInputChannel;
-  protoOf(ProblogSolverFactory).d1y = get_defaultOutputChannel;
-  protoOf(ProblogSolverFactory).e1y = get_defaultErrorChannel;
-  protoOf(ProblogSolverFactory).f1y = get_defaultWarningsChannel;
-  protoOf(ProblogSolverFactory).n1y = solverWithDefaultBuiltins;
+  protoOf(ProblogSolverFactory).c1y = get_defaultRuntime;
+  protoOf(ProblogSolverFactory).e1y = get_defaultUnificator;
+  protoOf(ProblogSolverFactory).i1y = get_defaultStaticKb;
+  protoOf(ProblogSolverFactory).j1y = get_defaultDynamicKb;
+  protoOf(ProblogSolverFactory).k1y = get_defaultInputChannel;
+  protoOf(ProblogSolverFactory).l1y = get_defaultOutputChannel;
+  protoOf(ProblogSolverFactory).m1y = get_defaultErrorChannel;
+  protoOf(ProblogSolverFactory).n1y = get_defaultWarningsChannel;
+  protoOf(ProblogSolverFactory).v1y = solverWithDefaultBuiltins;
   protoOf(ProblogSolverFactory).solverWithDefaultBuiltinsAnd = solverWithDefaultBuiltinsAnd;
-  protoOf(ProblogSolverFactory).p1y = mutableSolverWithDefaultBuiltins;
+  protoOf(ProblogSolverFactory).x1y = mutableSolverWithDefaultBuiltins;
   protoOf(ProblogSolverFactory).mutableSolverWithDefaultBuiltinsAnd = mutableSolverWithDefaultBuiltinsAnd;
   defineProp(protoOf(ClauseMappingException), 'message', function () {
     return this.na();
   });
-  protoOf(BinaryDecisionDiagramExplanation).x3c = get_probabilityOrNull;
+  protoOf(BinaryDecisionDiagramExplanation).o3d = get_probabilityOrNull;
   //endregion
   //region block: init
   ANNOTATION_FUNCTOR = '::';