Skip to content

Commit 33efd88

Browse files
committed
Remove non-breaking spaces after commas in tables
This helps allow tables conserve horizontal space without affecting readability too drastically.
1 parent 17e5aa7 commit 33efd88

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

doc/solver.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,9 @@ solution or by adding an incompatibility to the incompatibility set.
435435
| Step | Value | Type | Where it was added | Cause | Decision level |
436436
| ---- | ----- | ---- | ------------------ | ----- | -------------- |
437437
| 1 | `root 1.0.0` | decision | top level | | 0 |
438-
| 2 | `{root 1.0.0, not foo ^1.0.0}` | incompatibility | top level | | |
438+
| 2 | `{root 1.0.0, not foo ^1.0.0}` | incompatibility | top level | | |
439439
| 3 | `foo ^1.0.0` | derivation | unit propagation | step 2 | 0 |
440-
| 4 | `{foo any, not bar ^1.0.0}` | incompatibility | decision making | | |
440+
| 4 | `{foo any, not bar ^1.0.0}` | incompatibility | decision making | | |
441441
| 5 | `foo 1.0.0` | decision | decision making | | 1 |
442442
| 6 | `bar ^1.0.0` | derivation | unit propagation | step 4 | 1 |
443443
| 7 | `bar 1.0.0` | decision | decision making | | 2 |
@@ -471,11 +471,11 @@ Pubgrub goes through the following steps:
471471
| Step | Value | Type | Where it was added | Cause | Decision level |
472472
| ---- | ----- | ---- | ------------------ | ----- | -------------- |
473473
| 1 | `root 1.0.0` | decision | top level | | 0 |
474-
| 2 | `{root 1.0.0, not foo ^1.0.0}` | incompatibility | top level | | |
475-
| 3 | `{root 1.0.0, not bar ^1.0.0}` | incompatibility | top level | | |
474+
| 2 | `{root 1.0.0, not foo ^1.0.0}` | incompatibility | top level | | |
475+
| 3 | `{root 1.0.0, not bar ^1.0.0}` | incompatibility | top level | | |
476476
| 4 | `foo ^1.0.0` | derivation | unit propagation | step 2 | 0 |
477477
| 5 | `bar ^1.0.0` | derivation | unit propagation | step 3 | 0 |
478-
| 6 | `{foo >=1.1.0, not bar ^2.0.0}` | incompatibility | decision making | | |
478+
| 6 | `{foo >=1.1.0, not bar ^2.0.0}` | incompatibility | decision making | | |
479479
| 7 | `not foo >=1.1.0` | derivation | unit propagation | step 6 | 0 |
480480
| 8 | `foo 1.0.0` | decision | decision making | | 1 |
481481
| 9 | `bar 1.1.0` | decision | decision making | | 2 |
@@ -508,12 +508,12 @@ Pubgrub goes through the following steps:
508508
| Step | Value | Type | Where it was added | Cause | Decision level |
509509
| ---- | ----- | ---- | ------------------ | ----- | -------------- |
510510
| 1 | `root 1.0.0` | decision | top level | | 0 |
511-
| 2 | `{root 1.0.0, not foo >=1.0.0}` | incompatibility | top level | | |
511+
| 2 | `{root 1.0.0, not foo >=1.0.0}` | incompatibility | top level | | |
512512
| 3 | `foo >=1.0.0` | derivation | unit propagation | step 2 | 0 |
513-
| 4 | `{foo >=2.0.0, not bar ^1.0.0}` | incompatibility | decision making | | |
513+
| 4 | `{foo >=2.0.0, not bar ^1.0.0}` | incompatibility | decision making | | |
514514
| 5 | `foo 2.0.0` | decision | decision making | | 1 |
515515
| 6 | `bar ^1.0.0` | derivation | unit propagation | step 4 | 1 |
516-
| 7 | `{bar any, not foo ^1.0.0}` | incompatibility | decision making | | |
516+
| 7 | `{bar any, not foo ^1.0.0}` | incompatibility | decision making | | |
517517

518518
The incompatibility added at step 7 is satisfied by the partial assignment: `bar
519519
any` is satisfied by `bar ^1.0.0` from step 6, and `not foo ^1.0.0` is satisfied
@@ -522,7 +522,7 @@ where it iteratively works towards the root cause of the conflict:
522522

523523
| Step | Incompatibility | Term | Satisfier | Cause | Previous Satisfier |
524524
| ---- | --------------- | ---- | --------- | ----- | ------------------ |
525-
| 8 | `{bar any, not foo ^1.0.0}` | `bar any` | `bar ^1.0.0` from step 6 | `{foo >=2.0.0, not bar ^1.0.0}` | `foo 2.0.0` from step 5 |
525+
| 8 | `{bar any, not foo ^1.0.0}` | `bar any` | `bar ^1.0.0` from step 6 | `{foo >=2.0.0, not bar ^1.0.0}` | `foo 2.0.0` from step 5 |
526526
| 9 | `{foo >=2.0.0}` | `foo >=1.0.0` | `foo 2.0.0` from step 5 | | |
527527

528528
In step 9, we merge the two incompatibilities `{bar any, not foo ^1.0.0}` and
@@ -575,23 +575,23 @@ Pubgrub goes through the following steps:
575575
| Step | Value | Type | Where it was added | Cause | Decision level |
576576
| ---- | ----- | ---- | ------------------ | ----- | -------------- |
577577
| 1 | `root 1.0.0` | decision | top level | | 0 |
578-
| 2 | `{root 1.0.0, not foo ^1.0.0}` | incompatibility | top level | | |
579-
| 3 | `{root 1.0.0, not target ^2.0.0}` | incompatibility | top level | | |
578+
| 2 | `{root 1.0.0, not foo ^1.0.0}` | incompatibility | top level | | |
579+
| 3 | `{root 1.0.0, not target ^2.0.0}` | incompatibility | top level | | |
580580
| 4 | `foo ^1.0.0` | derivation | unit propagation | step 2 | 0 |
581581
| 5 | `target ^2.0.0` | derivation | unit propagation | step 3 | 0 |
582582
| 6 | `target 2.0.0` | decision | decision making | | 1 |
583-
| 7 | `{foo >=1.1.0, not left ^1.0.0}` | incompatibility | decision making | | |
584-
| 8 | `{foo >=1.1.0, not right ^1.0.0}` | incompatibility | decision making | | |
583+
| 7 | `{foo >=1.1.0, not left ^1.0.0}` | incompatibility | decision making | | |
584+
| 8 | `{foo >=1.1.0, not right ^1.0.0}` | incompatibility | decision making | | |
585585
| 9 | `foo 1.1.0` | decision | decision making | | 2 |
586586
| 10 | `left ^1.0.0` | derivation | unit propagation | step 7 | 2 |
587587
| 11 | `right ^1.0.0` | derivation | unit propagation | step 8 | 2 |
588-
| 12 | `{right any, not shared <2.0.0}` | incompatibility | decision making | | |
588+
| 12 | `{right any, not shared <2.0.0}` | incompatibility | decision making | | |
589589
| 13 | `right 1.0.0` | decision | decision making | | 3 |
590590
| 14 | `shared <2.0.0` | derivation | unit propagation | step 12 | 3 |
591-
| 15 | `{left any, not shared >=1.0.0}` | incompatibility | decision making | | |
591+
| 15 | `{left any, not shared >=1.0.0}` | incompatibility | decision making | | |
592592
| 16 | `left 1.0.0` | decision | decision making | | 4 |
593593
| 17 | `shared >=1.0.0` | derivation | unit propagation | step 15 | 4 |
594-
| 18 | `{shared ^1.0.0, not target ^1.0.0}` | incompatibility | decision making | | |
594+
| 18 | `{shared ^1.0.0, not target ^1.0.0}` | incompatibility | decision making | | |
595595

596596
The incompatibility at step 18 is in conflict: `not target ^1.0.0` is satisfied
597597
by `target ^2.0.0` from step 5, and `shared ^1.0.0` is *jointly* satisfied by
@@ -608,8 +608,8 @@ But this derivation causes a new conflict, which needs to be resolved:
608608

609609
| Step | Incompatibility | Term | Satisfier | Cause | Previous Satisfier |
610610
| ---- | --------------- | ---- | --------- | ----- | ------------------ |
611-
| 20 | `{left any, not shared >=1.0.0}` | `not shared >=1.0.0` | `not shared ^1.0.0` from step 19 | `{shared ^1.0.0, not target ^1.0.0}` | `shared <2.0.0` from step 14 |
612-
| 21 | `{left any, not target ^1.0.0, not shared >=2.0.0}` | `not shared >=2.0.0` | `shared <2.0.0` from step 14 | `{right any, not shared <2.0.0}` | `left ^1.0.0` from step 10 |
611+
| 20 | `{left any, not shared >=1.0.0}` | `not shared >=1.0.0` | `not shared ^1.0.0` from step 19 | `{shared ^1.0.0, not target ^1.0.0}` | `shared <2.0.0` from step 14 |
612+
| 21 | `{left any, not target ^1.0.0, not shared >=2.0.0}` | `not shared >=2.0.0` | `shared <2.0.0` from step 14 | `{right any, not shared <2.0.0}` | `left ^1.0.0` from step 10 |
613613

614614
Once again, we merge two incompatibilities, but this time we aren't able to
615615
simplify the result.
@@ -626,17 +626,17 @@ where `left ^1.0.0` was derived:
626626

627627
| Step | Value | Type | Where it was added | Cause | Decision level |
628628
| ---- | ----- | ---- | ------------------ | ----- | -------------- |
629-
| 22 | `{left any, not target ^1.0.0, not shared >=2.0.0}` | incompatibility | conflict resolution | | |
629+
| 22 | `{left any, not target ^1.0.0, not shared >=2.0.0}` | incompatibility | conflict resolution | | |
630630
| 23 | `shared >=2.0.0` | derivation | unit propagation | step 22 | 2 |
631631

632632
And we re-enter conflict resolution:
633633

634634
| Step | Incompatibility | Term | Satisfier | Cause | Previous Satisfier |
635635
| ---- | --------------- | ---- | --------- | ----- | ------------------ |
636-
| 24 | `{right any, not shared <2.0.0}` | `not shared <2.0.0` | `shared >=2.0.0` from step 23 | `{left any, not target ^1.0.0, not shared >=2.0.0}` | `right ^1.0.0` from step 11 |
637-
| 25 | `{left any, right any, not target ^1.0.0}` | `right any` | `right ^1.0.0` from step 11 | `{foo >=1.1.0, not right ^1.0.0}` | `left ^1.0.0` from step 10 |
638-
| 26 | `{left any, foo >=1.1.0, not target ^1.0.0}` | `left any` | `left ^1.0.0` from step 10 | `{foo >=1.1.0, not left ^1.0.0}` | `foo 1.1.0` from step 9 |
639-
| 27 | `{foo >=1.1.0, not target ^1.0.0}` | `foo >=1.1.0` | `foo 1.1.0` from step 9 | | `target ^2.0.0` from step 5 |
636+
| 24 | `{right any, not shared <2.0.0}` | `not shared <2.0.0` | `shared >=2.0.0` from step 23 | `{left any, not target ^1.0.0, not shared >=2.0.0}` | `right ^1.0.0` from step 11 |
637+
| 25 | `{left any, right any, not target ^1.0.0}` | `right any` | `right ^1.0.0` from step 11 | `{foo >=1.1.0, not right ^1.0.0}` | `left ^1.0.0` from step 10 |
638+
| 26 | `{left any, foo >=1.1.0, not target ^1.0.0}` | `left any` | `left ^1.0.0` from step 10 | `{foo >=1.1.0, not left ^1.0.0}` | `foo 1.1.0` from step 9 |
639+
| 27 | `{foo >=1.1.0, not target ^1.0.0}` | `foo >=1.1.0` | `foo 1.1.0` from step 9 | | `target ^2.0.0` from step 5 |
640640

641641
Pubgrub has figured out that `foo 1.1.0` transitively depends on `target
642642
^1.0.0`, even though that dependency goes through `left`, `right`, and `shared`.
@@ -645,7 +645,7 @@ and quickly finds the correct solution:
645645

646646
| Step | Value | Type | Where it was added | Cause | Decision level |
647647
| ---- | ----- | ---- | ------------------ | ----- | -------------- |
648-
| 28 | `{foo >=1.1.0, not target ^1.0.0}` | incompatibility | conflict resolution | | |
648+
| 28 | `{foo >=1.1.0, not target ^1.0.0}` | incompatibility | conflict resolution | | |
649649
| 29 | `not foo >=1.1.0` | derivation | unit propagation | step 28 | 0 |
650650
| 30 | `foo 1.0.0` | decision | decision making | | 1 |
651651
| 31 | `target 2.0.0` | decision | decision making | | 2 |

0 commit comments

Comments
 (0)