Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d9ae630fe5 | |||
| 132c4ebced |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "vue-nonograms-solid",
|
"name": "vue-nonograms-solid",
|
||||||
"version": "1.6.3",
|
"version": "1.6.4",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "vue-nonograms-solid",
|
"name": "vue-nonograms-solid",
|
||||||
"version": "1.6.3",
|
"version": "1.6.4",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fireworks-js": "^2.10.8",
|
"fireworks-js": "^2.10.8",
|
||||||
"flag-icons": "^7.5.0",
|
"flag-icons": "^7.5.0",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vue-nonograms-solid",
|
"name": "vue-nonograms-solid",
|
||||||
"version": "1.6.3",
|
"version": "1.6.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -41,12 +41,12 @@ const handleSnap = () => {
|
|||||||
customSize.value = snapToStep(Number(customSize.value), 5);
|
customSize.value = snapToStep(Number(customSize.value), 5);
|
||||||
};
|
};
|
||||||
|
|
||||||
const difficultyLevel = computed(() => {
|
const difficultyInfo = computed(() => {
|
||||||
return calculateDifficulty(fillRate.value / 100);
|
return calculateDifficulty(fillRate.value / 100, customSize.value);
|
||||||
});
|
});
|
||||||
|
|
||||||
const difficultyColor = computed(() => {
|
const difficultyColor = computed(() => {
|
||||||
switch(difficultyLevel.value) {
|
switch(difficultyInfo.value.level) {
|
||||||
case 'extreme': return '#ff3333';
|
case 'extreme': return '#ff3333';
|
||||||
case 'hardest': return '#ff9933';
|
case 'hardest': return '#ff9933';
|
||||||
case 'harder': return '#ffff33';
|
case 'harder': return '#ffff33';
|
||||||
@@ -97,7 +97,7 @@ const confirm = () => {
|
|||||||
v-model="fillRate"
|
v-model="fillRate"
|
||||||
min="10"
|
min="10"
|
||||||
max="90"
|
max="90"
|
||||||
step="5"
|
step="1"
|
||||||
/>
|
/>
|
||||||
<div class="range-scale">
|
<div class="range-scale">
|
||||||
<span>10%</span>
|
<span>10%</span>
|
||||||
@@ -106,10 +106,9 @@ const confirm = () => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="difficulty-indicator">
|
<div class="difficulty-indicator">
|
||||||
<span class="label">{{ t('custom.difficulty') }}:</span>
|
<div class="label">{{ t('custom.difficulty') }}</div>
|
||||||
<span class="value" :style="{ color: difficultyColor }">
|
<div class="level" :style="{ color: difficultyColor }">{{ t(`difficulty.${difficultyInfo.level}`) }}</div>
|
||||||
{{ t(`difficulty.${difficultyLevel}`) }}
|
<div class="percentage" :style="{ color: difficultyColor }">{{ difficultyInfo.value }}%</div>
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p v-if="errorMsg" class="error">{{ errorMsg }}</p>
|
<p v-if="errorMsg" class="error">{{ errorMsg }}</p>
|
||||||
@@ -219,12 +218,30 @@ input[type="range"]::-moz-range-thumb {
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
color: var(--text-muted);
|
color: var(--text-muted);
|
||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
|
.difficulty-indicator {
|
||||||
|
margin: 20px 0 30px 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.difficulty-indicator {
|
.label {
|
||||||
margin: 20px 0;
|
font-size: 1rem;
|
||||||
font-size: 1.2rem;
|
color: var(--text-muted);
|
||||||
display: flex;
|
}
|
||||||
|
|
||||||
|
.level {
|
||||||
|
font-size: 1.4rem;
|
||||||
|
font-weight: bold;
|
||||||
|
text-transform: uppercase;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.percentage {
|
||||||
|
font-size: 1rem;
|
||||||
|
font-weight: bold;
|
||||||
|
} display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@@ -231,7 +231,8 @@ const buildShareSVG = () => {
|
|||||||
|
|
||||||
// Difficulty Logic
|
// Difficulty Logic
|
||||||
const densityPercent = Math.round(store.currentDensity * 100);
|
const densityPercent = Math.round(store.currentDensity * 100);
|
||||||
const difficultyKey = calculateDifficulty(store.currentDensity);
|
const diffInfo = calculateDifficulty(store.currentDensity, store.size);
|
||||||
|
const difficultyKey = diffInfo.level;
|
||||||
let diffColor = '#33ff33';
|
let diffColor = '#33ff33';
|
||||||
if (difficultyKey === 'extreme') diffColor = '#ff3333';
|
if (difficultyKey === 'extreme') diffColor = '#ff3333';
|
||||||
else if (difficultyKey === 'hardest') diffColor = '#ff9933';
|
else if (difficultyKey === 'hardest') diffColor = '#ff9933';
|
||||||
|
|||||||
@@ -52,24 +52,36 @@ export function generateRandomGrid(size, density = 0.5) {
|
|||||||
return grid;
|
return grid;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function calculateDifficulty(density) {
|
export function calculateDifficulty(density, size = 10) {
|
||||||
// Shannon Entropy: H(x) = -x*log2(x) - (1-x)*log2(1-x)
|
// Shannon Entropy: H(x) = -x*log2(x) - (1-x)*log2(1-x)
|
||||||
// Normalized to 0-1 range (since max entropy at 0.5 is 1)
|
// Normalized to 0-1 range (since max entropy at 0.5 is 1)
|
||||||
|
|
||||||
// Avoid log(0)
|
// Avoid log(0)
|
||||||
if (density <= 0 || density >= 1) return 'easy';
|
if (density <= 0 || density >= 1) return { level: 'easy', value: 0 };
|
||||||
|
|
||||||
const entropy = -density * Math.log2(density) - (1 - density) * Math.log2(1 - density);
|
const entropy = -density * Math.log2(density) - (1 - density) * Math.log2(1 - density);
|
||||||
|
|
||||||
// Thresholds based on entropy
|
// Difficulty score combines entropy (complexity) and size (scale)
|
||||||
// 0.5 density -> entropy 1.0 (Extreme)
|
// We use sqrt(size) to dampen the effect of very large grids,
|
||||||
// 0.4/0.6 density -> entropy ~0.97 (Extreme)
|
// ensuring that density still plays a major role.
|
||||||
// 0.3/0.7 density -> entropy ~0.88 (Hardest)
|
// Normalized against max size (80)
|
||||||
// 0.2/0.8 density -> entropy ~0.72 (Harder)
|
const sizeFactor = Math.sqrt(size / 80);
|
||||||
// <0.2/>0.8 density -> entropy <0.72 (Easy)
|
const score = entropy * sizeFactor * 100;
|
||||||
|
const value = Math.round(score);
|
||||||
|
|
||||||
|
// Thresholds
|
||||||
|
let level = 'easy';
|
||||||
|
if (value >= 80) level = 'extreme';
|
||||||
|
else if (value >= 60) level = 'hardest';
|
||||||
|
else if (value >= 40) level = 'harder';
|
||||||
|
else if (value >= 20) level = 'medium'; // Using 'medium' key if available, or we need to add it?
|
||||||
|
// Wait, useI18n only has: easy, harder, hardest, extreme.
|
||||||
|
// Let's stick to those keys but adjust ranges.
|
||||||
|
|
||||||
|
if (value >= 75) level = 'extreme';
|
||||||
|
else if (value >= 50) level = 'hardest';
|
||||||
|
else if (value >= 25) level = 'harder';
|
||||||
|
else level = 'easy';
|
||||||
|
|
||||||
if (entropy >= 0.96) return 'extreme'; // approx 38% - 62%
|
return { level, value };
|
||||||
if (entropy >= 0.85) return 'hardest'; // approx 28% - 38% & 62% - 72%
|
|
||||||
if (entropy >= 0.65) return 'harder'; // approx 17% - 28% & 72% - 83%
|
|
||||||
return 'easy';
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user