refactor

Author: S-N-O-R-L-A-X

.gitignore

@@ -22,3 +22,6 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+# todo
+todo.md

src/Components/ShowAllBoards/ShowAllBoards.tsx

@@ -9,7 +9,6 @@ interface ShowAllBoardsProps extends PropsWithChildren {
 }
 
 export default function ShowAllBoards(props: ShowAllBoardsProps) {
-
   return (
     <ShowResultsContext.Consumer>
       {

src/Components/ShowCards/ShowCards.tsx

@@ -25,7 +25,7 @@ export default function ShowCards(props: ShowCardsProps) {
       <div className="predicted">{children}</div>
       {dds &&
         <div className="double-dummy">
-          <Suspense fallback={<div>Loading...</div>}> <OfflineBridgeSolver allHands={allHands} /> </Suspense>
+          <Suspense fallback={<div>Loading...</div>}> <OfflineBridgeSolver board={board} /> </Suspense>
         </div>
       }
 

src/Utils/utils.ts

@@ -1,5 +1,5 @@
+import Board from "../models/Board";
 import Card from "../models/Card";
-import Hand from "../models/Hand";
 import { COLORS, NUMBER2COLORSHORT, RANK2CARD } from "./maps";
 import { convertAllHandsToPBN } from "./PBN";
 
@@ -12,9 +12,9 @@ export function card2idx(card: Card): number {
   return Card.RANK[card.rank] + 13 * (NUMBER2COLORSHORT[card.suit]);
 }
 
-export function analyzeOffline(allHands: Hand[]) {
+export function analyzeOffline(board: Board): Promise<(string | number)[][]> {
   // @ts-ignore
-  const res = calcDDTable(convertAllHandsToPBN(allHands));
+  const res = calcDDTable(convertAllHandsToPBN(board.getAllHands()));
   const table = new Array(4).fill(0).map(() => new Array(5).fill("*"));
   table[0][0] = res["N"]["N"];
   table[0][1] = res["S"]["N"];

src/models/Board.ts

@@ -26,7 +26,7 @@ export default class Board {
   Shand: Hand;
   Ehand: Hand;
   Whand: Hand;
-  ddsTricks?: string | (string | number)[][];
+  ddsTricks?: (string | number)[][];
   pbn?: string;
 
   constructor(boardnum: number) {

src/views/Analysis/Analysis.tsx

@@ -36,9 +36,9 @@ function Analysis() {
     async function countTricks() {
       for (const board of all_boards) {
         if (!board.ddsTricks) {
-          board.ddsTricks = await analyzeOffline(board.getAllHands());
+          board.ddsTricks = await analyzeOffline(board);
         }
-        tmp = MatrixAdd(tmp, board.ddsTricks as (string | number)[][]);
+        tmp = MatrixAdd(tmp, board.ddsTricks);
       }
       return Promise.resolve(tmp);
     }

src/views/Analysis/OfflineBridgeSolver.tsx

@@ -1,21 +1,24 @@
 import { useEffect, useState } from "react";
 import ShowTricks from "../../Components/PlayBoard/ShowTricks";
-import Hand from "../../models/Hand";
 import { analyzeOffline } from "../../Utils/utils";
+import Board from "../../models/Board";
 
 interface BridgeSolverProps {
-	allHands?: Hand[];
+	board: Board;
 }
 
 export default function OfflineBridgeSolver(props: BridgeSolverProps) {
-	const { allHands = [] } = props;
+	const { board } = props;
 	const [ddtricks, setDDtricks] = useState<(string | number)[][]>();
 
 	useEffect(() => {
-		analyzeOffline(allHands).then((res) => {
-			setDDtricks(res);
-		})
-	}, [allHands]);
+		if (!board.ddsTricks) {
+			analyzeOffline(board).then((res) => {
+				board.ddsTricks = res;
+			})
+		}
+		setDDtricks(board.ddsTricks);
+	}, [board]);
 
 	return (
 		<ShowTricks ddtricks={ddtricks} />