mirror of
https://github.com/calli-eve/eve-pi.git
synced 2026-02-11 18:28:49 +01:00
fix hourly averages
This commit is contained in:
@@ -12,6 +12,7 @@ import { EvePraisalResult } from "@/eve-praisal";
|
||||
import { STORAGE_IDS, PI_SCHEMATICS, PI_PRODUCT_VOLUMES, STORAGE_CAPACITIES } from "@/const";
|
||||
import { DateTime } from "luxon";
|
||||
import { PlanetCalculations, AlertState, StorageContent, StorageInfo } from "@/types/planet";
|
||||
import { getProgramOutputPrediction } from "../PlanetaryInteraction/ExtractionSimulation";
|
||||
|
||||
interface AccountTotals {
|
||||
monthlyEstimate: number;
|
||||
@@ -49,18 +50,27 @@ const calculatePlanetDetails = (planet: PlanetWithInfo, piPrices: EvePraisalResu
|
||||
]));
|
||||
|
||||
// Calculate extractor averages and check for large differences
|
||||
const CYCLE_TIME = 30 * 60; // 30 minutes in seconds
|
||||
const extractorAverages = extractors
|
||||
.filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
|
||||
.map(e => {
|
||||
const cycleTime = e.extractor_details?.cycle_time || 3600;
|
||||
const installDate = new Date(e.install_time ?? "");
|
||||
const expiryDate = new Date(e.expiry_time ?? "");
|
||||
const programDuration = (expiryDate.getTime() - installDate.getTime()) / 1000;
|
||||
const cycles = Math.floor(programDuration / CYCLE_TIME);
|
||||
|
||||
const qtyPerCycle = e.extractor_details?.qty_per_cycle || 0;
|
||||
const prediction = getProgramOutputPrediction(qtyPerCycle, CYCLE_TIME, cycles);
|
||||
const totalOutput = prediction.reduce((sum, val) => sum + val, 0);
|
||||
const averagePerHour = totalOutput / cycles * 2;
|
||||
|
||||
return {
|
||||
typeId: e.extractor_details!.product_type_id!,
|
||||
averagePerHour: (qtyPerCycle * 3600) / cycleTime
|
||||
averagePerHour
|
||||
};
|
||||
});
|
||||
|
||||
const hasLargeExtractorDifference = extractorAverages.length === 2 &&
|
||||
const hasLargeExtractorDifference = extractorAverages.length === 2 &&
|
||||
Math.abs(extractorAverages[0].averagePerHour - extractorAverages[1].averagePerHour) > balanceThreshold;
|
||||
|
||||
// Calculate storage info
|
||||
|
||||
@@ -159,7 +159,7 @@ export const ExtractionSimulationTooltip: React.FC<ExtractionSimulationTooltipPr
|
||||
• Program Cycles: {cycles}
|
||||
</Typography>
|
||||
<Typography variant="body2">
|
||||
• Average per Cycle: {(totalOutput / cycles).toFixed(1)} units
|
||||
• Average per Cycle: {(totalOutput / (cycles)).toFixed(1)} units
|
||||
</Typography>
|
||||
<Typography
|
||||
variant="body2"
|
||||
@@ -169,7 +169,7 @@ export const ExtractionSimulationTooltip: React.FC<ExtractionSimulationTooltipPr
|
||||
: 'inherit'
|
||||
}
|
||||
>
|
||||
• Average per hour: {((extractors[idx].baseValue * 3600) / extractors[idx].cycleTime).toFixed(1)} units
|
||||
• Average per hour: {(totalOutput / cycles * 2).toFixed(1)} units
|
||||
</Typography>
|
||||
<Typography variant="body2">
|
||||
• Expires in: <Countdown overtime={true} date={DateTime.fromISO(expiryTime).toMillis()} />
|
||||
@@ -185,17 +185,24 @@ export const ExtractionSimulationTooltip: React.FC<ExtractionSimulationTooltipPr
|
||||
</Typography>
|
||||
<Stack spacing={0.5}>
|
||||
{extractors.map((extractor, index) => {
|
||||
const averagePerHour = (extractor.baseValue * 3600) / extractor.cycleTime;
|
||||
const prediction = getProgramOutputPrediction(
|
||||
extractor.baseValue,
|
||||
CYCLE_TIME,
|
||||
extractorPrograms[index].cycles
|
||||
);
|
||||
const totalOutput = prediction.reduce((sum, val) => sum + val, 0);
|
||||
const cycles = extractorPrograms[index].cycles;
|
||||
const averagePerHour = totalOutput / cycles * 2;
|
||||
return (
|
||||
<Typography key={index} variant="body2">
|
||||
• {PI_TYPES_MAP[extractor.typeId]?.name}: {averagePerHour.toFixed(1)} u/h
|
||||
</Typography>
|
||||
);
|
||||
})}
|
||||
<Typography
|
||||
variant="body2"
|
||||
<Typography
|
||||
variant="body2"
|
||||
color="error"
|
||||
sx={{
|
||||
sx={{
|
||||
mt: 1,
|
||||
fontWeight: 'bold',
|
||||
borderTop: '1px solid',
|
||||
@@ -203,10 +210,27 @@ export const ExtractionSimulationTooltip: React.FC<ExtractionSimulationTooltipPr
|
||||
pt: 1
|
||||
}}
|
||||
>
|
||||
Difference: {Math.abs(
|
||||
(extractors[0].baseValue * 3600 / extractors[0].cycleTime) -
|
||||
(extractors[1].baseValue * 3600 / extractors[1].cycleTime)
|
||||
).toFixed(1)} u/h
|
||||
Difference: {(() => {
|
||||
const prediction0 = getProgramOutputPrediction(
|
||||
extractors[0].baseValue,
|
||||
CYCLE_TIME,
|
||||
extractorPrograms[0].cycles
|
||||
);
|
||||
const totalOutput0 = prediction0.reduce((sum, val) => sum + val, 0);
|
||||
const cycles0 = extractorPrograms[0].cycles;
|
||||
const avg0 = totalOutput0 / cycles0 * 2;
|
||||
|
||||
const prediction1 = getProgramOutputPrediction(
|
||||
extractors[1].baseValue,
|
||||
CYCLE_TIME,
|
||||
extractorPrograms[1].cycles
|
||||
);
|
||||
const totalOutput1 = prediction1.reduce((sum, val) => sum + val, 0);
|
||||
const cycles1 = extractorPrograms[1].cycles;
|
||||
const avg1 = totalOutput1 / cycles1 * 2;
|
||||
|
||||
return Math.abs(avg0 - avg1).toFixed(1);
|
||||
})()} u/h
|
||||
</Typography>
|
||||
</Stack>
|
||||
</Paper>
|
||||
|
||||
Reference in New Issue
Block a user