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:
Michael Stangl
@@ -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">-177</text>
|
||||
<text x="52" y="394.0" text-anchor="end" font-size="11" fill="#666">-164</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">-152</text>
|
||||
<text x="52" y="328.0" text-anchor="end" font-size="11" fill="#666">-147</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">-127</text>
|
||||
<text x="52" y="262.0" text-anchor="end" font-size="11" fill="#666">-130</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">-101</text>
|
||||
<text x="52" y="196.0" text-anchor="end" font-size="11" fill="#666">-113</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">-76</text>
|
||||
<text x="52" y="130.0" text-anchor="end" font-size="11" fill="#666">-96</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">-51</text>
|
||||
<text x="52" y="64.0" text-anchor="end" font-size="11" fill="#666">-79</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,63.4 125.0,60.0 190.0,60.0 255.0,60.0 320.0,60.0 385.0,60.0 450.0,60.0 515.0,60.0 580.0,60.0 645.0,60.0 710.0,60.0 775.0,60.0 840.0,60.0" fill="none" stroke="#2f6f4f" stroke-width="2"/>
|
||||
<polyline points="60.0,116.9 125.0,91.1 190.0,99.7 255.0,71.2 320.0,70.6 385.0,70.8 450.0,65.5 515.0,65.5 580.0,65.5 645.0,62.1 710.0,62.1 775.0,62.1 840.0,60.0" fill="none" stroke="#c08a2d" stroke-width="2"/>
|
||||
<polyline points="60.0,390.0 125.0,294.8 190.0,390.0 255.0,80.1 320.0,80.1 385.0,80.1 450.0,68.7 515.0,68.7 580.0,68.7 645.0,63.4 710.0,63.4 775.0,63.4 840.0,60.0" fill="none" stroke="#a03030" stroke-width="2"/>
|
||||
<polyline points="60.0,60.0 146.7,60.0 233.3,60.0 320.0,60.0 406.7,60.0 493.3,60.0 580.0,60.0 666.7,60.0 753.3,60.0 840.0,60.0" fill="none" stroke="#2f6f4f" stroke-width="2"/>
|
||||
<polyline points="60.0,140.1 146.7,114.3 233.3,122.9 320.0,78.3 406.7,77.9 493.3,78.1 580.0,68.5 666.7,68.5 753.3,68.5 840.0,60.0" fill="none" stroke="#c08a2d" stroke-width="2"/>
|
||||
<polyline points="60.0,360.3 146.7,390.0 233.3,390.0 320.0,83.1 406.7,83.1 493.3,83.1 580.0,79.3 666.7,79.3 753.3,79.3 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,19 +35,16 @@
|
||||
<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 125.0,490.0 190.0,440.0 255.0,547.5 320.0,505.0 385.0,462.5 450.0,555.0 515.0,520.0 580.0,485.0 645.0,561.2 710.0,532.5 775.0,503.8 840.0,566.2" fill="none" stroke="#4060a0" stroke-width="2"/>
|
||||
<polyline points="60.0,540.0 146.7,490.0 233.3,440.0 320.0,547.5 406.7,505.0 493.3,462.5 580.0,555.0 666.7,520.0 753.3,485.0 840.0,561.2" 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="125.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="190.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="255.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="320.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="385.0" 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="515.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="580.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="645.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">s</text>
|
||||
<text x="710.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="775.0" y="606.0" text-anchor="middle" font-size="10" fill="#999">j</text>
|
||||
<text x="146.7" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="233.3" 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="406.7" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="493.3" 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="666.7" y="606.0" text-anchor="middle" font-size="10" fill="#999">m</text>
|
||||
<text x="753.3" 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: 4.7 KiB After Width: | Height: | Size: 4.3 KiB |
Reference in New Issue
Block a user