@7mind.io/baboon 0.0.168 → 0.0.171

package/izumi.distage.planning.solver.-Semigraph-Solver$-Semigraph-Solver-Impl.js

@@ -28,7 +28,7 @@ import * as $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView from "./s
 var $p;
 function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__traceGrouped__sci_Map__sci_Set__sci_Map__sci_Set__sci_Set__scm_HashMap__s_util_Either($thiz, activations, weak, index, roots, reachable, currentResult) {
   while (true) {
-    var col = $j_java$002elang$002e$002dObject.$m_sci_Seq$().cW(roots);
+    var col = $j_java$002elang$002e$002dObject.$m_sci_Seq$().cX(roots);
     var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
     var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
     var good = buildR.aF();
@@ -37,48 +37,48 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
     var allGood = true;
     while (iterator.f()) {
       var x0 = iterator.e();
-      var x1 = index.cA(x0, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$()))).d7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((n$2$2) => (!n$2$2.E().mN.m()))));
+      var x1 = index.cw(x0, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$()))).d4(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((n$2$2) => (!n$2$2.E().mW.l()))));
       if ((x1 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
       }
       var mutators = x1.E();
       var definitions = x1.z();
-      var x1$2 = $thiz.axJ(activations, $j_java$002elang$002e$002dObject.$m_sci_Seq$().cW(mutators));
+      var x1$2 = $thiz.ayu(activations, $j_java$002elang$002e$002dObject.$m_sci_Seq$().cX(mutators));
       if ((x1$2 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$2);
       }
       var goodMutators = x1$2.E();
-      var this$12 = $thiz.aOm(activations, $j_java$002elang$002e$002dObject.$m_sci_Seq$().cW(definitions));
-      var x1$1 = ((this$12 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(goodMutators.bV(this$12.H)) : this$12);
+      var this$12 = $thiz.aP9(activations, $j_java$002elang$002e$002dObject.$m_sci_Seq$().cX(definitions));
+      var x1$1 = ((this$12 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(goodMutators.bX(this$12.H)) : this$12);
       if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
-        var e = x1$1.aj;
+        var e = x1$1.ah;
         allGood = false;
-        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
+        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.av);
       } else if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-        good.cn(x1$1.H);
+        good.cf(x1$1.H);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
       }
     }
-    var out = (allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(good.aq()) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc())));
+    var out = (allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(good.ao()) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bf())));
     if ((out instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$1 = out.H;
-      var this$15 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b$1, b$1.be(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+      var this$15 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b$1, b$1.bj(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
         if ((x0$1$2$2 !== null)) {
           var successor = x0$1$2$2.E();
-          return x0$1$2$2.z().nN.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((d$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), successor, d$2$2))));
+          return x0$1$2$2.z().nU.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((d$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), successor, d$2$2))));
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
         }
-      }))).bO(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((weak) => ((x0$2$2$2) => {
+      }))).bR(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((weak) => ((x0$2$2$2) => {
         if ((x0$2$2$2 !== null)) {
           var successor$1 = x0$2$2$2.E();
           var predecessor = x0$2$2$2.z();
-          return weak.a5(new $j_izumi$002efundamentals$002egraphs$002e$002dWeak$002dEdge.$c_Lizumi_fundamentals_graphs_WeakEdge(predecessor, successor$1.i5));
+          return weak.a5(new $j_izumi$002efundamentals$002egraphs$002e$002dWeak$002dEdge.$c_Lizumi_fundamentals_graphs_WeakEdge(predecessor, successor$1.i7));
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2$2$2);
         }
-      }))(weak))).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$14$2$2) => x$14$2$2.z())))));
+      }))(weak))).N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$14$2$2) => x$14$2$2.z())))));
     } else {
       var this$15 = out;
     }
@@ -94,7 +94,7 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
     var rc8 = false;
     var x3 = null;
     if ((nxt instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
-      return new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(nxt.aj.ay));
+      return new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(nxt.ah.av));
     }
     if ((nxt instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       rc8 = true;
@@ -102,9 +102,9 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
       var p4 = x3.H;
       if ((p4 !== null)) {
         var nextResult$1 = p4.E();
-        if (p4.z().m()) {
-          currentResult.B2(nextResult$1);
-          return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(currentResult));
+        if (p4.z().l()) {
+          currentResult.Bi(nextResult$1);
+          return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().ak(currentResult));
         }
       }
     }
@@ -113,9 +113,9 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
       if ((p6 !== null)) {
         var nextResult$2 = p6.E();
         var nextDeps$2$1 = p6.z();
-        currentResult.B2(nextResult$2);
-        var temp$roots = $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(nextDeps$2$1).c1(reachable);
-        var temp$reachable = reachable.b8(roots);
+        currentResult.Bi(nextResult$2);
+        var temp$roots = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(nextDeps$2$1).bF(reachable);
+        var temp$reachable = reachable.b6(roots);
         roots = temp$roots;
         reachable = temp$reachable;
         continue;
@@ -126,15 +126,15 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
 }
 export { $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__traceGrouped__sci_Map__sci_Set__sci_Map__sci_Set__sci_Set__scm_HashMap__s_util_Either as $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__traceGrouped__sci_Map__sci_Set__sci_Map__sci_Set__sci_Set__scm_HashMap__s_util_Either };
 function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__resolveMutations__sci_Map__s_util_Either($thiz, predecessors) {
-  var this$1 = predecessors.bP();
-  var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+  var this$1 = predecessors.bI();
+  var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
   var it = this$1.p();
   while (it.f()) {
     var elem = it.e();
-    var key = elem.i6;
-    m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$1) => (() => this$1.bl().aF()))(this$1))).am(elem);
+    var key = elem.i8;
+    m.cs(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$1) => (() => this$1.bn().aF()))(this$1))).am(elem);
   }
-  var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
+  var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
   var mapIt = m.p();
   while (mapIt.f()) {
     var x1 = mapIt.e();
@@ -143,9 +143,9 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
     }
     var k = x1.E();
     var v = x1.z();
-    result = result.ci(k, v.aq());
+    result = result.ck(k, v.ao());
   }
-  var conflicts = result.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$21$2$2) => (x$21$2$2.z().a2() > 1))), false);
+  var conflicts = result.eV(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$21$2$2) => (x$21$2$2.z().a3() > 1))), false);
   $j_java$002elang$002e$002dObject.$m_sci_HashMap$();
   var b = new $j_java$002elang$002e$002dObject.$c_sci_HashMapBuilder();
   var it$1 = conflicts.p();
@@ -156,7 +156,7 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
     }
     var k$1 = x0.E();
     var nn = x0.z();
-    var x1$2 = nn.d7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$22$2$2) => (!x$22$2$2.yR.m()))));
+    var x1$2 = nn.d4(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$22$2$2) => (!x$22$2$2.z8.l()))));
     if ((x1$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$2);
     }
@@ -165,10 +165,10 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
     var _2 = new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dClassified$002dConflicts.$c_Lizumi_distage_planning_solver_SemigraphSolver$ClassifiedConflicts(mutators, definitions);
     $j_java$002elang$002e$002dObject.$p_sci_HashMapBuilder__ensureUnaliased__V(b);
     var h = $j_java$002elang$002e$002dObject.$m_sr_Statics$().a6(k$1);
-    var im = $j_java$002elang$002e$002dObject.$m_sc_Hashing$().b3(h);
-    b.sj(b.jt, k$1, _2, h, im, 0);
+    var im = $j_java$002elang$002e$002dObject.$m_sc_Hashing$().b8(h);
+    b.sx(b.jv, k$1, _2, h, im, 0);
   }
-  var targets = b.us();
+  var targets = b.uE();
   $j_java$002elang$002e$002dObject.$m_sci_HashMap$();
   var b$1 = new $j_java$002elang$002e$002dObject.$c_sci_HashMapBuilder();
   var it$2 = targets.p();
@@ -177,63 +177,63 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    b$1.SL($p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__doResolve__sci_Map__O__Lizumi_distage_planning_solver_SemigraphSolver$ClassifiedConflicts__s_Option($thiz, predecessors, x0$1.E(), x0$1.z()));
+    b$1.Tk($p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__doResolve__sci_Map__O__Lizumi_distage_planning_solver_SemigraphSolver$ClassifiedConflicts__s_Option($thiz, predecessors, x0$1.E(), x0$1.z()));
   }
-  var resolved = b$1.us();
+  var resolved = b$1.uE();
   $j_java$002elang$002e$002dObject.$m_sci_HashMap$();
   var b$2 = new $j_java$002elang$002e$002dObject.$c_sci_HashMapBuilder();
   var it$3 = resolved.p();
   while (it$3.f()) {
-    b$2.SL(it$3.e().z().PC);
+    b$2.Tk(it$3.e().z().Q3);
   }
-  var allRepls = b$2.us();
-  var finalElements = $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(resolved), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$25$2$2) => x$25$2$2.PB))));
-  var rewritten = predecessors.hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$2$2) => {
+  var allRepls = b$2.uE();
+  var finalElements = $j_java$002elang$002e$002dObject.$m_sci_Map$().ak(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(resolved), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$25$2$2) => x$25$2$2.Q2))));
+  var rewritten = predecessors.hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$2$2) => {
     if ((x0$3$2$2 !== null)) {
-      return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$3$2$2.E(), x0$3$2$2.z().nN.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((d$2$2) => {
+      return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$3$2$2.E(), x0$3$2$2.z().nU.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((d$2$2) => {
         var asAnn = new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(d$2$2, $j_java$002elang$002e$002dObject.$m_s_None$());
-        return finalElements.cA(asAnn, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => asAnn)));
+        return finalElements.cw(asAnn, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => asAnn)));
       }))));
     } else {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3$2$2);
     }
   })));
-  var result$1 = $j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdj$002dList$002dSyntax.$f_Lizumi_fundamentals_graphs_struct_AdjListSyntax__apply__sci_Map__O($j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdjacency$002dPred$002dList$0024.$m_Lizumi_fundamentals_graphs_struct_AdjacencyPredList$(), rewritten.j6(allRepls));
-  var indexRemap = $j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(finalElements), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((f$2$2) => $j_java$002elang$002e$002dObject.$m_sci_Seq$().aA($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [$j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), f$2$2, new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(f$2$2.i6, $j_java$002elang$002e$002dObject.$m_s_None$()))])).bV(result$1.iJ.bP().b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((f$1) => ((x$26$2$2) => $j_java$002elang$002e$002dObject.$m_sr_BoxesRunTime$().Z(x$26$2$2.i6, f$1.i6)))(f$2$2))).bO(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((f$2) => ((x$27$2$2) => ((x$27$2$2 === null) ? (f$2 === null) : x$27$2$2.b(f$2))))(f$2$2))).dK().O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$4$2$2) => {
+  var result$1 = $j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdj$002dList$002dSyntax.$f_Lizumi_fundamentals_graphs_struct_AdjListSyntax__apply__sci_Map__O($j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdjacency$002dPred$002dList$0024.$m_Lizumi_fundamentals_graphs_struct_AdjacencyPredList$(), rewritten.is(allRepls));
+  var indexRemap = $j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(finalElements), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((f$2$2) => $j_java$002elang$002e$002dObject.$m_sci_Seq$().ax($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [$j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), f$2$2, new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(f$2$2.i8, $j_java$002elang$002e$002dObject.$m_s_None$()))])).bX(result$1.iL.bI().b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((f$1) => ((x$26$2$2) => $j_java$002elang$002e$002dObject.$m_sr_BoxesRunTime$().X(x$26$2$2.i8, f$1.i8)))(f$2$2))).bR(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((f$2) => ((x$27$2$2) => ((x$27$2$2 === null) ? (f$2 === null) : x$27$2$2.b(f$2))))(f$2$2))).dP().N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$4$2$2) => {
     if ((x0$4$2$2 !== null)) {
       var k$2 = x0$4$2$2.E();
-      var idx = x0$4$2$2.hR();
-      return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), k$2, new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(k$2.i6, new $j_java$002elang$002e$002dObject.$c_s_Some(idx)));
+      var idx = x0$4$2$2.hV();
+      return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), k$2, new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(k$2.i8, new $j_java$002elang$002e$002dObject.$c_s_Some(idx)));
     } else {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$4$2$2);
     }
-  }))))))).f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb);
+  }))))))).fj($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh);
   var b$3 = $j_java$002elang$002e$002dObject.$m_sci_Iterable$().aF();
   var it$4 = resolved.p();
   while (it$4.f()) {
-    b$3.am(it$4.e().z().PD);
+    b$3.am(it$4.e().z().Q4);
   }
-  var allOuterReplacements = b$3.aq().fi().cE($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb);
-  var this$21 = $j_java$002elang$002e$002dObject.$m_sci_Map$().al(allOuterReplacements).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$5$2$2) => {
+  var allOuterReplacements = b$3.ao().fk().cH($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh);
+  var this$21 = $j_java$002elang$002e$002dObject.$m_sci_Map$().ak(allOuterReplacements).N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$5$2$2) => {
     if ((x0$5$2$2 !== null)) {
       var k$3 = x0$5$2$2.E();
       var p2 = x0$5$2$2.z();
       if ((p2 !== null)) {
         var v$1 = p2.E();
         var r = p2.z();
-        return new $j_java$002elang$002e$002dObject.$c_T3(indexRemap.cA(k$3, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => k$3))), v$1, indexRemap.cA(r, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => r))));
+        return new $j_java$002elang$002e$002dObject.$c_T3(indexRemap.cw(k$3, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => k$3))), v$1, indexRemap.cw(r, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => r))));
       }
     }
     throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$5$2$2);
   })));
-  var m$1 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+  var m$1 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
   var it$5 = this$21.p();
   while (it$5.f()) {
     var elem$2 = it$5.e();
-    var key$1 = elem$2.aX;
-    m$1.cq(key$1, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$21) => (() => this$21.dU()))(this$21))).am(elem$2);
+    var key$1 = elem$2.aS;
+    m$1.cs(key$1, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$21) => (() => this$21.dY()))(this$21))).am(elem$2);
   }
-  var result$2 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
+  var result$2 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
   var mapIt$1 = m$1.p();
   while (mapIt$1.f()) {
     var x1$1 = mapIt$1.e();
@@ -242,7 +242,7 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
     }
     var k$4 = x1$1.E();
     var v$2 = x1$1.z();
-    result$2 = result$2.ci(k$4, v$2.aq());
+    result$2 = result$2.ck(k$4, v$2.ao());
   }
   var this$23 = result$2;
   $j_java$002elang$002e$002dObject.$m_sci_HashMap$();
@@ -255,22 +255,22 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
     }
     var context = x0$4.E();
     var remaps = x0$4.z();
-    var cleaned = remaps.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$7$2$2) => {
+    var cleaned = remaps.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$7$2$2) => {
       if ((x0$7$2$2 !== null)) {
-        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$7$2$2.bk, x0$7$2$2.br);
+        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$7$2$2.b5, x0$7$2$2.bd);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$7$2$2);
       }
     })));
     var $x_1 = $j_java$002elang$002e$002dObject.$m_s_Predef$();
-    var m$2 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+    var m$2 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
     var it$7 = cleaned.p();
     while (it$7.f()) {
       var elem$3 = it$7.e();
       var key$2 = elem$3.E();
-      m$2.cq(key$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$25) => (() => this$25.dU()))(cleaned))).am(elem$3);
+      m$2.cs(key$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$25) => (() => this$25.dY()))(cleaned))).am(elem$3);
     }
-    var result$3 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
+    var result$3 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
     var mapIt$2 = m$2.p();
     while (mapIt$2.f()) {
       var x1$3 = mapIt$2.e();
@@ -279,52 +279,52 @@ function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__
       }
       var k$6 = x1$3.E();
       var v$3 = x1$3.z();
-      result$3 = result$3.ci(k$6, v$3.aq());
+      result$3 = result$3.ck(k$6, v$3.ao());
     }
     var this$27 = result$3;
     var res = true;
     var it$8 = this$27.p();
     while ((res && it$8.f())) {
-      res = (it$8.e().z().a2() < 2);
+      res = (it$8.e().z().a3() < 2);
     }
-    $x_1.cd(res);
-    var _2$1 = cleaned.f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb);
+    $x_1.cg(res);
+    var _2$1 = cleaned.fj($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh);
     $j_java$002elang$002e$002dObject.$p_sci_HashMapBuilder__ensureUnaliased__V(b$4);
     var h$1 = $j_java$002elang$002e$002dObject.$m_sr_Statics$().a6(context);
-    var im$1 = $j_java$002elang$002e$002dObject.$m_sc_Hashing$().b3(h$1);
-    b$4.sj(b$4.jt, context, _2$1, h$1, im$1, 0);
+    var im$1 = $j_java$002elang$002e$002dObject.$m_sc_Hashing$().b8(h$1);
+    b$4.sx(b$4.jv, context, _2$1, h$1, im$1, 0);
   }
-  var outerReplMap = b$4.us();
+  var outerReplMap = b$4.uE();
   return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dSemigraph$002dSolver$002dImpl$0024$002dResult.$c_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl$Result($thiz, $j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdjacency$002dList.$f_Lizumi_fundamentals_graphs_struct_AdjacencyList__rewriteAll__sci_Map__O(result$1, indexRemap), indexRemap, outerReplMap));
 }
 export { $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__resolveMutations__sci_Map__s_util_Either as $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__resolveMutations__sci_Map__s_util_Either };
 function $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__doResolve__sci_Map__O__Lizumi_distage_planning_solver_SemigraphSolver$ClassifiedConflicts__s_Option($thiz, predecessors, target, classified) {
   var asFinalTarget = new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(target, $j_java$002elang$002e$002dObject.$m_s_None$());
-  var asSeq = $j_java$002elang$002e$002dObject.$m_sci_Seq$().cW(classified.PA);
-  var filtered = classified.Pz.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((d$2$2) => $j_java$002elang$002e$002dObject.$m_sr_BoxesRunTime$().Z(d$2$2.i6, target))));
+  var asSeq = $j_java$002elang$002e$002dObject.$m_sci_Seq$().cX(classified.Q1);
+  var filtered = classified.Q0.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((d$2$2) => $j_java$002elang$002e$002dObject.$m_sr_BoxesRunTime$().X(d$2$2.i8, target))));
   var this$2 = $j_java$002elang$002e$002dObject.$f_sc_IterableOps__headOption__s_Option(filtered);
-  var firstOp = (this$2.m() ? asFinalTarget : this$2.a0());
-  var x1 = asSeq.no();
+  var firstOp = (this$2.l() ? asFinalTarget : this$2.Z());
+  var x1 = asSeq.nw();
   if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
     var lastOp = x1.af;
-    var mutationsInApplicationOrder = asSeq.bO(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$32$2$2) => ((x$32$2$2 === null) ? (lastOp === null) : x$32$2$2.b(lastOp)))));
-    var withFinalAtTheEnd = mutationsInApplicationOrder.bV($j_java$002elang$002e$002dObject.$m_sci_Seq$().aA($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [lastOp])));
+    var mutationsInApplicationOrder = asSeq.bR(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$32$2$2) => ((x$32$2$2 === null) ? (lastOp === null) : x$32$2$2.b(lastOp)))));
+    var withFinalAtTheEnd = mutationsInApplicationOrder.bX($j_java$002elang$002e$002dObject.$m_sci_Seq$().ax($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [lastOp])));
     var first = new $j_java$002elang$002e$002dObject.$c_sr_ObjectRef(firstOp);
-    var replacements = withFinalAtTheEnd.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((m$2$2) => {
-      var replacement = first.cy;
-      first.cy = m$2$2;
-      return new $j_java$002elang$002e$002dObject.$c_T3(m$2$2, predecessors.x(m$2$2).nN.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((ld$2$2) => ($j_java$002elang$002e$002dObject.$m_sr_BoxesRunTime$().Z(ld$2$2, target) ? replacement : new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(ld$2$2, $j_java$002elang$002e$002dObject.$m_s_None$()))))), $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), target, replacement));
+    var replacements = withFinalAtTheEnd.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((m$2$2) => {
+      var replacement = first.cB;
+      first.cB = m$2$2;
+      return new $j_java$002elang$002e$002dObject.$c_T3(m$2$2, predecessors.w(m$2$2).nU.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((ld$2$2) => ($j_java$002elang$002e$002dObject.$m_sr_BoxesRunTime$().X(ld$2$2, target) ? replacement : new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(ld$2$2, $j_java$002elang$002e$002dObject.$m_s_None$()))))), $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), target, replacement));
     })));
-    var innerReplacements = replacements.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+    var innerReplacements = replacements.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
       if ((x0$1$2$2 !== null)) {
-        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$1$2$2.aX, x0$1$2$2.br);
+        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$1$2$2.aS, x0$1$2$2.bd);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
       }
     })));
-    return new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), asFinalTarget, new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dResolved$002dMutations.$c_Lizumi_distage_planning_solver_SemigraphSolver$ResolvedMutations(lastOp, replacements.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
+    return new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), asFinalTarget, new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dResolved$002dMutations.$c_Lizumi_distage_planning_solver_SemigraphSolver$ResolvedMutations(lastOp, replacements.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
       if ((x0$2$2$2 !== null)) {
-        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$2$2$2.aX, x0$2$2$2.bk);
+        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$2$2$2.aS, x0$2$2$2.b5);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2$2$2);
       }
@@ -347,21 +347,21 @@ function $h_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl()
 }
 export { $h_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl as $h_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl };
 $h_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl.prototype = $p;
-$p.aOk = (function(predecessors, roots, activations, weak) {
-  var this$1 = this.aOl(predecessors, roots, weak, activations);
+$p.aP7 = (function(predecessors, roots, activations, weak) {
+  var this$1 = this.aP8(predecessors, roots, weak, activations);
   if ((this$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = this$1.H;
-    var semiMatrix$2 = b.t8;
+    var semiMatrix$2 = b.tk;
     var $x_1 = new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dSemi$002dIncidence$002dMatrix.$c_Lizumi_distage_planning_solver_SemigraphSolver$SemiIncidenceMatrix(semiMatrix$2);
-    var this$2 = semiMatrix$2.bP();
-    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+    var this$2 = semiMatrix$2.bI();
+    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
     var it = this$2.p();
     while (it.f()) {
       var elem = it.e();
-      var key = new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(elem.i5, elem.mN);
-      m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$2) => (() => this$2.bl().aF()))(this$2))).am(elem);
+      var key = new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(elem.i7, elem.mW);
+      m.cs(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$2) => (() => this$2.bn().aF()))(this$2))).am(elem);
     }
-    var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
+    var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
     var mapIt = m.p();
     while (mapIt.f()) {
       var x1 = mapIt.e();
@@ -370,9 +370,9 @@ $p.aOk = (function(predecessors, roots, activations, weak) {
       }
       var k = x1.E();
       var v = x1.z();
-      result = result.ci(k, v.aq());
+      result = result.ck(k, v.ao());
     }
-    var this$5 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), $x_1, result.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$1$2$2) => (x$1$2$2.z().a2() > 1))), false)));
+    var this$5 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), $x_1, result.eV(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$1$2$2) => (x$1$2$2.z().a3() > 1))), false)));
   } else {
     var this$5 = this$1;
   }
@@ -381,14 +381,14 @@ $p.aOk = (function(predecessors, roots, activations, weak) {
     if ((b$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$1);
     }
-    var semiMatrix = b$1.E().t8;
+    var semiMatrix = b$1.E().tk;
     var unsolvedConflicts$1 = b$1.z();
-    var this$8 = ((!unsolvedConflicts$1.m()) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_izumi$002edistage$002emodel$002edefinition$002eerrors$002e$002dConflict$002dResolution$002dError$0024$002dUnsolved$002dConflicts.$c_Lizumi_distage_model_definition_errors_ConflictResolutionError$UnsolvedConflicts(unsolvedConflicts$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0)));
-    var this$9 = ((this$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), this$8.H, semiMatrix.hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+    var this$8 = ((!unsolvedConflicts$1.l()) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_izumi$002edistage$002emodel$002edefinition$002eerrors$002e$002dConflict$002dResolution$002dError$0024$002dUnsolved$002dConflicts.$c_Lizumi_distage_model_definition_errors_ConflictResolutionError$UnsolvedConflicts(unsolvedConflicts$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0)));
+    var this$9 = ((this$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), this$8.H, semiMatrix.hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
       if ((x0$1$2$2 !== null)) {
         var k$1 = x0$1$2$2.E();
         var v$1 = x0$1$2$2.z();
-        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(k$1.i5, k$1.mN), new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dNode.$c_Lizumi_distage_model_definition_conflicts_Node(v$1.nN.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$2$2$2) => x$2$2$2.PE))), v$1.nO));
+        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(k$1.i7, k$1.mW), new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dNode.$c_Lizumi_distage_model_definition_conflicts_Node(v$1.nU.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$2$2$2) => x$2$2$2.Q5))), v$1.nV));
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
       }
@@ -403,15 +403,15 @@ $p.aOk = (function(predecessors, roots, activations, weak) {
       if ((this$10 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$4 = this$10.H;
         var $x_2 = $j_java$002elang$002e$002dObject.$m_s_Predef$();
-        var this$11 = semiMatrix.bP();
-        var m$1 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+        var this$11 = semiMatrix.bI();
+        var m$1 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
         var it$1 = this$11.p();
         while (it$1.f()) {
           var elem$1 = it$1.e();
-          var key$1 = new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(elem$1.i5, elem$1.mN);
-          m$1.cq(key$1, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$11) => (() => this$11.bl().aF()))(this$11))).am(elem$1);
+          var key$1 = new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(elem$1.i7, elem$1.mW);
+          m$1.cs(key$1, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$11) => (() => this$11.bn().aF()))(this$11))).am(elem$1);
         }
-        var result$1 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
+        var result$1 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
         var mapIt$1 = m$1.p();
         while (mapIt$1.f()) {
           var x1$1 = mapIt$1.e();
@@ -420,27 +420,27 @@ $p.aOk = (function(predecessors, roots, activations, weak) {
           }
           var k$2 = x1$1.E();
           var v$2 = x1$1.z();
-          result$1 = result$1.ci(k$2, v$2.aq());
+          result$1 = result$1.ck(k$2, v$2.ao());
         }
         var this$13 = result$1;
         var res = true;
         var it$2 = this$13.p();
         while ((res && it$2.f())) {
-          res = (it$2.e().z().a2() === 1);
+          res = (it$2.e().z().a3() === 1);
         }
-        $x_2.cd(res);
-        var meta = deannotated$1.hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((mutationsResolved) => ((x0$2$2$2) => {
+        $x_2.cg(res);
+        var meta = deannotated$1.hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((mutationsResolved) => ((x0$2$2$2) => {
           if ((x0$2$2$2 !== null)) {
             var k$3 = x0$2$2$2.E();
             var v$3 = x0$2$2$2.z();
-            var targetKey = mutationsResolved.PG.cA(k$3, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => k$3)));
-            var replMap = mutationsResolved.PH.cA(targetKey, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$())));
-            return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), targetKey, new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dRemapped$002dValue.$c_Lizumi_distage_planning_solver_SemigraphSolver$RemappedValue(v$3.nO, replMap));
+            var targetKey = mutationsResolved.Q7.cw(k$3, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => k$3)));
+            var replMap = mutationsResolved.Q8.cw(targetKey, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$())));
+            return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), targetKey, new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dRemapped$002dValue.$c_Lizumi_distage_planning_solver_SemigraphSolver$RemappedValue(v$3.nV, replMap));
           } else {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2$2$2);
           }
         }))(b$4)));
-        return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dResolution.$c_Lizumi_distage_planning_solver_SemigraphSolver$Resolution($j_izumi$002efundamentals$002egraphs$002e$002dD$002dG$0024.$m_Lizumi_fundamentals_graphs_DG$().UA(b$4.PF, meta)));
+        return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dResolution.$c_Lizumi_distage_planning_solver_SemigraphSolver$Resolution($j_izumi$002efundamentals$002egraphs$002e$002dD$002dG$0024.$m_Lizumi_fundamentals_graphs_DG$().Vb(b$4.Q6, meta)));
       } else {
         return this$10;
       }
@@ -451,31 +451,31 @@ $p.aOk = (function(predecessors, roots, activations, weak) {
     return this$5;
   }
 });
-$p.aOl = (function(predecessors, roots, weak, activations) {
-  var this$1 = this.aMr(activations);
-  var this$2 = ((this$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), this$1.H, new $j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$c_Lizumi_distage_model_planning_ActivationChoices($j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$m_Lizumi_distage_model_planning_ActivationChoices$().a0w(activations)))) : this$1);
+$p.aP8 = (function(predecessors, roots, weak, activations) {
+  var this$1 = this.aNe(activations);
+  var this$2 = ((this$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), this$1.H, new $j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$c_Lizumi_distage_model_planning_ActivationChoices($j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$m_Lizumi_distage_model_planning_ActivationChoices$().a19(activations)))) : this$1);
   if ((this$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = this$2.H;
     if ((b$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$1);
     }
-    var activationChoices$1 = b$1.z().vI;
-    var this$5 = $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__traceGrouped__sci_Map__sci_Set__sci_Map__sci_Set__sci_Set__scm_HashMap__s_util_Either(this, activationChoices$1, weak, $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dSemi$002dGraph$002dOps$0024.$m_Lizumi_distage_planning_solver_SemigraphSolver$SemiGraphOps$().aPM(predecessors), roots, roots, $j_java$002elang$002e$002dObject.$ct_scm_HashMap__(new $j_java$002elang$002e$002dObject.$c_scm_HashMap()));
+    var activationChoices$1 = b$1.z().vT;
+    var this$5 = $p_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl__traceGrouped__sci_Map__sci_Set__sci_Map__sci_Set__sci_Set__scm_HashMap__s_util_Either(this, activationChoices$1, weak, $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dSemi$002dGraph$002dOps$0024.$m_Lizumi_distage_planning_solver_SemigraphSolver$SemiGraphOps$().aQz(predecessors), roots, roots, $j_java$002elang$002e$002dObject.$ct_scm_HashMap__(new $j_java$002elang$002e$002dObject.$c_scm_HashMap()));
     if ((this$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$2 = this$5.H;
-      var nonAmbiguous = b$2.bO(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$8$2$2) => (!x$8$2$2.E().mN.m())))).hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+      var nonAmbiguous = b$2.bR(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$8$2$2) => (!x$8$2$2.E().mW.l())))).hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
         if ((x0$1$2$2 !== null)) {
           var k = x0$1$2$2.E();
-          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), k.i5, k.iG);
+          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), k.i7, k.iI);
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
         }
       })));
-      return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dSemi$002dIncidence$002dMatrix.$c_Lizumi_distage_planning_solver_SemigraphSolver$SemiIncidenceMatrix(b$2.hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
+      return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dSemi$002dIncidence$002dMatrix.$c_Lizumi_distage_planning_solver_SemigraphSolver$SemiIncidenceMatrix(b$2.hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
         if ((x0$2$2$2 !== null)) {
           var key = x0$2$2$2.E();
           var node = x0$2$2$2.z();
-          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), key, new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dNode.$c_Lizumi_distage_model_definition_conflicts_Node(node.nN.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((d$2$2) => new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dSelected.$c_Lizumi_distage_planning_solver_SemigraphSolver$Selected(d$2$2, nonAmbiguous.cA(d$2$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$()))))))), node.nO));
+          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), key, new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dNode.$c_Lizumi_distage_model_definition_conflicts_Node(node.nU.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((d$2$2) => new $j_izumi$002edistage$002eplanning$002esolver$002e$002dSemigraph$002dSolver$0024$002dSelected.$c_Lizumi_distage_planning_solver_SemigraphSolver$Selected(d$2$2, nonAmbiguous.cw(d$2$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$()))))))), node.nV));
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2$2$2);
         }
@@ -487,15 +487,15 @@ $p.aOl = (function(predecessors, roots, weak, activations) {
     return this$2;
   }
 });
-$p.aMr = (function(activations) {
-  var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+$p.aNe = (function(activations) {
+  var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
   var it = activations.p();
   while (it.f()) {
     var elem = it.e();
-    var key = elem.fO;
-    m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$1) => (() => this$1.bl().aF()))(activations))).am(elem);
+    var key = elem.fT;
+    m.cs(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$1) => (() => this$1.bn().aF()))(activations))).am(elem);
   }
-  var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
+  var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
   var mapIt = m.p();
   while (mapIt.f()) {
     var x1 = mapIt.e();
@@ -504,30 +504,30 @@ $p.aMr = (function(activations) {
     }
     var k = x1.E();
     var v = x1.z();
-    result = result.ci(k, v.aq());
+    result = result.ck(k, v.ao());
   }
-  var bad = result.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$12$2$2) => (x$12$2$2.z().a2() > 1))), false);
-  return (bad.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_izumi$002edistage$002emodel$002edefinition$002eerrors$002e$002dConflict$002dResolution$002dError$0024$002dConflicting$002dAxis$002dChoices.$c_Lizumi_distage_model_definition_errors_ConflictResolutionError$ConflictingAxisChoices(bad), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))));
+  var bad = result.eV(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$12$2$2) => (x$12$2$2.z().a3() > 1))), false);
+  return (bad.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_izumi$002edistage$002emodel$002edefinition$002eerrors$002e$002dConflict$002dResolution$002dError$0024$002dConflicting$002dAxis$002dChoices.$c_Lizumi_distage_model_definition_errors_ConflictResolutionError$ConflictingAxisChoices(bad), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))));
 });
-$p.aOm = (function(activations, conflict) {
-  var x1 = this.axJ(activations, conflict);
+$p.aP9 = (function(activations, conflict) {
+  var x1 = this.ayu(activations, conflict);
   if ((x1 === null)) {
     throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
   }
   var onlyValid = x1.E();
   var list = onlyValid.aC();
-  var x1$2 = (list.m() ? $j_java$002elang$002e$002dObject.$m_s_None$() : new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(list)));
+  var x1$2 = (list.l() ? $j_java$002elang$002e$002dObject.$m_s_None$() : new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(list)));
   if ((x1$2 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
-    var conflict$2 = x1$2.af.ay;
-    if ((conflict$2.cQ(1) === 0)) {
-      return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [conflict$2.i()])));
+    var conflict$2 = x1$2.af.av;
+    if ((conflict$2.cS(1) === 0)) {
+      return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().ak($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [conflict$2.i()])));
     } else {
-      var f = ((x$16$2$2) => (!x$16$2$2.E().iG.m()));
+      var f = ((x$16$2$2) => (!x$16$2$2.E().iI.l()));
       var l = conflict$2;
       block: {
         var result;
         while (true) {
-          if (l.m()) {
+          if (l.l()) {
             var result = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
             break;
           } else {
@@ -540,7 +540,7 @@ $p.aOm = (function(activations, conflict) {
             var start = l;
             var remaining = t;
             while (true) {
-              if (remaining.m()) {
+              if (remaining.l()) {
                 var result = start;
                 break block;
               } else {
@@ -561,7 +561,7 @@ $p.aOm = (function(activations, conflict) {
                 }
                 var next = firstMiss.n();
                 var nextToCopy = next;
-                while ((!next.m())) {
+                while ((!next.l())) {
                   var head = next.i();
                   if (((!(!f(head))) !== false)) {
                     next = next.n();
@@ -576,7 +576,7 @@ $p.aOm = (function(activations, conflict) {
                     next = next.n();
                   }
                 }
-                if ((!nextToCopy.m())) {
+                if ((!nextToCopy.l())) {
                   currentLast.L = nextToCopy;
                 }
                 var result = newHead;
@@ -587,12 +587,12 @@ $p.aOm = (function(activations, conflict) {
         }
       }
       if ((result instanceof $j_java$002elang$002e$002dObject.$c_sci_$colon$colon)) {
-        var head$1 = result.id;
+        var head$1 = result.ig;
         if ($j_java$002elang$002e$002dObject.$m_sci_Nil$().b(result.L)) {
-          return ($j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$m_Lizumi_distage_model_planning_ActivationChoices$().a0q(activations, head$1.E().iG) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [head$1]))) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(this.awP(activations, conflict$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))));
+          return ($j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$m_Lizumi_distage_model_planning_ActivationChoices$().a13(activations, head$1.E().iI) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().ak($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [head$1]))) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(this.axz(activations, conflict$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))));
         }
       }
-      return this.aGd(activations, conflict$2);
+      return this.aGY(activations, conflict$2);
     }
   } else if (($j_java$002elang$002e$002dObject.$m_s_None$() === x1$2)) {
     return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$());
@@ -600,34 +600,34 @@ $p.aOm = (function(activations, conflict) {
     throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$2);
   }
 });
-$p.axJ = (function(activations, conflict) {
-  return conflict.d7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+$p.ayu = (function(activations, conflict) {
+  return conflict.d4(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
     if ((x0$1$2$2 !== null)) {
-      return $j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$m_Lizumi_distage_model_planning_ActivationChoices$().u0(activations, x0$1$2$2.E().iG);
+      return $j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$m_Lizumi_distage_model_planning_ActivationChoices$().ud(activations, x0$1$2$2.E().iI);
     } else {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
     }
   })));
 });
-$p.aGd = (function(activations, conflict) {
-  var sorted = $j_java$002elang$002e$002dObject.$f_sc_SeqOps__sortWith__F2__O(conflict, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction2_$$Lambda$286cbfc6187197affcadc8465aaec93d6b7d20dc(((a$2$2, b$2$2) => b$2$2.E().iG.qG(a$2$2.E().iG))));
+$p.aGY = (function(activations, conflict) {
+  var sorted = $j_java$002elang$002e$002dObject.$f_sc_SeqOps__sortWith__F2__O(conflict, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction2_$$Lambda$286cbfc6187197affcadc8465aaec93d6b7d20dc(((a$2$2, b$2$2) => b$2$2.E().iI.qR(a$2$2.E().iI))));
   var mostSpecific = sorted.i();
-  var mostSpecificAxis = mostSpecific.E().iG;
+  var mostSpecificAxis = mostSpecific.E().iI;
   var others = sorted.n();
-  var this$2 = new $j_java$002elang$002e$002dObject.$c_sc_Iterator$$anon$9(others.p(), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$17$2$2) => x$17$2$2.E().iG)));
+  var this$2 = new $j_java$002elang$002e$002dObject.$c_sc_Iterator$$anon$9(others.p(), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$17$2$2) => x$17$2$2.E().iI)));
   var res = true;
   while ((res && this$2.f())) {
     var x0 = this$2.e();
-    if (((!((x0 === null) ? (mostSpecificAxis === null) : x0.b(mostSpecificAxis))) && x0.qG(mostSpecificAxis))) {
-      var this$3 = x0.b8(mostSpecificAxis);
-      var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+    if (((!((x0 === null) ? (mostSpecificAxis === null) : x0.b(mostSpecificAxis))) && x0.qR(mostSpecificAxis))) {
+      var this$3 = x0.b6(mostSpecificAxis);
+      var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
       var it = this$3.p();
       while (it.f()) {
         var elem = it.e();
-        var key = elem.fO;
-        m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$3) => (() => this$3.bl().aF()))(this$3))).am(elem);
+        var key = elem.fT;
+        m.cs(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$3) => (() => this$3.bn().aF()))(this$3))).am(elem);
       }
-      var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
+      var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
       var mapIt = m.p();
       while (mapIt.f()) {
         var x1 = mapIt.e();
@@ -636,28 +636,28 @@ $p.aGd = (function(activations, conflict) {
         }
         var k = x1.E();
         var v = x1.z();
-        result = result.ci(k, v.aq());
+        result = result.ck(k, v.ao());
       }
       var this$5 = result;
       var res$1 = true;
       var it$1 = this$5.p();
       while ((res$1 && it$1.f())) {
-        res$1 = (it$1.e().z().l3(1) === 0);
+        res$1 = (it$1.e().z().l7(1) === 0);
       }
       res = res$1;
     } else {
       res = false;
     }
   }
-  return (((res && (!mostSpecificAxis.m())) && $j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$m_Lizumi_distage_model_planning_ActivationChoices$().a0q(activations, mostSpecificAxis)) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [mostSpecific]))) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(this.awP(activations, conflict), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))));
+  return (((res && (!mostSpecificAxis.l())) && $j_izumi$002edistage$002emodel$002eplanning$002e$002dActivation$002dChoices.$m_Lizumi_distage_model_planning_ActivationChoices$().a13(activations, mostSpecificAxis)) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().ak($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [mostSpecific]))) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(this.axz(activations, conflict), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))));
 });
-$p.awP = (function(activations, conflict) {
+$p.axz = (function(activations, conflict) {
   var $x_2 = $j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$();
   var f = ((x0$1$2$2) => {
     if ((x0$1$2$2 !== null)) {
       var k = x0$1$2$2.E();
       var n = x0$1$2$2.z();
-      return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(k.i5, k.mN), $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), k.iG, n));
+      return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_izumi$002edistage$002emodel$002edefinition$002econflicts$002e$002dMut$002dSel.$c_Lizumi_distage_model_definition_conflicts_MutSel(k.i7, k.mW), $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), k.iI, n));
     } else {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
     }
@@ -678,11 +678,11 @@ $p.awP = (function(activations, conflict) {
     }
     var $x_1 = h;
   }
-  return new $j_izumi$002edistage$002emodel$002edefinition$002eerrors$002e$002dConflict$002dResolution$002dError$0024$002dConflicting$002dDefs.$c_Lizumi_distage_model_definition_errors_ConflictResolutionError$ConflictingDefs($x_2.p0($x_1), activations);
+  return new $j_izumi$002edistage$002emodel$002edefinition$002eerrors$002e$002dConflict$002dResolution$002dError$0024$002dConflicting$002dDefs.$c_Lizumi_distage_model_definition_errors_ConflictResolutionError$ConflictingDefs($x_2.p7($x_1), activations);
 });
 var $d_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl, "izumi.distage.planning.solver.SemigraphSolver$SemigraphSolverImpl", ({
-  C4: 1,
-  nR: 1
+  Cm: 1,
+  nZ: 1
 }));
 export { $d_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl as $d_Lizumi_distage_planning_solver_SemigraphSolver$SemigraphSolverImpl };
 //# sourceMappingURL=izumi.distage.planning.solver.-Semigraph-Solver$-Semigraph-Solver-Impl.js.map