Spythere/pojazdownik
1
0
Fork 0
mirror of https://github.com/Spythere/pojazdownik.git synced 2026-05-03 19:48:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: efektywniejsze generowanie składu

Browse Source
This commit is contained in:
Spythere
2023-06-11 17:12:42 +02:00
parent 89ceb6ae7f
commit 1fa3d4c3a1
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/tabs/StockGeneratorTab.vue
+29 -16
View File
@@ -99,7 +99,7 @@ import { defineComponent } from 'vue';
import { useStore } from '../../store'; import { useStore } from '../../store';
import stockMixin from '../../mixins/stockMixin'; import stockMixin from '../../mixins/stockMixin';
import { ICargo, ICarWagon } from '../../types'; import { ICargo, ICarWagon, IStock } from '../../types';
import warningsMixin from '../../mixins/warningsMixin'; import warningsMixin from '../../mixins/warningsMixin';
export default defineComponent({ export default defineComponent({
@@ -180,29 +180,42 @@ export default defineComponent({
return acc; return acc;
}, [] as { constructionType: string; carPool: { carWagon: ICarWagon; cargo?: ICargo }[] }[]); }, [] as { constructionType: string; carPool: { carWagon: ICarWagon; cargo?: ICargo }[] }[]);
const headingLoco = this.store.stockList[0]?.isLoco ? this.store.stockList[0] : undefined; let bestGeneration: { stockList: IStock[]; value: number } = { stockList: [], value: 0 };
this.store.stockList.length = headingLoco ? 1 : 0; for (let i = 0; i < 10; i++) {
const maxMass = Math.min(this.store.acceptableMass, this.maxMass); const headingLoco = this.store.stockList[0]?.isLoco ? this.store.stockList[0] : undefined;
this.store.stockList.length = headingLoco ? 1 : 0;
let exceeded = false; const maxMass =
this.store.acceptableMass > 0 ? Math.min(this.store.acceptableMass, this.maxMass) : this.maxMass;
while (!exceeded) { let exceeded = false;
const randomStockType = generatedChosenStockList[~~(Math.random() * generatedChosenStockList.length)];
const { carWagon, cargo } = randomStockType.carPool[~~(Math.random() * randomStockType.carPool.length)];
if ( while (!exceeded) {
this.store.totalMass + (cargo?.totalMass || carWagon.mass) > maxMass || const randomStockType = generatedChosenStockList[~~(Math.random() * generatedChosenStockList.length)];
this.store.totalLength + carWagon.length > this.maxLength || const { carWagon, cargo } = randomStockType.carPool[~~(Math.random() * randomStockType.carPool.length)];
this.store.stockList.length > this.maxCarCount
) { if (
exceeded = true; this.store.totalMass + (cargo?.totalMass || carWagon.mass) > maxMass ||
break; this.store.totalLength + carWagon.length > this.maxLength ||
this.store.stockList.length > this.maxCarCount
) {
exceeded = true;
break;
}
this.addCarWagon(carWagon, cargo);
} }
this.addCarWagon(carWagon, cargo); const currentGenerationValue = this.store.totalLength + this.store.totalMass + this.store.stockList.length;
if (bestGeneration.value < currentGenerationValue) {
bestGeneration.stockList = this.store.stockList;
bestGeneration.value = currentGenerationValue;
}
} }
this.store.stockList = bestGeneration.stockList;
this.store.stockSectionMode = 'stock-list'; this.store.stockSectionMode = 'stock-list';
}, },