Minor refactoring (#2468)

frzyc · Sep 29, 2024 · 3a57092 · 3a57092
1 parent a1c49b9
commit 3a57092
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 36 deletions.
diff --git a/libs/gi/ui/src/context/OptTargetContext.tsx b/libs/gi/ui/src/context/OptTargetContext.tsx
@@ -1,7 +1,7 @@
 import type { MainSubStatKey } from '@genshin-optimizer/gi/consts'
 import { TeamCharacterContext, useOptConfig } from '@genshin-optimizer/gi/db-ui'
 import type { OptNode } from '@genshin-optimizer/gi/wr'
-import { precompute } from '@genshin-optimizer/gi/wr'
+import { forEachNodes } from '@genshin-optimizer/gi/wr'
 import type { ReactNode } from 'react'
 import { createContext, useContext, useMemo } from 'react'
 import { optimizeNodesForScaling } from '../util'
@@ -51,15 +51,9 @@ export function OptTargetWrapper({ children }: { children: ReactNode }) {
 
 function getScalesWith(nodes: OptNode[]) {
   const scalesWith = new Set<string>()
-  precompute(
+  forEachNodes(
     nodes,
-    {},
-    (f) => {
-      const val = f.path[1]
-      scalesWith.add(val)
-      return val
-    },
-    1
+    (node) => node.operation === 'read' && scalesWith.add(node.path[1])
   )
   return scalesWith as Set<MainSubStatKey>
 }
diff --git a/libs/gi/ui/src/util/optimizeNodesForScaling.ts b/libs/gi/ui/src/util/optimizeNodesForScaling.ts
@@ -6,13 +6,7 @@ import {
 } from '@genshin-optimizer/gi/consts'
 import type { OptConfig } from '@genshin-optimizer/gi/db'
 import type { NumNode } from '@genshin-optimizer/gi/wr'
-import {
-  constant,
-  dynamicData,
-  mapFormulas,
-  mergeData,
-  optimize,
-} from '@genshin-optimizer/gi/wr'
+import { dynamicData, mergeData, optimize } from '@genshin-optimizer/gi/wr'
 import type { TeamData } from '../type'
 import { statFilterToNumNode } from './statFilterToNumNode'
 export function optimizeNodesForScaling(
@@ -39,26 +33,11 @@ export function optimizeNodesForScaling(
     ...valueFilter.map((x) => x.value),
   ]
 
-  let nodes = optimize(
+  const nodes = optimize(
     unoptimizedNodes,
     workerData,
-    ({ path: [p] }) => p !== 'dyn'
-  )
-  // Const fold read nodes
-  nodes = mapFormulas(
-    nodes,
-    (f) => {
-      if (f.operation === 'read' && f.path[0] === 'dyn') {
-        // const a = artSets[f.path[1]]
-        // if (a) return constant(a)
-        const stat = f.path[1]
-        if (!allMainSubStatKeys.includes(stat as MainSubStatKey))
-          return constant(0)
-      }
-      return f
-    },
-    (f) => f
+    ({ path: [p, stat] }) =>
+      p !== 'dyn' || !allMainSubStatKeys.includes(stat as MainSubStatKey)
   )
-  nodes = optimize(nodes, {}, (_) => false)
   return { nodes, valueFilter }
 }
diff --git a/libs/gi/wr/src/internal.ts b/libs/gi/wr/src/internal.ts
@@ -27,7 +27,7 @@ export function deepNodeClone<
 export function forEachNodes<T extends Base<T> = AnyNode>(
   formulas: T[],
   topDown: (formula: T) => void,
-  bottomUp: (formula: T) => void
+  bottomUp: (formula: T) => void = () => {}
 ): void {
   const visiting = new Set<T>(),
     visited = new Set<T>()

diff --git a/libs/gi/wr/src/optimization.ts b/libs/gi/wr/src/optimization.ts
@@ -308,7 +308,7 @@ function deduplicate(formulas: OptNode[]): OptNode[] {
 
 /**
  * Replace nodes with known values with appropriate constants,
- * avoiding removal of any nodes that pass `isFixed` predicate
+ * and remove read nodes where `shouldFold(node)` is `true`
  */
 export function constantFold(
   formulas: NumNode[],