feat: optimize problem generation and add duplicate warning system
Problem Generation Improvements: - Implement hybrid approach: generate-all + shuffle for small problem spaces (< 10k), retry-based for large spaces - Add countRegroupingOperations() for accurate difficulty sorting - Support progressive difficulty in generate-all mode by sorting problems before sampling - Fix problem space estimation for 1-digit problems (was 6075, now correctly returns 45 for 100% regrouping) Duplicate Warning System: - Add validateProblemSpace() utility to estimate unique problems and warn users - Create dismissable warning banner with visual styling (yellow bg, 15px rounded corners, drop shadow) - Position warning banner as floating element alongside page indicator and action button - Auto-reset dismissed state when worksheet config changes - Skip validation for complex mastery+mixed mode Component Refactoring: - Extract WorksheetPreviewContext for shared state (warnings, theme, form state) - Extract DuplicateWarningBanner component with context integration - Move floating elements (warning banner, page indicator) to PreviewCenter for correct positioning - Fix scroll container structure: preview-center is positioned container, nested div handles scrolling - Export page data from WorksheetPreview via onPageDataReady callback Technical Details: - FloatingPageIndicator changed from position: sticky to position: absolute - Warning banner positioned at top: 24px, right: 20px to avoid action button overlap - Remove maxW constraint on scroll container to allow full width flex - Server logs now show: "0 retries, generate-all method" for small problem spaces 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Thomas Hallock
parent
0b8c1803ff
commit
11c46c1b44
|
|
@ -55,13 +55,12 @@
|
|||
"Bash(sqlite3:*)",
|
||||
"Bash(npm run format:check:*)",
|
||||
"Bash(npx biome:*)",
|
||||
"Bash(git restore:*)"
|
||||
"Bash(git restore:*)",
|
||||
"Bash(mcp__sqlite__describe_table:*)"
|
||||
],
|
||||
"deny": [],
|
||||
"ask": []
|
||||
},
|
||||
"enableAllProjectMcpServers": true,
|
||||
"enabledMcpjsonServers": [
|
||||
"sqlite"
|
||||
]
|
||||
"enabledMcpjsonServers": ["sqlite"]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ export async function POST(request: NextRequest) {
|
|||
totalPages: result.totalPages,
|
||||
startPage: result.startPage,
|
||||
endPage: result.endPage,
|
||||
warnings: result.warnings,
|
||||
// Include cursor for next page (GraphQL style)
|
||||
nextCursor:
|
||||
result.endPage !== undefined &&
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
'use client'
|
||||
|
||||
import { useEffect, useState } from 'react'
|
||||
import { stack } from '@styled/patterns'
|
||||
import { css } from '@styled/css'
|
||||
import type { WorksheetFormState } from '@/app/create/worksheets/types'
|
||||
import { defaultAdditionConfig } from '@/app/create/worksheets/config-schemas'
|
||||
import { WorksheetConfigProvider } from './WorksheetConfigContext'
|
||||
|
|
@ -11,6 +13,7 @@ import { ProgressiveDifficultyToggle } from './config-panel/ProgressiveDifficult
|
|||
import { SmartModeControls } from './config-panel/SmartModeControls'
|
||||
import { MasteryModePanel } from './config-panel/MasteryModePanel'
|
||||
import { DisplayControlsPanel } from './DisplayControlsPanel'
|
||||
import { validateProblemSpace } from '@/app/create/worksheets/utils/validateProblemSpace'
|
||||
|
||||
interface ConfigPanelProps {
|
||||
formState: WorksheetFormState
|
||||
|
|
@ -19,6 +22,39 @@ interface ConfigPanelProps {
|
|||
}
|
||||
|
||||
export function ConfigPanel({ formState, onChange, isDark = false }: ConfigPanelProps) {
|
||||
const [warnings, setWarnings] = useState<string[]>([])
|
||||
|
||||
// Validate problem space whenever relevant config changes
|
||||
useEffect(() => {
|
||||
const problemsPerPage = formState.problemsPerPage ?? 20
|
||||
const pages = formState.pages ?? 1
|
||||
const digitRange = formState.digitRange ?? { min: 2, max: 2 }
|
||||
const pAnyStart = formState.pAnyStart ?? 0
|
||||
const operator = formState.operator ?? 'addition'
|
||||
|
||||
const validation = validateProblemSpace(problemsPerPage, pages, digitRange, pAnyStart, operator)
|
||||
|
||||
console.log('[CONFIG PANEL] Problem space validation:', {
|
||||
problemsPerPage,
|
||||
pages,
|
||||
digitRange,
|
||||
pAnyStart,
|
||||
operator,
|
||||
estimatedSpace: validation.estimatedUniqueProblems,
|
||||
requested: validation.requestedProblems,
|
||||
risk: validation.duplicateRisk,
|
||||
warningCount: validation.warnings.length,
|
||||
})
|
||||
|
||||
setWarnings(validation.warnings)
|
||||
}, [
|
||||
formState.problemsPerPage,
|
||||
formState.pages,
|
||||
formState.digitRange,
|
||||
formState.pAnyStart,
|
||||
formState.operator,
|
||||
])
|
||||
|
||||
// Handler for difficulty method switching (smart vs mastery)
|
||||
const handleMethodChange = (newMethod: 'smart' | 'mastery') => {
|
||||
const currentMethod = formState.mode === 'mastery' ? 'mastery' : 'smart'
|
||||
|
|
@ -49,6 +85,47 @@ export function ConfigPanel({ formState, onChange, isDark = false }: ConfigPanel
|
|||
return (
|
||||
<WorksheetConfigProvider formState={formState} updateFormState={onChange}>
|
||||
<div data-component="config-panel" className={stack({ gap: '3' })}>
|
||||
{/* Problem Space Warnings */}
|
||||
{warnings.length > 0 && (
|
||||
<div
|
||||
data-element="problem-space-warning"
|
||||
className={css({
|
||||
bg: 'yellow.50',
|
||||
border: '1px solid',
|
||||
borderColor: 'yellow.200',
|
||||
rounded: 'md',
|
||||
p: '3',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
gap: '2',
|
||||
})}
|
||||
>
|
||||
<div
|
||||
className={css({
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: '2',
|
||||
fontWeight: 'semibold',
|
||||
fontSize: 'sm',
|
||||
color: 'yellow.800',
|
||||
})}
|
||||
>
|
||||
<span>⚠️</span>
|
||||
<span>Duplicate Problem Risk</span>
|
||||
</div>
|
||||
<div
|
||||
className={css({
|
||||
fontSize: 'xs',
|
||||
color: 'yellow.900',
|
||||
whiteSpace: 'pre-wrap',
|
||||
lineHeight: '1.5',
|
||||
})}
|
||||
>
|
||||
{warnings.join('\n\n')}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Student Name */}
|
||||
<StudentNameInput
|
||||
value={formState.name}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ export function FloatingPageIndicator({
|
|||
onMouseEnter={() => setIsHovered(true)}
|
||||
onMouseLeave={() => setIsHovered(false)}
|
||||
className={css({
|
||||
position: 'sticky',
|
||||
position: 'absolute',
|
||||
top: '4',
|
||||
left: '50%',
|
||||
transform: 'translateX(-50%)',
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@ import { useTheme } from '@/contexts/ThemeContext'
|
|||
import { extractConfigFields } from '../utils/extractConfigFields'
|
||||
import { ShareModal } from './ShareModal'
|
||||
import { WorksheetPreview } from './WorksheetPreview'
|
||||
import { FloatingPageIndicator } from './FloatingPageIndicator'
|
||||
import { DuplicateWarningBanner } from './worksheet-preview/DuplicateWarningBanner'
|
||||
import { WorksheetPreviewProvider } from './worksheet-preview/WorksheetPreviewContext'
|
||||
|
||||
interface PreviewCenterProps {
|
||||
formState: WorksheetFormState
|
||||
|
|
@ -41,6 +44,11 @@ export function PreviewCenter({
|
|||
const [isGeneratingShare, setIsGeneratingShare] = useState(false)
|
||||
const [justCopied, setJustCopied] = useState(false)
|
||||
const isGenerating = status === 'generating'
|
||||
const [pageData, setPageData] = useState<{
|
||||
currentPage: number
|
||||
totalPages: number
|
||||
jumpToPage: (pageIndex: number) => void
|
||||
} | null>(null)
|
||||
|
||||
// Detect scrolling in the scroll container
|
||||
useEffect(() => {
|
||||
|
|
@ -110,12 +118,10 @@ export function PreviewCenter({
|
|||
|
||||
return (
|
||||
<div
|
||||
ref={scrollContainerRef}
|
||||
data-component="preview-center"
|
||||
className={css({
|
||||
h: 'full',
|
||||
w: 'full',
|
||||
overflow: 'auto',
|
||||
display: 'flex',
|
||||
alignItems: 'flex-start',
|
||||
justifyContent: 'center',
|
||||
|
|
@ -477,17 +483,37 @@ export function PreviewCenter({
|
|||
</>
|
||||
)}
|
||||
|
||||
{/* Floating elements - positioned absolutely relative to preview-center */}
|
||||
<WorksheetPreviewProvider formState={formState}>
|
||||
{/* Dismissable warning banner */}
|
||||
<DuplicateWarningBanner />
|
||||
|
||||
{/* Floating page indicator */}
|
||||
{pageData && pageData.totalPages > 1 && (
|
||||
<FloatingPageIndicator
|
||||
currentPage={pageData.currentPage}
|
||||
totalPages={pageData.totalPages}
|
||||
onJumpToPage={pageData.jumpToPage}
|
||||
isScrolling={isScrolling}
|
||||
/>
|
||||
)}
|
||||
</WorksheetPreviewProvider>
|
||||
|
||||
<div
|
||||
ref={scrollContainerRef}
|
||||
className={css({
|
||||
flex: '1',
|
||||
w: 'full',
|
||||
maxW: '1000px',
|
||||
minH: 'full',
|
||||
h: 'full',
|
||||
overflow: 'auto',
|
||||
})}
|
||||
>
|
||||
<WorksheetPreview
|
||||
formState={formState}
|
||||
initialData={initialPreview}
|
||||
isScrolling={isScrolling}
|
||||
onPageDataReady={setPageData}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,24 @@
|
|||
'use client'
|
||||
|
||||
import { Suspense, useState, useEffect, useRef, Component, type ReactNode } from 'react'
|
||||
import { useSuspenseQuery } from '@tanstack/react-query'
|
||||
import { css } from '@styled/css'
|
||||
import { useSuspenseQuery } from '@tanstack/react-query'
|
||||
import { Component, type ReactNode, Suspense, useEffect, useRef, useState } from 'react'
|
||||
import type { WorksheetFormState } from '@/app/create/worksheets/types'
|
||||
import { useTheme } from '@/contexts/ThemeContext'
|
||||
import { FloatingPageIndicator } from './FloatingPageIndicator'
|
||||
import { PagePlaceholder } from './PagePlaceholder'
|
||||
import { useTheme } from '@/contexts/ThemeContext'
|
||||
import { DuplicateWarningBanner } from './worksheet-preview/DuplicateWarningBanner'
|
||||
import { WorksheetPreviewProvider } from './worksheet-preview/WorksheetPreviewContext'
|
||||
|
||||
interface WorksheetPreviewProps {
|
||||
formState: WorksheetFormState
|
||||
initialData?: string[]
|
||||
isScrolling?: boolean
|
||||
onPageDataReady?: (data: {
|
||||
currentPage: number
|
||||
totalPages: number
|
||||
jumpToPage: (pageIndex: number) => void
|
||||
}) => void
|
||||
}
|
||||
|
||||
function getDefaultDate(): string {
|
||||
|
|
@ -36,6 +43,7 @@ interface PreviewResponse {
|
|||
startPage: number
|
||||
endPage: number
|
||||
nextCursor: number | null
|
||||
warnings?: string[]
|
||||
}
|
||||
|
||||
async function fetchWorksheetPreview(
|
||||
|
|
@ -88,7 +96,12 @@ async function fetchWorksheetPreview(
|
|||
return data
|
||||
}
|
||||
|
||||
function PreviewContent({ formState, initialData, isScrolling = false }: WorksheetPreviewProps) {
|
||||
function PreviewContent({
|
||||
formState,
|
||||
initialData,
|
||||
isScrolling = false,
|
||||
onPageDataReady,
|
||||
}: WorksheetPreviewProps) {
|
||||
const { resolvedTheme } = useTheme()
|
||||
const isDark = resolvedTheme === 'dark'
|
||||
const pageRefs = useRef<(HTMLDivElement | null)[]>([])
|
||||
|
|
@ -247,7 +260,7 @@ function PreviewContent({ formState, initialData, isScrolling = false }: Workshe
|
|||
})
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('Failed to fetch pages ' + start + '-' + end + ':', error)
|
||||
console.error(`Failed to fetch pages ${start}-${end}:`, error)
|
||||
|
||||
// Remove from fetching set on error
|
||||
setFetchingPages((prev) => {
|
||||
|
|
@ -372,6 +385,13 @@ function PreviewContent({ formState, initialData, isScrolling = false }: Workshe
|
|||
pageRefs.current[pageIndex]?.scrollIntoView({ behavior: 'smooth', block: 'start' })
|
||||
}
|
||||
|
||||
// Notify parent of page data for floating elements
|
||||
useEffect(() => {
|
||||
if (onPageDataReady) {
|
||||
onPageDataReady({ currentPage, totalPages, jumpToPage })
|
||||
}
|
||||
}, [currentPage, totalPages, onPageDataReady])
|
||||
|
||||
return (
|
||||
<div
|
||||
data-component="worksheet-preview"
|
||||
|
|
@ -380,19 +400,10 @@ function PreviewContent({ formState, initialData, isScrolling = false }: Workshe
|
|||
rounded: 'lg',
|
||||
border: '1px solid',
|
||||
borderColor: isDark ? 'gray.600' : 'gray.200',
|
||||
position: 'relative',
|
||||
minHeight: 'full',
|
||||
minH: 'full',
|
||||
})}
|
||||
>
|
||||
{/* Floating page indicator */}
|
||||
{totalPages > 1 && (
|
||||
<FloatingPageIndicator
|
||||
currentPage={currentPage}
|
||||
totalPages={totalPages}
|
||||
onJumpToPage={jumpToPage}
|
||||
isScrolling={isScrolling}
|
||||
/>
|
||||
)}
|
||||
{/* Floating elements moved to PreviewCenter */}
|
||||
|
||||
{/* Page containers */}
|
||||
<div
|
||||
|
|
@ -453,7 +464,7 @@ function PreviewContent({ formState, initialData, isScrolling = false }: Workshe
|
|||
)
|
||||
}
|
||||
|
||||
function PreviewFallback() {
|
||||
function PreviewFallback({ formState }: { formState?: WorksheetFormState }) {
|
||||
return (
|
||||
<div
|
||||
data-component="worksheet-preview-loading"
|
||||
|
|
@ -468,15 +479,13 @@ function PreviewFallback() {
|
|||
minHeight: '600px',
|
||||
})}
|
||||
>
|
||||
<p
|
||||
className={css({
|
||||
fontSize: 'lg',
|
||||
color: 'gray.400',
|
||||
textAlign: 'center',
|
||||
})}
|
||||
>
|
||||
Generating preview...
|
||||
</p>
|
||||
<PagePlaceholder
|
||||
pageNumber={1}
|
||||
orientation={formState?.orientation ?? 'portrait'}
|
||||
rows={Math.ceil((formState?.problemsPerPage ?? 20) / (formState?.cols ?? 5))}
|
||||
cols={formState?.cols ?? 5}
|
||||
loading={true}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -744,12 +753,24 @@ class PreviewErrorBoundary extends Component<
|
|||
}
|
||||
}
|
||||
|
||||
export function WorksheetPreview({ formState, initialData, isScrolling }: WorksheetPreviewProps) {
|
||||
export function WorksheetPreview({
|
||||
formState,
|
||||
initialData,
|
||||
isScrolling,
|
||||
onPageDataReady,
|
||||
}: WorksheetPreviewProps) {
|
||||
return (
|
||||
<PreviewErrorBoundary>
|
||||
<Suspense fallback={<PreviewFallback />}>
|
||||
<PreviewContent formState={formState} initialData={initialData} isScrolling={isScrolling} />
|
||||
</Suspense>
|
||||
</PreviewErrorBoundary>
|
||||
<WorksheetPreviewProvider formState={formState}>
|
||||
<PreviewErrorBoundary>
|
||||
<Suspense fallback={<PreviewFallback formState={formState} />}>
|
||||
<PreviewContent
|
||||
formState={formState}
|
||||
initialData={initialData}
|
||||
isScrolling={isScrolling}
|
||||
onPageDataReady={onPageDataReady}
|
||||
/>
|
||||
</Suspense>
|
||||
</PreviewErrorBoundary>
|
||||
</WorksheetPreviewProvider>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
'use client'
|
||||
|
||||
import { css } from '@styled/css'
|
||||
import { useWorksheetPreview } from './WorksheetPreviewContext'
|
||||
|
||||
export function DuplicateWarningBanner() {
|
||||
const { warnings, isDismissed, setIsDismissed } = useWorksheetPreview()
|
||||
|
||||
if (warnings.length === 0 || isDismissed) {
|
||||
return null
|
||||
}
|
||||
|
||||
return (
|
||||
<div
|
||||
data-element="problem-space-warning"
|
||||
className={css({
|
||||
position: 'absolute',
|
||||
top: '24', // Well below the page indicator to avoid overlap
|
||||
left: '4',
|
||||
right: '20', // More space on right to avoid action button
|
||||
zIndex: 100,
|
||||
bg: 'yellow.50',
|
||||
border: '1px solid',
|
||||
borderColor: 'yellow.300',
|
||||
rounded: '15px',
|
||||
p: '4',
|
||||
display: 'flex',
|
||||
alignItems: 'flex-start',
|
||||
gap: '3',
|
||||
boxShadow: '0 4px 16px rgba(0, 0, 0, 0.15)',
|
||||
})}
|
||||
>
|
||||
<div className={css({ flex: '1', display: 'flex', flexDirection: 'column', gap: '2' })}>
|
||||
<div
|
||||
className={css({
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: '2',
|
||||
fontWeight: 'semibold',
|
||||
fontSize: 'md',
|
||||
color: 'yellow.800',
|
||||
})}
|
||||
>
|
||||
<span>⚠️</span>
|
||||
<span>Duplicate Problem Risk</span>
|
||||
</div>
|
||||
<div
|
||||
className={css({
|
||||
fontSize: 'sm',
|
||||
color: 'yellow.900',
|
||||
whiteSpace: 'pre-wrap',
|
||||
lineHeight: '1.6',
|
||||
})}
|
||||
>
|
||||
{warnings.join('\n\n')}
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setIsDismissed(true)}
|
||||
className={css({
|
||||
flexShrink: '0',
|
||||
color: 'yellow.700',
|
||||
fontSize: 'xl',
|
||||
lineHeight: '1',
|
||||
cursor: 'pointer',
|
||||
bg: 'transparent',
|
||||
border: 'none',
|
||||
p: '1',
|
||||
_hover: {
|
||||
color: 'yellow.900',
|
||||
bg: 'yellow.100',
|
||||
rounded: 'sm',
|
||||
},
|
||||
})}
|
||||
aria-label="Dismiss warning"
|
||||
>
|
||||
×
|
||||
</button>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
'use client'
|
||||
|
||||
import { createContext, type ReactNode, useContext, useEffect, useState } from 'react'
|
||||
import type { WorksheetFormState } from '@/app/create/worksheets/types'
|
||||
import { validateProblemSpace } from '@/app/create/worksheets/utils/validateProblemSpace'
|
||||
import { useTheme } from '@/contexts/ThemeContext'
|
||||
|
||||
interface WorksheetPreviewContextValue {
|
||||
// Theme
|
||||
isDark: boolean
|
||||
|
||||
// Warnings
|
||||
warnings: string[]
|
||||
isDismissed: boolean
|
||||
setIsDismissed: (dismissed: boolean) => void
|
||||
|
||||
// Form state
|
||||
formState: WorksheetFormState
|
||||
}
|
||||
|
||||
const WorksheetPreviewContext = createContext<WorksheetPreviewContextValue | null>(null)
|
||||
|
||||
export function useWorksheetPreview() {
|
||||
const context = useContext(WorksheetPreviewContext)
|
||||
if (!context) {
|
||||
throw new Error('useWorksheetPreview must be used within WorksheetPreviewProvider')
|
||||
}
|
||||
return context
|
||||
}
|
||||
|
||||
interface WorksheetPreviewProviderProps {
|
||||
formState: WorksheetFormState
|
||||
children: ReactNode
|
||||
}
|
||||
|
||||
export function WorksheetPreviewProvider({ formState, children }: WorksheetPreviewProviderProps) {
|
||||
const { resolvedTheme } = useTheme()
|
||||
const isDark = resolvedTheme === 'dark'
|
||||
const [isDismissed, setIsDismissed] = useState(false)
|
||||
const [warnings, setWarnings] = useState<string[]>([])
|
||||
|
||||
// Validate problem space whenever relevant config changes
|
||||
useEffect(() => {
|
||||
const problemsPerPage = formState.problemsPerPage ?? 20
|
||||
const pages = formState.pages ?? 1
|
||||
const operator = formState.operator ?? 'addition'
|
||||
const mode = formState.mode ?? 'smart'
|
||||
|
||||
// Reset dismissed state when config changes
|
||||
setIsDismissed(false)
|
||||
|
||||
// Skip validation for mastery+mixed mode - too complex with separate skill configs
|
||||
if (mode === 'mastery' && operator === 'mixed') {
|
||||
setWarnings([])
|
||||
return
|
||||
}
|
||||
|
||||
const digitRange = formState.digitRange ?? { min: 2, max: 2 }
|
||||
const pAnyStart = formState.pAnyStart ?? 0
|
||||
|
||||
const validation = validateProblemSpace(problemsPerPage, pages, digitRange, pAnyStart, operator)
|
||||
|
||||
setWarnings(validation.warnings)
|
||||
}, [
|
||||
formState.problemsPerPage,
|
||||
formState.pages,
|
||||
formState.digitRange,
|
||||
formState.pAnyStart,
|
||||
formState.operator,
|
||||
formState.mode,
|
||||
])
|
||||
|
||||
const value: WorksheetPreviewContextValue = {
|
||||
isDark,
|
||||
warnings,
|
||||
isDismissed,
|
||||
setIsDismissed,
|
||||
formState,
|
||||
}
|
||||
|
||||
return (
|
||||
<WorksheetPreviewContext.Provider value={value}>{children}</WorksheetPreviewContext.Provider>
|
||||
)
|
||||
}
|
||||
|
|
@ -24,6 +24,14 @@ export interface PreviewResult {
|
|||
warnings?: string[] // Added for problem space validation warnings
|
||||
}
|
||||
|
||||
export interface SinglePageResult {
|
||||
success: boolean
|
||||
page?: string
|
||||
totalPages?: number
|
||||
error?: string
|
||||
details?: string
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate worksheet preview SVG pages
|
||||
* Can be called from API routes or Server Components
|
||||
|
|
@ -54,8 +62,21 @@ export function generateWorksheetPreview(
|
|||
const validatedConfig = validation.config
|
||||
console.log('[PREVIEW] Step 1: ✓ Configuration valid')
|
||||
|
||||
// Generate all problems for full preview based on operator
|
||||
// Validate problem space for duplicate risk
|
||||
const operator = validatedConfig.operator ?? 'addition'
|
||||
const spaceValidation = validateProblemSpace(
|
||||
validatedConfig.problemsPerPage,
|
||||
validatedConfig.pages,
|
||||
validatedConfig.digitRange,
|
||||
validatedConfig.pAnyStart,
|
||||
operator
|
||||
)
|
||||
|
||||
if (spaceValidation.warnings.length > 0) {
|
||||
console.log('[PREVIEW] Problem space warnings:', spaceValidation.warnings)
|
||||
}
|
||||
|
||||
// Generate all problems for full preview based on operator
|
||||
const mode = config.mode ?? 'smart'
|
||||
|
||||
console.log(
|
||||
|
|
@ -206,6 +227,7 @@ export function generateWorksheetPreview(
|
|||
totalPages,
|
||||
startPage: start,
|
||||
endPage: end,
|
||||
warnings: spaceValidation.warnings.length > 0 ? spaceValidation.warnings : undefined,
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error generating preview:', error)
|
||||
|
|
|
|||
|
|
@ -2,10 +2,11 @@
|
|||
|
||||
import type {
|
||||
AdditionProblem,
|
||||
ProblemCategory,
|
||||
SubtractionProblem,
|
||||
WorksheetProblem,
|
||||
ProblemCategory,
|
||||
} from '@/app/create/worksheets/types'
|
||||
import { estimateUniqueProblemSpace } from './utils/validateProblemSpace'
|
||||
|
||||
/**
|
||||
* Mulberry32 PRNG for reproducible random number generation
|
||||
|
|
@ -27,6 +28,18 @@ function pick<T>(arr: T[], rand: () => number): T {
|
|||
return arr[Math.floor(rand() * arr.length)]
|
||||
}
|
||||
|
||||
/**
|
||||
* Fisher-Yates shuffle with deterministic PRNG
|
||||
*/
|
||||
function shuffleArray<T>(arr: T[], rand: () => number): T[] {
|
||||
const shuffled = [...arr]
|
||||
for (let i = shuffled.length - 1; i > 0; i--) {
|
||||
const j = Math.floor(rand() * (i + 1))
|
||||
;[shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]]
|
||||
}
|
||||
return shuffled
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate random integer between min and max (inclusive)
|
||||
*/
|
||||
|
|
@ -83,6 +96,102 @@ function countDigits(num: number): number {
|
|||
return Math.floor(Math.log10(Math.abs(num))) + 1
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if addition problem has regrouping
|
||||
* Returns { hasAny: boolean, hasMultiple: boolean }
|
||||
*/
|
||||
function checkRegrouping(a: number, b: number): { hasAny: boolean; hasMultiple: boolean } {
|
||||
const maxPlaces = Math.max(countDigits(a), countDigits(b))
|
||||
let carryCount = 0
|
||||
let carry = 0
|
||||
|
||||
for (let pos = 0; pos < maxPlaces; pos++) {
|
||||
const digitA = getDigit(a, pos)
|
||||
const digitB = getDigit(b, pos)
|
||||
const sum = digitA + digitB + carry
|
||||
|
||||
if (sum >= 10) {
|
||||
carryCount++
|
||||
carry = 1
|
||||
} else {
|
||||
carry = 0
|
||||
}
|
||||
}
|
||||
|
||||
return { hasAny: carryCount > 0, hasMultiple: carryCount > 1 }
|
||||
}
|
||||
|
||||
/**
|
||||
* Count the number of regrouping operations (carries) in an addition problem
|
||||
* Returns a number representing difficulty: 0 = no regrouping, 1+ = increasing difficulty
|
||||
*/
|
||||
function countRegroupingOperations(a: number, b: number): number {
|
||||
const maxPlaces = Math.max(countDigits(a), countDigits(b))
|
||||
let carryCount = 0
|
||||
let carry = 0
|
||||
|
||||
for (let pos = 0; pos < maxPlaces; pos++) {
|
||||
const digitA = getDigit(a, pos)
|
||||
const digitB = getDigit(b, pos)
|
||||
const sum = digitA + digitB + carry
|
||||
|
||||
if (sum >= 10) {
|
||||
carryCount++
|
||||
carry = 1
|
||||
} else {
|
||||
carry = 0
|
||||
}
|
||||
}
|
||||
|
||||
return carryCount
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate ALL valid addition problems for a given digit range and regrouping constraints
|
||||
* Used for small problem spaces where enumeration is faster than retry loops
|
||||
*/
|
||||
function generateAllAdditionProblems(
|
||||
minDigits: number,
|
||||
maxDigits: number,
|
||||
pAnyStart: number,
|
||||
pAllStart: number
|
||||
): AdditionProblem[] {
|
||||
const problems: AdditionProblem[] = []
|
||||
|
||||
// Generate all possible number pairs within digit range
|
||||
for (let digitsA = minDigits; digitsA <= maxDigits; digitsA++) {
|
||||
for (let digitsB = minDigits; digitsB <= maxDigits; digitsB++) {
|
||||
const minA = digitsA === 1 ? 0 : 10 ** (digitsA - 1)
|
||||
const maxA = digitsA === 1 ? 9 : 10 ** digitsA - 1
|
||||
const minB = digitsB === 1 ? 0 : 10 ** (digitsB - 1)
|
||||
const maxB = digitsB === 1 ? 9 : 10 ** digitsB - 1
|
||||
|
||||
for (let a = minA; a <= maxA; a++) {
|
||||
for (let b = minB; b <= maxB; b++) {
|
||||
const regroup = checkRegrouping(a, b)
|
||||
|
||||
// Filter based on regrouping requirements
|
||||
// pAnyStart = 1.0 means ONLY regrouping problems
|
||||
// pAllStart = 1.0 means ONLY multiple regrouping problems
|
||||
// pAnyStart = 0.0 means ONLY non-regrouping problems
|
||||
|
||||
const includeThis =
|
||||
(pAnyStart === 1.0 && regroup.hasAny) || // Only regrouping
|
||||
(pAllStart === 1.0 && regroup.hasMultiple) || // Only multiple regrouping
|
||||
(pAnyStart === 0.0 && !regroup.hasAny) || // Only non-regrouping
|
||||
(pAnyStart > 0 && pAnyStart < 1) // Mixed mode - include everything, will sample later
|
||||
|
||||
if (includeThis) {
|
||||
problems.push({ a, b, operator: 'add' })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return problems
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a problem with NO regrouping
|
||||
* No carries in any place value
|
||||
|
|
@ -247,11 +356,116 @@ export function generateProblems(
|
|||
const startTime = Date.now()
|
||||
|
||||
const rand = createPRNG(seed)
|
||||
const { min: minDigits, max: maxDigits } = digitRange
|
||||
|
||||
// Estimate problem space size
|
||||
const estimatedSpace = estimateUniqueProblemSpace(digitRange, pAnyStart, 'addition')
|
||||
console.log(`[ADD GEN] Estimated unique problem space: ${estimatedSpace} (requesting ${total})`)
|
||||
|
||||
// For small problem spaces, use generate-all + shuffle approach (even with interpolate)
|
||||
const THRESHOLD = 10000
|
||||
if (estimatedSpace < THRESHOLD) {
|
||||
console.log(
|
||||
`[ADD GEN] Using generate-all + shuffle (space < ${THRESHOLD}, interpolate=${interpolate})`
|
||||
)
|
||||
const allProblems = generateAllAdditionProblems(minDigits, maxDigits, pAnyStart, pAllStart)
|
||||
console.log(`[ADD GEN] Generated ${allProblems.length} unique problems`)
|
||||
|
||||
if (interpolate) {
|
||||
// Sort problems by difficulty (number of regrouping operations)
|
||||
// This allows us to sample from easier problems early, harder problems later
|
||||
console.log(`[ADD GEN] Sorting problems by difficulty for progressive difficulty`)
|
||||
const sortedByDifficulty = [...allProblems].sort((a, b) => {
|
||||
const diffA = countRegroupingOperations(a.a, a.b)
|
||||
const diffB = countRegroupingOperations(b.a, b.b)
|
||||
return diffA - diffB // Easier (fewer regroups) first
|
||||
})
|
||||
|
||||
// Sample problems based on difficulty curve
|
||||
const result: AdditionProblem[] = []
|
||||
const seen = new Set<string>()
|
||||
|
||||
for (let i = 0; i < total; i++) {
|
||||
const frac = total <= 1 ? 0 : i / (total - 1)
|
||||
// Map frac (0 to 1) to index in sorted array
|
||||
// frac=0 (start) → sample from easy problems (low index)
|
||||
// frac=1 (end) → sample from hard problems (high index)
|
||||
const targetIndex = Math.floor(frac * (sortedByDifficulty.length - 1))
|
||||
|
||||
// Try to get a problem near the target difficulty that we haven't used
|
||||
let problem = sortedByDifficulty[targetIndex]
|
||||
const key = `${problem.a},${problem.b}`
|
||||
|
||||
// If already used, search nearby for unused problem
|
||||
if (seen.has(key)) {
|
||||
let found = false
|
||||
for (let offset = 1; offset < sortedByDifficulty.length; offset++) {
|
||||
// Try forward first, then backward
|
||||
for (const direction of [1, -1]) {
|
||||
const idx = targetIndex + direction * offset
|
||||
if (idx >= 0 && idx < sortedByDifficulty.length) {
|
||||
problem = sortedByDifficulty[idx]
|
||||
const newKey = `${problem.a},${problem.b}`
|
||||
if (!seen.has(newKey)) {
|
||||
seen.add(newKey)
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
if (found) break
|
||||
}
|
||||
// If still not found, allow duplicate
|
||||
if (!found) {
|
||||
seen.add(key)
|
||||
}
|
||||
} else {
|
||||
seen.add(key)
|
||||
}
|
||||
|
||||
result.push(problem)
|
||||
}
|
||||
|
||||
const elapsed = Date.now() - startTime
|
||||
console.log(
|
||||
`[ADD GEN] Complete: ${result.length} problems in ${elapsed}ms (0 retries, generate-all with progressive difficulty)`
|
||||
)
|
||||
return result
|
||||
} else {
|
||||
// No interpolation - just shuffle and take first N
|
||||
const shuffled = shuffleArray(allProblems, rand)
|
||||
|
||||
// If we need more problems than available, we'll have duplicates
|
||||
if (total > shuffled.length) {
|
||||
console.warn(
|
||||
`[ADD GEN] Warning: Requested ${total} problems but only ${shuffled.length} unique problems exist. Some duplicates will occur.`
|
||||
)
|
||||
// Repeat the shuffled array to fill the request
|
||||
const result: AdditionProblem[] = []
|
||||
while (result.length < total) {
|
||||
result.push(...shuffled.slice(0, Math.min(shuffled.length, total - result.length)))
|
||||
}
|
||||
const elapsed = Date.now() - startTime
|
||||
console.log(
|
||||
`[ADD GEN] Complete: ${result.length} problems in ${elapsed}ms (0 retries, generate-all method)`
|
||||
)
|
||||
return result
|
||||
}
|
||||
|
||||
// Take first N problems from shuffled array
|
||||
const elapsed = Date.now() - startTime
|
||||
console.log(
|
||||
`[ADD GEN] Complete: ${total} problems in ${elapsed}ms (0 retries, generate-all method)`
|
||||
)
|
||||
return shuffled.slice(0, total)
|
||||
}
|
||||
}
|
||||
|
||||
// For large problem spaces, use retry-based approach
|
||||
console.log(`[ADD GEN] Using retry-based approach (space >= ${THRESHOLD})`)
|
||||
const problems: AdditionProblem[] = []
|
||||
const seen = new Set<string>()
|
||||
|
||||
const { min: minDigits, max: maxDigits } = digitRange
|
||||
|
||||
let totalRetries = 0
|
||||
for (let i = 0; i < total; i++) {
|
||||
// Log progress every 100 problems for large sets
|
||||
|
|
@ -447,6 +661,63 @@ export function generateOnesOnlyBorrow(
|
|||
return minDigits === 1 ? [13, 7] : [52, 17]
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if subtraction problem has borrowing
|
||||
* Returns { hasAny: boolean, hasMultiple: boolean }
|
||||
*/
|
||||
function checkBorrowing(
|
||||
minuend: number,
|
||||
subtrahend: number
|
||||
): { hasAny: boolean; hasMultiple: boolean } {
|
||||
const borrowCount = countBorrows(minuend, subtrahend)
|
||||
return { hasAny: borrowCount > 0, hasMultiple: borrowCount > 1 }
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate ALL valid subtraction problems for a given digit range and borrowing constraints
|
||||
* Used for small problem spaces where enumeration is faster than retry loops
|
||||
*/
|
||||
function generateAllSubtractionProblems(
|
||||
minDigits: number,
|
||||
maxDigits: number,
|
||||
pAnyBorrow: number,
|
||||
pAllBorrow: number
|
||||
): SubtractionProblem[] {
|
||||
const problems: SubtractionProblem[] = []
|
||||
|
||||
// Generate all possible number pairs within digit range where minuend >= subtrahend
|
||||
for (let digitsM = minDigits; digitsM <= maxDigits; digitsM++) {
|
||||
for (let digitsS = minDigits; digitsS <= maxDigits; digitsS++) {
|
||||
const minM = digitsM === 1 ? 0 : 10 ** (digitsM - 1)
|
||||
const maxM = digitsM === 1 ? 9 : 10 ** digitsM - 1
|
||||
const minS = digitsS === 1 ? 0 : 10 ** (digitsS - 1)
|
||||
const maxS = digitsS === 1 ? 9 : 10 ** digitsS - 1
|
||||
|
||||
for (let minuend = minM; minuend <= maxM; minuend++) {
|
||||
for (let subtrahend = minS; subtrahend <= maxS; subtrahend++) {
|
||||
// Ensure minuend >= subtrahend (no negative results)
|
||||
if (minuend < subtrahend) continue
|
||||
|
||||
const borrow = checkBorrowing(minuend, subtrahend)
|
||||
|
||||
// Filter based on borrowing requirements (same logic as addition)
|
||||
const includeThis =
|
||||
(pAnyBorrow === 1.0 && borrow.hasAny) || // Only borrowing
|
||||
(pAllBorrow === 1.0 && borrow.hasMultiple) || // Only multiple borrowing
|
||||
(pAnyBorrow === 0.0 && !borrow.hasAny) || // Only non-borrowing
|
||||
(pAnyBorrow > 0 && pAnyBorrow < 1) // Mixed mode - include everything
|
||||
|
||||
if (includeThis) {
|
||||
problems.push({ minuend, subtrahend, operator: 'sub' })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return problems
|
||||
}
|
||||
|
||||
/**
|
||||
* Count the number of actual borrow operations needed for subtraction
|
||||
* Simulates the standard borrowing algorithm
|
||||
|
|
@ -571,11 +842,55 @@ export function generateSubtractionProblems(
|
|||
const startTime = Date.now()
|
||||
|
||||
const rand = createPRNG(seed)
|
||||
const problems: SubtractionProblem[] = []
|
||||
const seen = new Set<string>()
|
||||
const minDigits = digitRange.min
|
||||
const maxDigits = digitRange.max
|
||||
|
||||
// Estimate problem space size
|
||||
const estimatedSpace = estimateUniqueProblemSpace(digitRange, pAnyBorrow, 'subtraction')
|
||||
console.log(`[SUB GEN] Estimated unique problem space: ${estimatedSpace} (requesting ${count})`)
|
||||
|
||||
// For small problem spaces, use generate-all + shuffle approach
|
||||
const THRESHOLD = 10000
|
||||
if (estimatedSpace < THRESHOLD && !interpolate) {
|
||||
console.log(`[SUB GEN] Using generate-all + shuffle (space < ${THRESHOLD})`)
|
||||
const allProblems = generateAllSubtractionProblems(minDigits, maxDigits, pAnyBorrow, pAllBorrow)
|
||||
console.log(`[SUB GEN] Generated ${allProblems.length} unique problems`)
|
||||
|
||||
// Shuffle deterministically using seed
|
||||
const shuffled = shuffleArray(allProblems, rand)
|
||||
|
||||
// If we need more problems than available, we'll have duplicates
|
||||
if (count > shuffled.length) {
|
||||
console.warn(
|
||||
`[SUB GEN] Warning: Requested ${count} problems but only ${shuffled.length} unique problems exist. Some duplicates will occur.`
|
||||
)
|
||||
// Repeat the shuffled array to fill the request
|
||||
const result: SubtractionProblem[] = []
|
||||
while (result.length < count) {
|
||||
result.push(...shuffled.slice(0, Math.min(shuffled.length, count - result.length)))
|
||||
}
|
||||
const elapsed = Date.now() - startTime
|
||||
console.log(
|
||||
`[SUB GEN] Complete: ${result.length} problems in ${elapsed}ms (0 retries, generate-all method)`
|
||||
)
|
||||
return result
|
||||
}
|
||||
|
||||
// Take first N problems from shuffled array
|
||||
const elapsed = Date.now() - startTime
|
||||
console.log(
|
||||
`[SUB GEN] Complete: ${count} problems in ${elapsed}ms (0 retries, generate-all method)`
|
||||
)
|
||||
return shuffled.slice(0, count)
|
||||
}
|
||||
|
||||
// For large problem spaces or interpolated difficulty, use retry-based approach
|
||||
console.log(
|
||||
`[SUB GEN] Using retry-based approach (space >= ${THRESHOLD} or interpolate=${interpolate})`
|
||||
)
|
||||
const problems: SubtractionProblem[] = []
|
||||
const seen = new Set<string>()
|
||||
|
||||
function uniquePush(minuend: number, subtrahend: number): boolean {
|
||||
const key = `${minuend}-${subtrahend}`
|
||||
if (!seen.has(key)) {
|
||||
|
|
|
|||
|
|
@ -12,39 +12,90 @@ export interface ProblemSpaceValidation {
|
|||
|
||||
/**
|
||||
* Estimate the maximum unique problems possible given constraints
|
||||
* For small spaces (< 10000), uses exact counting via problem generation
|
||||
* For large spaces, uses heuristic estimation
|
||||
*/
|
||||
function estimateUniqueProblemSpace(
|
||||
export function estimateUniqueProblemSpace(
|
||||
digitRange: { min: number; max: number },
|
||||
pAnyRegroup: number,
|
||||
operator: 'addition' | 'subtraction'
|
||||
): number {
|
||||
const { min: minDigits, max: maxDigits } = digitRange
|
||||
|
||||
// Calculate approximate number space for each digit count
|
||||
// For small digit ranges, do exact counting
|
||||
// Single digit: 0-9 = 10 numbers, pairs = 10*10 = 100
|
||||
// Two digit: 10-99 = 90 numbers, pairs = 90*90 = 8100
|
||||
// Threshold: under 10,000 estimated pairs, do exact count
|
||||
const numbersInRange =
|
||||
minDigits === 1 && maxDigits === 1
|
||||
? 10 // 0-9
|
||||
: minDigits === maxDigits
|
||||
? maxDigits === 1
|
||||
? 10
|
||||
: 9 * 10 ** (maxDigits - 1) // e.g., 2-digit = 90
|
||||
: // Mixed range - rough approximation
|
||||
10 + 9 * 10 ** (maxDigits - 1)
|
||||
|
||||
const roughPairCount = numbersInRange * numbersInRange
|
||||
|
||||
// For very small problem spaces, do exact counting using the generators
|
||||
if (roughPairCount < 10000) {
|
||||
// Import and use the actual generators to get exact count
|
||||
// This is lazy-loaded only when needed for small spaces
|
||||
try {
|
||||
// Dynamic import would be ideal, but for now we'll use a more accurate heuristic
|
||||
// that matches the actual generation logic
|
||||
|
||||
if (operator === 'addition') {
|
||||
// For 1-digit (0-9) addition:
|
||||
// All pairs where a + b >= 10 are regrouping
|
||||
// Count: for each a in 0-9, count b where a+b >= 10
|
||||
// a=0: none, a=1: 9, a=2: 8, ..., a=9: 1
|
||||
// Total regrouping: 0+9+8+7+6+5+4+3+2+1 = 45
|
||||
|
||||
if (minDigits === 1 && maxDigits === 1) {
|
||||
if (pAnyRegroup >= 0.95) {
|
||||
return 45 // Only regrouping problems
|
||||
}
|
||||
if (pAnyRegroup <= 0.05) {
|
||||
return 55 // Only non-regrouping problems (10*10 - 45 = 55)
|
||||
}
|
||||
return 100 // Mixed mode - all problems
|
||||
}
|
||||
} else {
|
||||
// Subtraction
|
||||
if (minDigits === 1 && maxDigits === 1) {
|
||||
// For 1-digit subtraction (0-9):
|
||||
// Total valid: 55 (minuend >= subtrahend, including 0-0, 1-0, 1-1, etc.)
|
||||
// Borrowing cases are limited (only when going negative would require borrow)
|
||||
if (pAnyRegroup >= 0.95) {
|
||||
return 36 // Only borrowing problems (rough estimate)
|
||||
}
|
||||
if (pAnyRegroup <= 0.05) {
|
||||
return 55 // All valid subtractions with no borrowing
|
||||
}
|
||||
return 55 // Mixed mode
|
||||
}
|
||||
}
|
||||
|
||||
// For other small ranges, use the heuristic below
|
||||
} catch (e) {
|
||||
// Fall through to heuristic
|
||||
}
|
||||
}
|
||||
|
||||
// Heuristic estimation for larger spaces
|
||||
let totalSpace = 0
|
||||
for (let digits = minDigits; digits <= maxDigits; digits++) {
|
||||
// For N-digit numbers: 9 * 10^(N-1) possibilities (e.g., 2-digit = 90 numbers from 10-99)
|
||||
const numbersPerDigitCount = digits === 1 ? 9 : 9 * Math.pow(10, digits - 1)
|
||||
const numbersPerDigitCount = digits === 1 ? 10 : 9 * 10 ** (digits - 1)
|
||||
|
||||
if (operator === 'addition') {
|
||||
// Addition: a + b where both are in the digit range
|
||||
// Rough estimate: numbersPerDigitCount^2 / 2 (since a+b = b+a, but we count both)
|
||||
// Then filter by regrouping probability
|
||||
const pairsForDigits = numbersPerDigitCount * numbersPerDigitCount
|
||||
|
||||
// If pAnyRegroup is high, only a fraction of pairs will work
|
||||
// Regrouping is more common with larger digits, so this is approximate
|
||||
const regroupFactor = pAnyRegroup > 0.8 ? 0.3 : pAnyRegroup > 0.5 ? 0.5 : 0.7
|
||||
|
||||
const regroupFactor = pAnyRegroup > 0.8 ? 0.45 : pAnyRegroup > 0.5 ? 0.5 : 0.7
|
||||
totalSpace += pairsForDigits * regroupFactor
|
||||
} else {
|
||||
// Subtraction: minuend - subtrahend where minuend > subtrahend
|
||||
// About half the pairs (where minuend > subtrahend)
|
||||
const pairsForDigits = (numbersPerDigitCount * numbersPerDigitCount) / 2
|
||||
|
||||
// Borrowing constraints reduce space similarly
|
||||
const borrowFactor = pAnyRegroup > 0.8 ? 0.3 : pAnyRegroup > 0.5 ? 0.5 : 0.7
|
||||
|
||||
const borrowFactor = pAnyRegroup > 0.8 ? 0.35 : pAnyRegroup > 0.5 ? 0.5 : 0.7
|
||||
totalSpace += pairsForDigits * borrowFactor
|
||||
}
|
||||
}
|
||||
|
|
@ -93,7 +144,7 @@ export function validateProblemSpace(
|
|||
`Warning: Only ~${Math.floor(estimatedSpace)} unique problems possible, but you're requesting ${requestedProblems}. Expect moderate duplicates.`
|
||||
)
|
||||
warnings.push(
|
||||
`Suggestion: Reduce pages to ${Math.floor(estimatedSpace * 0.5 / problemsPerPage)} or increase digit range to ${digitRange.max + 1}`
|
||||
`Suggestion: Reduce pages to ${Math.floor((estimatedSpace * 0.5) / problemsPerPage)} or increase digit range to ${digitRange.max + 1}`
|
||||
)
|
||||
} else if (ratio < 1.5) {
|
||||
duplicateRisk = 'high'
|
||||
|
|
@ -102,7 +153,7 @@ export function validateProblemSpace(
|
|||
)
|
||||
warnings.push(
|
||||
`Recommendations:\n` +
|
||||
` • Reduce to ${Math.floor(estimatedSpace * 0.5 / problemsPerPage)} pages (50% of available space)\n` +
|
||||
` • Reduce to ${Math.floor((estimatedSpace * 0.5) / problemsPerPage)} pages (50% of available space)\n` +
|
||||
` • Increase digit range to ${digitRange.max + 1}-${digitRange.max + 1}\n` +
|
||||
` • Lower regrouping probability from ${Math.round(pAnyStart * 100)}% to 50%`
|
||||
)
|
||||
|
|
@ -111,12 +162,10 @@ export function validateProblemSpace(
|
|||
warnings.push(
|
||||
`Extreme duplicate risk! Requesting ${requestedProblems} problems but only ~${Math.floor(estimatedSpace)} unique problems exist.`
|
||||
)
|
||||
warnings.push(
|
||||
`This configuration will produce mostly duplicate problems.`
|
||||
)
|
||||
warnings.push(`This configuration will produce mostly duplicate problems.`)
|
||||
warnings.push(
|
||||
`Strong recommendations:\n` +
|
||||
` • Reduce to ${Math.floor(estimatedSpace * 0.5 / problemsPerPage)} pages maximum\n` +
|
||||
` • Reduce to ${Math.floor((estimatedSpace * 0.5) / problemsPerPage)} pages maximum\n` +
|
||||
` • OR increase digit range from ${digitRange.min}-${digitRange.max} to ${digitRange.min}-${digitRange.max + 1}\n` +
|
||||
` • OR reduce regrouping requirement from ${Math.round(pAnyStart * 100)}%`
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue