Bläddra i källkod

plan: switch to sum_traded_7d / 7

raylu 1 vecka sedan
förälder
incheckning
2704b6bf81
1 ändrade filer med 5 tillägg och 7 borttagningar
  1. 5 7
      ts/plan.ts

+ 5 - 7
ts/plan.ts

@@ -65,7 +65,7 @@ async function _render(shareUUID: string, cx: string) {
 	const buildingExpertise = new Map<string, Expertise>(buildings.map(b => [b.building_ticker, b.expertise]));
 	const recipes = new Map<string, Recipe>(recipeList.map(r => [r.recipe_id, r]));
 	const dailyTraded = new Map<string, number>(exchanges.filter((ex) => ex.exchange_code === cx)
-			.map((ex) => [ex.ticker, ex.avg_traded_7d]));
+			.map((ex) => [ex.ticker, ex.sum_traded_7d / 7]));
 
 	const planInput = new Counter();
 	const planOutput = new Counter();
@@ -89,13 +89,10 @@ async function _render(shareUUID: string, cx: string) {
 				<th>out</th>
 				<th>net</th>
 				<th>daily traded</th>
+				<th>% of traded</th>
 			</tr>
 			${[...net.entries()].map(([mat, netAmount]) => {
 				const traded = dailyTraded.get(mat)!;
-				let tradedDisplay = wholeFmt.format(traded) + ' ';
-				if (netAmount > 0)
-					tradedDisplay += '&nbsp;';
-				tradedDisplay += pctFmt.format(netAmount / traded);
 				const colorPct = Math.min(Math.abs(netAmount) / traded * 500, 100);
 				const color = `color-mix(in xyz, #f80 ${colorPct}%, #0aa)`;
 				return `<tr>
@@ -103,7 +100,8 @@ async function _render(shareUUID: string, cx: string) {
 					<td>${formatNumber(planInput.get(mat))}</td>
 					<td>${formatNumber(planOutput.get(mat))}</td>
 					<td>${formatNumber(netAmount)}</td>
-					<td style="color: ${color}">${tradedDisplay}</td>
+					<td>${wholeFmt.format(traded)}</td>
+					<td style="color: ${color}">${pctFmt.format(netAmount / traded)}</td>
 				</tr>`;
 			}).join('')}
 		</table>
@@ -202,7 +200,7 @@ interface Recipe {
 interface Exchange {
 	ticker: string
 	exchange_code: string
-	avg_traded_7d: number
+	sum_traded_7d: number // avg_traded_7d is nonsense
 }
 
 interface Planet {