improve picker algo

mendrik · Mar 23, 2024 · b51644d · b51644d
1 parent 53d2d30
commit b51644d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 22 deletions.
diff --git a/docs/assets/find-solution-9b735a6f.js b/docs/assets/find-solution-9b735a6f.js
diff --git a/docs/assets/find-solution-e3cff708.js b/docs/assets/find-solution-e3cff708.js
diff --git a/docs/assets/index-c42d2bc7.js → docs/assets/index-2c0ea7f0.js b/docs/assets/index-c42d2bc7.js → docs/assets/index-2c0ea7f0.js
diff --git a/docs/index.html b/docs/index.html
@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <script type="module" crossorigin src="/diorama-2023/assets/index-c42d2bc7.js"></script>
+  <script type="module" crossorigin src="/diorama-2023/assets/index-2c0ea7f0.js"></script>
   <link rel="stylesheet" href="/diorama-2023/assets/index-208a7c4c.css">
 </head>
 <body>

diff --git a/src/constants.ts b/src/constants.ts
@@ -7,7 +7,6 @@ export const maxComputationTime = 500 as Milliseconds
 export const randomizeThreshold = 11 // if amount of pics is bigger we have too many permutations to iterate through, switch to random strategy
 export const iconSize = 20
 export const initialImageAmount = 7
-export const aspectRatioThreshold = 0.82
 
 export const aspectRatioAndSize = ({ pictures, sizeHomogeneity, score }: Solution): Ord => {
   return pictures.length <= 4 ? score : score * sizeHomogeneity

diff --git a/src/layout/evaluate-solutions.ts b/src/layout/evaluate-solutions.ts
@@ -2,16 +2,10 @@
 import '../types/ramda'
 
 import type { PositionedPicture, NonEmptyArray, Solution } from '../types/types'
-import { evolve, last, pipe, prop, reject, sortBy } from 'ramda'
-import { aspectRatioAndSize, aspectRatioThreshold } from '../constants'
+import { evolve, last, pipe, prop, sortBy, takeLast } from 'ramda'
+import { aspectRatioAndSize } from '../constants'
 
 export const evaluateSolutions = (results: NonEmptyArray<Solution>): Solution => {
-  const withOutGaps = reject<Solution>(({ score }) => score < aspectRatioThreshold)(results)
-
-  const winner = pipe(
-    sortBy(aspectRatioAndSize) as any,
-    last
-  )(withOutGaps.length > 0 ? withOutGaps : results) as Solution
-
-  return evolve({ pictures: sortBy<PositionedPicture>(prop('url')) }, winner)
+  const sorted = pipe(sortBy(aspectRatioAndSize), takeLast(10), sortBy(prop('score')))(results)
+  return evolve({ pictures: sortBy<PositionedPicture>(prop('url')) }, last(sorted) as Solution)
 }
diff --git a/src/ui/diorama.tsx b/src/ui/diorama.tsx
@@ -10,10 +10,14 @@ type OwnProps = {
   images: Picture[]
 }
 
-
 const scale = (value: Solution, dimension: Dimension, p: 'width' | 'height'): number =>
   prop(p, dimension) / prop(p, value.dimension)
 
+declare global {
+  interface Window {
+    solution: Solution
+  }
+}
 export const Diorama = ({ images: initialImages }: OwnProps): JSX.Element => {
   const [ref, dimension] = useParentResize<HTMLOListElement>()
   const images = useImageList(initialImages)
@@ -22,13 +26,13 @@ export const Diorama = ({ images: initialImages }: OwnProps): JSX.Element => {
   const renderedList = useMemo(
     () => (
       <ol ref={ref} className="diorama-list">
-        {value?.pictures.map((pic, idx) => (
+        {(window.solution ?? value)?.pictures.map((pic, idx) => (
           <PictureListItem
             picture={pic}
             idx={idx}
             key={pic.url}
-            scaleX={scale(value, dimension, 'width')}
-            scaleY={scale(value, dimension, 'height')}
+            scaleX={scale(window.solution ?? value, dimension, 'width')}
+            scaleY={scale(window.solution ?? value, dimension, 'height')}
           />
         ))}
       </ol>