Bessere Verteilung: Strafen/Mutation, plus Abstammungsbaum mit Id-Herkunft
Weniger vermeidbare Gruppentrennungen:
- strafen.cfg: Tischbesetzung bestraft jetzt gestaffelt nach freien
Plaetzen (teilbelegte Tische am teuersten, mit Fallback auf den
naechstkleineren Eintrag), Trennungsstrafen deutlich erhoeht - so
werden Gruppen nicht mehr getrennt, obwohl leere Tische danebenstehen
- gibPunkte('Tischbesetzung') mit Naechst-kleiner-Fallback
- mutieren() setzt geraeumte Gruppen groesste-zuerst neu
(GruppenSetzen(GrosseZuerst=True)), damit grosse Gruppen die frei
gewordenen ganzen Tische bekommen und wieder zusammenkommen
(uebrig bleiben nur physisch unvermeidbare Trennungen, Gruppe > Tisch)
Abstammungsbaum (neuer Schalter --show-lineage -> Abstammung.svg):
- neue Klasse ga.Abstammung zeichnet den vollen Mutationsbaum aller
Loesungen; der Ast der finalen besten Loesung ist hervorgehoben und
mit ihrer Id beschriftet
- hierarchische Loesungs-Ids (Farm._WurzelId/_KindId): Wurzel '7',
Mutationskind '7.2', dessen Kind '7.2.1' - die ganze Abstammung ist
direkt aus der Id ablesbar
Tests (15 gruen), README und CLAUDE.md aktualisiert; Beispiele mit den
neuen Strafen und beiden Grafiken neu berechnet.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -5,21 +5,21 @@
|
||||
<line x1="60" y1="60" x2="60" y2="390.0" stroke="#333" stroke-width="1.5"/>
|
||||
<line x1="60" y1="390.0" x2="840" y2="390.0" stroke="#333" stroke-width="1.5"/>
|
||||
<line x1="60" y1="390.0" x2="840" y2="390.0" stroke="#eee" stroke-width="1"/>
|
||||
<text x="52" y="394.0" text-anchor="end" font-size="11" fill="#666">-821</text>
|
||||
<text x="52" y="394.0" text-anchor="end" font-size="11" fill="#666">-1164</text>
|
||||
<line x1="60" y1="324.0" x2="840" y2="324.0" stroke="#eee" stroke-width="1"/>
|
||||
<text x="52" y="328.0" text-anchor="end" font-size="11" fill="#666">-715</text>
|
||||
<text x="52" y="328.0" text-anchor="end" font-size="11" fill="#666">-1050</text>
|
||||
<line x1="60" y1="258.0" x2="840" y2="258.0" stroke="#eee" stroke-width="1"/>
|
||||
<text x="52" y="262.0" text-anchor="end" font-size="11" fill="#666">-609</text>
|
||||
<text x="52" y="262.0" text-anchor="end" font-size="11" fill="#666">-936</text>
|
||||
<line x1="60" y1="192.0" x2="840" y2="192.0" stroke="#eee" stroke-width="1"/>
|
||||
<text x="52" y="196.0" text-anchor="end" font-size="11" fill="#666">-503</text>
|
||||
<text x="52" y="196.0" text-anchor="end" font-size="11" fill="#666">-822</text>
|
||||
<line x1="60" y1="126.0" x2="840" y2="126.0" stroke="#eee" stroke-width="1"/>
|
||||
<text x="52" y="130.0" text-anchor="end" font-size="11" fill="#666">-398</text>
|
||||
<text x="52" y="130.0" text-anchor="end" font-size="11" fill="#666">-708</text>
|
||||
<line x1="60" y1="60.0" x2="840" y2="60.0" stroke="#eee" stroke-width="1"/>
|
||||
<text x="52" y="64.0" text-anchor="end" font-size="11" fill="#666">-292</text>
|
||||
<text x="52" y="64.0" text-anchor="end" font-size="11" fill="#666">-594</text>
|
||||
<text x="18" y="225.0" text-anchor="middle" font-size="12" fill="#333" transform="rotate(-90 18 225.0)">Wertigkeit (hoeher = besser)</text>
|
||||
<polyline points="60.0,105.6 112.0,74.6 164.0,74.6 216.0,74.6 268.0,60.6 320.0,60.6 372.0,60.6 424.0,60.0 476.0,60.0 528.0,60.0 580.0,60.0 632.0,60.0 684.0,60.0 736.0,60.0 788.0,60.0 840.0,60.0" fill="none" stroke="#2f6f4f" stroke-width="2"/>
|
||||
<polyline points="60.0,246.5 112.0,206.0 164.0,219.5 216.0,145.1 268.0,123.3 320.0,130.6 372.0,91.7 424.0,82.5 476.0,85.5 528.0,63.8 580.0,63.8 632.0,63.8 684.0,60.5 736.0,60.5 788.0,60.5 840.0,60.0" fill="none" stroke="#c08a2d" stroke-width="2"/>
|
||||
<polyline points="60.0,385.7 112.0,390.0 164.0,390.0 216.0,183.8 268.0,179.7 320.0,183.8 372.0,114.7 424.0,155.6 476.0,155.6 528.0,67.4 580.0,67.4 632.0,67.4 684.0,61.6 736.0,61.6 788.0,61.6 840.0,60.0" fill="none" stroke="#a03030" stroke-width="2"/>
|
||||
<polyline points="60.0,121.1 103.3,76.2 146.7,76.2 190.0,76.2 233.3,67.8 276.7,67.8 320.0,67.8 363.3,60.0 406.7,60.0 450.0,60.0 493.3,60.0 536.7,60.0 580.0,60.0 623.3,60.0 666.7,60.0 710.0,60.0 753.3,60.0 796.7,60.0 840.0,60.0" fill="none" stroke="#2f6f4f" stroke-width="2"/>
|
||||
<polyline points="60.0,266.7 103.3,215.0 146.7,232.2 190.0,149.5 233.3,128.2 276.7,135.3 320.0,96.3 363.3,82.8 406.7,87.3 450.0,68.9 493.3,66.8 536.7,67.5 580.0,60.4 623.3,60.4 666.7,60.4 710.0,60.0 753.3,60.0 796.7,60.0 840.0,60.0" fill="none" stroke="#c08a2d" stroke-width="2"/>
|
||||
<polyline points="60.0,390.0 103.3,355.9 146.7,390.0 190.0,188.5 233.3,196.7 276.7,196.7 320.0,117.6 363.3,113.0 406.7,117.6 450.0,76.2 493.3,78.2 536.7,78.2 580.0,61.0 623.3,61.0 666.7,61.0 710.0,60.0 753.3,60.0 796.7,60.0 840.0,60.0" fill="none" stroke="#a03030" stroke-width="2"/>
|
||||
<line x1="680" y1="70" x2="704" y2="70" stroke="#2f6f4f" stroke-width="2"/>
|
||||
<text x="710" y="74" font-size="11" fill="#333">beste Loesung</text>
|
||||
<line x1="680" y1="88" x2="704" y2="88" stroke="#c08a2d" stroke-width="2"/>
|
||||
@@ -35,22 +35,25 @@
|
||||
<text x="52" y="519.0" text-anchor="end" font-size="11" fill="#666">60</text>
|
||||
<line x1="60" y1="440.0" x2="840" y2="440.0" stroke="#eee" stroke-width="1"/>
|
||||
<text x="52" y="444.0" text-anchor="end" font-size="11" fill="#666">120</text>
|
||||
<polyline points="60.0,540.0 112.0,490.0 164.0,440.0 216.0,547.5 268.0,505.0 320.0,462.5 372.0,555.0 424.0,520.0 476.0,485.0 528.0,561.2 580.0,532.5 632.0,503.8 684.0,566.2 736.0,542.5 788.0,518.8 840.0,570.0" fill="none" stroke="#4060a0" stroke-width="2"/>
|
||||
<polyline points="60.0,540.0 103.3,490.0 146.7,440.0 190.0,547.5 233.3,505.0 276.7,462.5 320.0,555.0 363.3,520.0 406.7,485.0 450.0,561.2 493.3,532.5 536.7,503.8 580.0,566.2 623.3,542.5 666.7,518.8 710.0,570.0 753.3,550.0 796.7,530.0 840.0,573.8" fill="none" stroke="#4060a0" stroke-width="2"/>
|
||||
<text x="60.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">e</text>
|
||||
<text x="112.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="164.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="216.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="268.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="320.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="372.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="424.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="476.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="528.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="580.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="632.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="684.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="736.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="788.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="103.3" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="146.7" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="190.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="233.3" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="276.7" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="320.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="363.3" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="406.7" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="450.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="493.3" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="536.7" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="580.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="623.3" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="666.7" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="710.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="753.3" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="796.7" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="840.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="450" y="638" text-anchor="middle" font-size="12" fill="#333">Zyklus-Aktion (Zeit)</text>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.4 KiB |
Reference in New Issue
Block a user