Merge pull request #187 from yssk22/develop

[expo] remove topological sort

expo/features/hpsort/HPSortNewScreen.tsx

@@ -1,25 +1,21 @@
 import { WithSafeArea } from '@hpapp/features/common';
 import { defineScreen, useScreenTitle } from '@hpapp/features/common/stack';
 import { t } from '@hpapp/system/i18n';
-import { useState } from 'react';
 
-import HPSortNewConfigForm from './internals/new/HPSortNewConfigForm';
 import HPSortNewRoundContainer from './internals/new/HPSortNewRoundContainer';
-import { HPSortNewConfig } from './internals/new/types';
 
 export type HPSortNewSceenProps = object;
 
 export default defineScreen('/hpsort/new/', function HPSortNewSceen() {
   useScreenTitle(t('New Sort'));
-  const [config, setConfig] = useState<HPSortNewConfig | null>(null);
 
   return (
     <WithSafeArea>
-      {config === null ? (
-        <HPSortNewConfigForm onSelect={(config) => setConfig(config)} />
-      ) : (
-        <HPSortNewRoundContainer config={config} />
-      )}
+      <HPSortNewRoundContainer
+        config={{
+          numMembersToSelect: 2
+        }}
+      />
     </WithSafeArea>
   );
 });

expo/features/hpsort/internals/new/HPSortNewRoundContainer.tsx

@@ -13,7 +13,6 @@ import HPSortNewRoundMemberSelector from './HPSortNewRoundMemberSelector';
 import { HPSortMemberNode, HPSortNewConfig, HPSortNewRoundState } from './types';
 import HPSortBase from '../sort/HPSortBase';
 import HPSortClassicMergeSort from '../sort/HPSortClassicMergeSort';
-import HPSortTopologicalSort from '../sort/HPSortTopologicalSort';
 
 export type HPSortNewRoundContainerProps = {
   config: HPSortNewConfig;
@@ -30,11 +29,7 @@ export default function HPSortNewRoundContainer({ config }: HPSortNewRoundContai
     });
     return object.shuffle([...members]).map((m) => new HPSortMemberNode(m));
   }, [members]);
-  const [sorter, setSorter] = useState<HPSortBase<HPSortMemberNode>>(
-    config.numMembersToSelect === 2
-      ? new HPSortClassicMergeSort(list)
-      : new HPSortTopologicalSort(list, config.numMembersToSelect, true)
-  );
+  const [sorter, setSorter] = useState<HPSortBase<HPSortMemberNode>>(new HPSortClassicMergeSort(list));
   const comparable = sorter.getComparable();
   const [stats, setStats] = useState<HPSortNewRoundState>({
     numCompared: 0,
@@ -50,11 +45,7 @@ export default function HPSortNewRoundContainer({ config }: HPSortNewRoundContai
             logEvent('hpsort_retry', {
               num_members_to_select: config.numMembersToSelect
             });
-            setSorter(
-              config.numMembersToSelect === 2
-                ? new HPSortClassicMergeSort(list)
-                : new HPSortTopologicalSort(list, config.numMembersToSelect)
-            );
+            setSorter(new HPSortClassicMergeSort(list));
             setStats({
               numCompared: 0,
               startTime: new Date(),