グカネータ改良 (#371) (#375)

Reviewed-on: #375
Co-authored-by: miteruzo <miteruzo@naver.com>
Co-committed-by: miteruzo <miteruzo@naver.com>

frontend/src/lib/gekanatorCandidateRecovery.ts

@@ -1,33 +1,33 @@
 import { expectedAnswerForQuestion } from '@/lib/gekanator'
 
-import type {
-    GekanatorAnswerLog,
-    GekanatorAnswerValue,
-    GekanatorQuestion,
-} from '@/lib/gekanator'
+import type { GekanatorAnswerLog, GekanatorAnswerValue, GekanatorQuestion } from '@/lib/gekanator'
 import type { Post } from '@/types'
 
-
 export type RecoveredCandidatePost = {
     postId:                number
     answerCountAtRecovery: number }
 
 
-export const candidatePostsFor = ({
-    posts,
-    questions,
-    answers,
-    softenedQuestionIds,
-    rejectedPostIds,
-    recoveredCandidatePosts,
-}: {
-    posts:                   Post[]
-    questions:               GekanatorQuestion[]
-    answers:                 GekanatorAnswerLog[]
-    softenedQuestionIds:     Set<string>
-    rejectedPostIds:         Set<number>
-    recoveredCandidatePosts: Map<number, number>
-}): Post[] => {
+const questionIsFactLikeForHardFiltering = (question:  GekanatorQuestion): boolean =>
+    !(question.kind === 'post_similarity'
+      || (question.kind === 'tag'
+	  && question.condition.type === 'tag'
+	  && !(question.condition.key.startsWith ('nico:'))))
+
+
+export const candidatePostsFor = (
+    { posts,
+      questions,
+      answers,
+      softenedQuestionIds,
+      rejectedPostIds,
+      recoveredCandidatePosts }: { posts:                   Post[]
+				   questions:               GekanatorQuestion[]
+				   answers:                 GekanatorAnswerLog[]
+				   softenedQuestionIds:     Set<string>
+				   rejectedPostIds:         Set<number>
+				   recoveredCandidatePosts: Map<number, number> },
+): Post[] => {
   const questionById = new Map (questions.map (question => [question.id, question]))
 
   return posts.filter (post => {
@@ -37,7 +37,7 @@ export const candidatePostsFor = ({
     const answerCountAtRecovery = recoveredCandidatePosts.get (post.id)
 
     return answers.every ((answer, index) => {
-      if (answerCountAtRecovery !== undefined && index < answerCountAtRecovery)
+      if (answerCountAtRecovery != null && index < answerCountAtRecovery)
 	return true
 
       if (softenedQuestionIds.has (answer.questionId))
@@ -46,14 +46,17 @@ export const candidatePostsFor = ({
       const question = questionById.get (answer.questionId)
       if (!(question))
 	return true
+      if (!(questionIsFactLikeForHardFiltering (question)))
+	return true
 
       switch (answer.answer)
       {
       case 'yes':
-      case 'no': {
-	const expected = expectedAnswerForQuestion (question, post)
-	return expected === null || expected === 'unknown' || expected === answer.answer
-      }
+      case 'no':
+	{
+	  const expected = expectedAnswerForQuestion (question, post)
+	  return expected === null || expected === 'unknown' || expected === answer.answer
+	}
       default:
 	return true
       }
@@ -62,30 +65,25 @@ export const candidatePostsFor = ({
 }
 
 
-export const hardFilteredPostsForAnswer = ({
-    posts,
-    question,
-    answer,
-}: {
-    posts:     Post[]
-    question:  GekanatorQuestion
-    answer:    GekanatorAnswerValue
-}): Post[] => {
-  if (answer === 'unknown')
+export const hardFilteredPostsForAnswer = (
+    { posts, question, answer }: { posts:     Post[]
+				   question:  GekanatorQuestion
+				   answer:    GekanatorAnswerValue },
+): Post[] => {
+  if (!(questionIsFactLikeForHardFiltering (question)))
+    return posts
+
+  if (!(answer === 'yes' || answer === 'no'))
     return posts
 
   return posts.filter (post => {
     const expected = expectedAnswerForQuestion (question, post)
-    return expected === null || expected === 'unknown' || expected === answer
+    return expected == null || expected === 'unknown' || expected === answer
   })
 }
 
 
-const concreteAnswerOptions: GekanatorAnswerValue[] = [
-    'yes',
-    'no',
-    'partial',
-    'probably_no']
+const concreteAnswerOptions: GekanatorAnswerValue[] = ['yes', 'no', 'partial', 'probably_no']
 
 
 export const allConcreteAnswerOptionsExhausted = (
@@ -104,45 +102,39 @@ const nextRecoveryTargetSize = (recoveryStepCount: number): number =>
     6 * (2 ** recoveryStepCount)
 
 
-export const recoverCandidatePosts = ({
-    posts,
-    scores,
-    rejectedPostIds,
-    recoveredCandidatePosts,
-    eligiblePostIds,
-    answerCountAtRecovery,
-    recoveryStepCount,
-}: {
-    posts:                   Post[]
-    scores:                  Map<number, number>
-    rejectedPostIds:         Set<number>
-    recoveredCandidatePosts: Map<number, number>
-    eligiblePostIds:         Set<number>
-    answerCountAtRecovery:   number
-    recoveryStepCount:       number
-}): {
-    recoveredCandidatePosts: Map<number, number>
-    recoveryStepCount:       number
-} | null => {
+export const recoverCandidatePosts = (
+    { posts,
+      scores,
+      rejectedPostIds,
+      recoveredCandidatePosts,
+      eligiblePostIds,
+      answerCountAtRecovery,
+      recoveryStepCount }: { posts:                   Post[]
+			     scores:                  Map<number, number>
+			     rejectedPostIds:         Set<number>
+			     recoveredCandidatePosts: Map<number, number>
+			     eligiblePostIds:         Set<number>
+			     answerCountAtRecovery:   number
+			     recoveryStepCount:       number },
+): { recoveredCandidatePosts: Map<number, number>
+     recoveryStepCount:       number } | null => {
   const recovered = new Map (recoveredCandidatePosts)
   const targetSize = nextRecoveryTargetSize (recoveryStepCount)
-  const countedPostIds = new Set ([
-      ...eligiblePostIds,
-      ...recovered.keys ()])
+  const countedPostIds = new Set ([...eligiblePostIds, ...recovered.keys ()])
   const addCount = targetSize - countedPostIds.size
   if (addCount <= 0)
-    return {
-	recoveredCandidatePosts: recovered,
-	recoveryStepCount: recoveryStepCount + 1 }
+    {
+      return { recoveredCandidatePosts: recovered,
+	       recoveryStepCount: recoveryStepCount + 1 }
+    }
 
-  const candidates = posts
-      .filter (post =>
-	  !(rejectedPostIds.has (post.id))
-	  && !(eligiblePostIds.has (post.id))
-	  && !(recovered.has (post.id)))
-      .sort ((a, b) =>
-	  (scores.get (b.id) ?? Number.NEGATIVE_INFINITY)
-	      - (scores.get (a.id) ?? Number.NEGATIVE_INFINITY))
+  const candidates =
+      posts
+      .filter (post => (!(rejectedPostIds.has (post.id))
+			&& !(eligiblePostIds.has (post.id))
+			&& !(recovered.has (post.id))))
+      .sort ((a, b) => ((scores.get (b.id) ?? Number.NEGATIVE_INFINITY)
+			- (scores.get (a.id) ?? Number.NEGATIVE_INFINITY)))
       .slice (0, addCount)
 
   if (candidates.length === 0)
@@ -150,7 +142,6 @@ export const recoverCandidatePosts = ({
 
   candidates.forEach (post => recovered.set (post.id, answerCountAtRecovery))
 
-  return {
-      recoveredCandidatePosts: recovered,
-      recoveryStepCount: recoveryStepCount + 1 }
+  return { recoveredCandidatePosts: recovered,
+	   recoveryStepCount: recoveryStepCount + 1 }
 }