Commit e2ff2ab
committed
feat(planner): count pin on a goal's producer supply-pushes instead of fighting the goal
Pinning a recipe's building count (exact) while it also produces a pinned
goal created two independent LP constraints that fought: 2 foundries make
0.133/s steel, a 0.14/s goal needs 2.1, and =-count plus >=-floor can't
both hold, so the block went infeasible over a rounding sliver. But
pinning a building count IS the user switching that block to supply-push
('I built N of these, size around them'), so the goal should yield.
A count pin on a producer of a pinned goal now relaxes that goal's rate
floor (the pin drives output); the doc goal is untouched, so naming and
factory rollups are unaffected. Scope keeps the honest cases: a CAP pin
still lets the shortfall flag (a ceiling the goal may exceed), and a count
pin on a mid-chain row stays a hard constraint that can legitimately
conflict. The result carries goalSuperseded (target vs what the pinned
buildings make, and whole buildings the target would need); the goal card
shows it as a soft note so the relaxation isn't silent.
Mirrors YAFC, where fixing a row is the spec and output is a consequence
with no separate goal to collide. Verified live on the steel-plate block:
2 foundries, 0.133/s, note 'pinned 2 -> 0.13/s . 0.14/s needs 3'.
Closes #1211 parent 278edb1 commit e2ff2ab
4 files changed
Lines changed: 137 additions & 2 deletions
File tree
- app/src
- components/block
- server
- docs
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
169 | 186 | | |
170 | 187 | | |
171 | 188 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
559 | 559 | | |
560 | 560 | | |
561 | 561 | | |
562 | | - | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
563 | 585 | | |
564 | 586 | | |
565 | 587 | | |
| |||
594 | 616 | | |
595 | 617 | | |
596 | 618 | | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
597 | 639 | | |
598 | 640 | | |
599 | 641 | | |
| |||
1184 | 1226 | | |
1185 | 1227 | | |
1186 | 1228 | | |
| 1229 | + | |
| 1230 | + | |
1187 | 1231 | | |
1188 | 1232 | | |
1189 | 1233 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
791 | 791 | | |
792 | 792 | | |
793 | 793 | | |
| 794 | + | |
| 795 | + | |
| 796 | + | |
| 797 | + | |
| 798 | + | |
| 799 | + | |
| 800 | + | |
| 801 | + | |
| 802 | + | |
| 803 | + | |
| 804 | + | |
| 805 | + | |
| 806 | + | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
| 811 | + | |
| 812 | + | |
| 813 | + | |
| 814 | + | |
| 815 | + | |
| 816 | + | |
| 817 | + | |
| 818 | + | |
| 819 | + | |
| 820 | + | |
| 821 | + | |
| 822 | + | |
| 823 | + | |
| 824 | + | |
| 825 | + | |
| 826 | + | |
| 827 | + | |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
| 836 | + | |
| 837 | + | |
| 838 | + | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
68 | 78 | | |
69 | 79 | | |
70 | 80 | | |
| |||
0 commit comments