MathewFrancis/btc_horse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : added F for FOR,QUI and TAN

Browse Source
This commit is contained in:
karthik 2025-07-29 14:26:37 +05:30
parent bd80e3c36b
commit 15c9ba411f
2 changed files with 228 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
btc-UI/src/app/components/selection.service/selection.service.ts
View File

@ -29,43 +29,59 @@ export class SelectionService {
const label = updated.label; const label = updated.label;
const value = updated.value; const value = updated.value;
const numbers = (updated.numbers || []).filter(n => typeof n === 'number') as number[]; const numbers = updated.numbers || [];
const isBoxed = updated.isBoxed ?? false; const isBoxed = updated.isBoxed ?? false;
updated.total = 0; updated.total = 0;
if ((numbers.length > 0 || updated.numbers.includes('F')) && value > 0 && label) { if ((numbers.length > 0 || numbers.includes('F')) && value > 0 && label) {
switch (label) { switch (label) {
case 'WIN': case 'WIN':
case 'SHP': case 'SHP':
case 'THP': case 'THP':
case 'PLC': case 'PLC':
case 'SHW': { case 'SHW': {
if (updated.numbers.includes('F')) { if (numbers.includes('F')) {
updated.total = 12 * value * 10; // 'F' represents 12 runners updated.total = 12 * value * 10;
} else { } else {
updated.total = numbers.length * value * 10; updated.total = numbers.filter(n => typeof n === 'number').length * value * 10;
} }
break; break;
} }
case 'FOR': { case 'FOR': {
const dashIndex = updated.numbers.indexOf('-'); const dashIndex = numbers.indexOf('-');
const group1 = updated.numbers.slice(0, dashIndex).filter(n => typeof n === 'number') as number[]; const group1 = dashIndex === -1 ? numbers : numbers.slice(0, dashIndex);
const group2 = updated.numbers.slice(dashIndex + 1).filter(n => typeof n === 'number') as number[]; const group2 = dashIndex === -1 ? [] : numbers.slice(dashIndex + 1);
const group1Count = group1.includes('F') ? 12 : group1.filter(n => typeof n === 'number').length;
const group2Count = group2.includes('F') ? 12 : group2.filter(n => typeof n === 'number').length;
let combinations = 0; let combinations = 0;
if (isBoxed) { if (isBoxed) {
const uniq = Array.from(new Set([...group1, ...group2])); const allNums = [...group1, ...group2].filter(n => typeof n === 'number') as number[];
combinations = this.calculatePermutations(uniq.length); // nP2 const uniqueCount = new Set(allNums).size + (group1.includes('F') || group2.includes('F') ? 12 : 0);
updated.numbers = [...uniq, '-', ...uniq]; combinations = uniqueCount >= 2 ? this.calculatePermutations(uniqueCount) : 0;
updated.numbers = [...group1, '-', ...group2];
} else { } else {
for (const a of group1) { if (group1.includes('F') && group2.includes('F')) {
for (const b of group2) { combinations = 12 * 11; // nP2 for 12 runners
} else if (group1.includes('F') || group2.includes('F')) {
const nonFieldGroup = group1.includes('F') ? group2 : group1;
const nonFieldNumbers = nonFieldGroup.filter(n => typeof n === 'number') as number[];
combinations = 12 * nonFieldNumbers.length;
if (nonFieldNumbers.length > 0) {
combinations -= nonFieldNumbers.length; // Subtract overlapping runners
}
} else {
const numGroup1 = group1.filter(n => typeof n === 'number') as number[];
const numGroup2 = group2.filter(n => typeof n === 'number') as number[];
for (const a of numGroup1) {
for (const b of numGroup2) {
if (a !== b) combinations++; if (a !== b) combinations++;
} }
} }
}
updated.numbers = [...group1, '-', ...group2]; updated.numbers = [...group1, '-', ...group2];
} }
@ -74,27 +90,35 @@ export class SelectionService {
} }
case 'QUI': { case 'QUI': {
const dashIndex = updated.numbers.indexOf('-'); const dashIndex = numbers.indexOf('-');
const group1 = updated.numbers.slice(0, dashIndex).filter(n => typeof n === 'number') as number[]; const group1 = dashIndex === -1 ? numbers : numbers.slice(0, dashIndex);
const group2 = updated.numbers.slice(dashIndex + 1).filter(n => typeof n === 'number') as number[]; const group2 = dashIndex === -1 ? [] : numbers.slice(dashIndex + 1);
const group1Count = group1.includes('F') ? 12 : group1.filter(n => typeof n === 'number').length;
const group2Count = group2.includes('F') ? 12 : group2.filter(n => typeof n === 'number').length;
let combinations = 0; let combinations = 0;
const set1 = new Set(group1);
const set2 = new Set(group2);
const uniqueUnion = new Set([...group1, ...group2]);
function setsAreEqual(a: Set<number>, b: Set<number>): boolean { if (isBoxed) {
if (a.size !== b.size) return false; const allNums = [...group1, ...group2].filter(n => typeof n === 'number') as number[];
for (let v of a) if (!b.has(v)) return false; const uniqueCount = new Set(allNums).size + (group1.includes('F') || group2.includes('F') ? 12 : 0);
return true; combinations = uniqueCount >= 2 ? (uniqueCount * (uniqueCount - 1)) / 2 : 0;
}
if (isBoxed || setsAreEqual(set1, set2)) {
combinations = uniqueUnion.size >= 2 ? (uniqueUnion.size * (uniqueUnion.size - 1)) / 2 : 0;
} else { } else {
if (group1.includes('F') && group2.includes('F')) {
combinations = (12 * 11) / 2; // nC2 for 12 runners
} else if (group1.includes('F') || group2.includes('F')) {
const nonFieldGroup = group1.includes('F') ? group2 : group1;
const nonFieldNumbers = nonFieldGroup.filter(n => typeof n === 'number') as number[];
combinations = (12 * nonFieldNumbers.length) / 2;
if (nonFieldNumbers.length > 0) {
const unique = new Set(nonFieldNumbers);
combinations = unique.size * 11; // Each number pairs with 11 others
}
} else {
const numGroup1 = group1.filter(n => typeof n === 'number') as number[];
const numGroup2 = group2.filter(n => typeof n === 'number') as number[];
const pairSet = new Set<string>(); const pairSet = new Set<string>();
for (let a of set1) { for (let a of numGroup1) {
for (let b of set2) { for (let b of numGroup2) {
if (a === b) continue; if (a === b) continue;
let key = a < b ? `${a},${b}` : `${b},${a}`; let key = a < b ? `${a},${b}` : `${b},${a}`;
pairSet.add(key); pairSet.add(key);
@ -102,6 +126,7 @@ export class SelectionService {
} }
combinations = pairSet.size; combinations = pairSet.size;
} }
}
updated.numbers = [...group1, '-', ...group2]; updated.numbers = [...group1, '-', ...group2];
updated.total = combinations * value * 10; updated.total = combinations * value * 10;
@ -109,49 +134,100 @@ export class SelectionService {
} }
case 'TAN': { case 'TAN': {
const dashIndices = updated.numbers const dashIndices = numbers
.map((n, idx) => (n === '-' ? idx : -1)) .map((n, idx) => (n === '-' ? idx : -1))
.filter(idx => idx !== -1); .filter(idx => idx !== -1);
if (dashIndices.length < 2) break; // not ready yet if (dashIndices.length < 2 && !isBoxed) break;
const group1 = updated.numbers.slice(0, dashIndices[0]).filter(n => typeof n === 'number') as number[]; const group1 = dashIndices.length > 0 ? numbers.slice(0, dashIndices[0]) : numbers;
const group2 = updated.numbers.slice(dashIndices[0] + 1, dashIndices[1]).filter(n => typeof n === 'number') as number[]; const group2 = dashIndices.length > 0 ? numbers.slice(dashIndices[0] + 1, dashIndices[1] || numbers.length) : [];
const group3 = updated.numbers.slice(dashIndices[1] + 1).filter(n => typeof n === 'number') as number[]; const group3 = dashIndices.length > 1 ? numbers.slice(dashIndices[1] + 1) : [];
const group1Count = group1.includes('F') ? 12 : group1.filter(n => typeof n === 'number').length;
const group2Count = group2.includes('F') ? 12 : group2.filter(n => typeof n === 'number').length;
const group3Count = group3.includes('F') ? 12 : group3.filter(n => typeof n === 'number').length;
let combinations = 0; let combinations = 0;
if (isBoxed) { if (isBoxed) {
// Boxed: all unique numbers, nP3 if (numbers.includes('F')) {
const allNums = Array.from(new Set([...group1, ...group2, ...group3])); combinations = this.calculatePermutationsN(12, 3);
combinations = allNums.length >= 3 ? this.calculatePermutationsN(allNums.length, 3) : 0;
} else { } else {
// Unboxed: only combinations where all chosen numbers are different const allNums = [...group1, ...group2, ...group3].filter(n => typeof n === 'number') as number[];
for (const a of group1) { combinations = allNums.length >= 3 ? this.calculatePermutationsN(allNums.length, 3) : 0;
for (const b of group2) { }
} else {
if (group1.includes('F') && group2.includes('F') && group3.includes('F')) {
combinations = 12 * 11 * 10; // nP3
} else if (group1.includes('F') || group2.includes('F') || group3.includes('F')) {
const counts = [group1Count, group2Count, group3Count];
combinations = counts.reduce((acc, count) => acc * count, 1);
if (group1.includes('F') && !group2.includes('F') && !group3.includes('F')) {
const numGroup2 = group2.filter(n => typeof n === 'number') as number[];
const numGroup3 = group3.filter(n => typeof n === 'number') as number[];
combinations = 0;
for (let i = 1; i <= 12; i++) {
for (const j of numGroup2) {
for (const k of numGroup3) {
if (i !== j && i !== k && j !== k) combinations++;
}
}
}
} else if (group2.includes('F') && !group1.includes('F') && !group3.includes('F')) {
const numGroup1 = group1.filter(n => typeof n === 'number') as number[];
const numGroup3 = group3.filter(n => typeof n === 'number') as number[];
combinations = 0;
for (const i of numGroup1) {
for (let j = 1; j <= 12; j++) {
for (const k of numGroup3) {
if (i !== j && i !== k && j !== k) combinations++;
}
}
}
} else if (group3.includes('F') && !group1.includes('F') && !group2.includes('F')) {
const numGroup1 = group1.filter(n => typeof n === 'number') as number[];
const numGroup2 = group2.filter(n => typeof n === 'number') as number[];
combinations = 0;
for (const i of numGroup1) {
for (const j of numGroup2) {
for (let k = 1; k <= 12; k++) {
if (i !== j && i !== k && j !== k) combinations++;
}
}
}
}
} else {
const numGroup1 = group1.filter(n => typeof n === 'number') as number[];
const numGroup2 = group2.filter(n => typeof n === 'number') as number[];
const numGroup3 = group3.filter(n => typeof n === 'number') as number[];
for (const a of numGroup1) {
for (const b of numGroup2) {
if (b === a) continue; if (b === a) continue;
for (const c of group3) { for (const c of numGroup3) {
if (c === a || c === b) continue; if (c === a || c === b) continue;
combinations++; combinations++;
} }
} }
} }
} }
}
updated.numbers = [...group1, ...(group2.length ? ['-', ...group2] : []), ...(group3.length ? ['-', ...group3] : [])];
updated.total = combinations * value * 10; updated.total = combinations * value * 10;
updated.numbers = [...group1, '-', ...group2, '-', ...group3];
break; break;
} }
case 'TRE': case 'TRE':
case 'MJP': case 'MJP':
case 'JKP': { case 'JKP': {
const legs = this.splitToLegs(updated.numbers, this.getLegCount(label)); const legs = this.splitToLegs(numbers, this.getLegCount(label));
const requiredLegs = this.getLegCount(label); const requiredLegs = this.getLegCount(label);
const legCounts = legs.map(leg => leg.includes('F') ? 12 : leg.filter(n => typeof n === 'number').length);
const filledLegs = legs.filter(leg => leg.length > 0).length; const filledLegs = legs.filter(leg => leg.length > 0).length;
if (filledLegs >= requiredLegs - 1) { if (filledLegs >= requiredLegs - 1) {
const combinations = legs.reduce((acc, leg) => acc * (leg.length || 1), 1); const combinations = legCounts.reduce((acc, count) => acc * (count || 1), 1);
updated.total = combinations * value * 10; updated.total = combinations * value * 10;
} }
break; break;
@ -160,8 +236,8 @@ export class SelectionService {
// ⚪ BOX logic // ⚪ BOX logic
default: { default: {
const combCount = isBoxed const combCount = isBoxed
? this.calculatePermutations(numbers.length) ? this.calculatePermutations(numbers.filter(n => typeof n === 'number').length)
: this.calculateCombinations(numbers.length); : this.calculateCombinations(numbers.filter(n => typeof n === 'number').length);
updated.total = combCount * value * 10; updated.total = combCount * value * 10;
break; break;
} }
@ -200,9 +276,9 @@ export class SelectionService {
return result; return result;
} }
private splitToLegs(numbers: (number | string)[], legCount: number): number[][] { private splitToLegs(numbers: (number | string)[], legCount: number): (number | string)[][] {
const result: number[][] = []; const result: (number | string)[][] = [];
let currentLeg: number[] = []; let currentLeg: (number | string)[] = [];
let separatorCount = 0; let separatorCount = 0;
for (const item of numbers) { for (const item of numbers) {
@ -213,7 +289,7 @@ export class SelectionService {
separatorCount++; separatorCount++;
} }
if (separatorCount >= legCount - 1) break; if (separatorCount >= legCount - 1) break;
} else if (typeof item === 'number') { } else {
currentLeg.push(item); currentLeg.push(item);
} }
} }

106
btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts
View File

@ -14,6 +14,7 @@ export class TouchPadMenuComponent implements OnInit {
public twoGroupLabels = ['FOR', 'QUI']; public twoGroupLabels = ['FOR', 'QUI'];
public multiLegLabels = ['TRE', 'MJP', 'JKP']; public multiLegLabels = ['TRE', 'MJP', 'JKP'];
public threeGroupLabels = ['TAN'];
public allowedFieldLabels = ['WIN', 'SHP', 'THP', 'PLC', 'SHW']; public allowedFieldLabels = ['WIN', 'SHP', 'THP', 'PLC', 'SHW'];
labels: string[] = [ labels: string[] = [
@ -38,16 +39,16 @@ export class TouchPadMenuComponent implements OnInit {
// ✅ Original TAN logic // ✅ Original TAN logic
tanGroupStage = 0; tanGroupStage = 0;
tanGroups: number[][] = [[], [], []]; tanGroups: (number | string)[][] = [[], [], []];
// ✅ FOR/QUI logic // ✅ FOR/QUI logic
isFirstGroupComplete = false; isFirstGroupComplete = false;
firstGroup: number[] = []; firstGroup: (number | string)[] = [];
secondGroup: number[] = []; secondGroup: (number | string)[] = [];
// ✅ Multi-leg logic (TRE, MJP, JKP) // ✅ Multi-leg logic (TRE, MJP, JKP)
multiLegStage = 0; multiLegStage = 0;
multiLegGroups: number[][] = [[], [], [], [], []]; multiLegGroups: (number | string)[][] = [[], [], [], [], []];
isBoxed: boolean = false; isBoxed: boolean = false;
@ -80,8 +81,7 @@ export class TouchPadMenuComponent implements OnInit {
get showShashEnter(): boolean { get showShashEnter(): boolean {
const label = this.selectedLabel || ''; const label = this.selectedLabel || '';
const isBoxed = this.isBoxed; if (['FOR', 'QUI', 'TAN'].includes(label) && this.isBoxed) {
if (['FOR', 'QUI', 'TAN'].includes(label) && isBoxed) {
return false; return false;
} }
const specialLabels = ['FOR', 'QUI', 'TAN', 'EXA', 'WSP', 'TRE', 'MJP', 'JKP', '.']; const specialLabels = ['FOR', 'QUI', 'TAN', 'EXA', 'WSP', 'TRE', 'MJP', 'JKP', '.'];
@ -109,10 +109,25 @@ export class TouchPadMenuComponent implements OnInit {
(this.selectedNumbers.length > 0 || this.selectedNumbers.includes('F')) && (this.selectedNumbers.length > 0 || this.selectedNumbers.includes('F')) &&
this.padValue.length === 0; this.padValue.length === 0;
} }
get isBoxToggleDisabled(): boolean { get isBoxToggleDisabled(): boolean {
return this.selectedLabel !== null && this.allowedFieldLabels.includes(this.selectedLabel); if (!this.selectedLabel) return true;
// ❌ Disallow box mode for these labels
const disallowedBoxLabels = ['WIN', 'SHP', 'THP', 'PLC', 'SHW'];
if (disallowedBoxLabels.includes(this.selectedLabel)) {
return true;
}
// ❌ Disallow box toggle if FIELD (F) is selected
if (this.selectedNumbers.includes('F')) {
return true;
}
return false;
} }
private chunk<T>(array: T[], size: number): T[][] { private chunk<T>(array: T[], size: number): T[][] {
return Array.from({ length: Math.ceil(array.length / size) }, (_, i) => return Array.from({ length: Math.ceil(array.length / size) }, (_, i) =>
array.slice(i * size, i * size + size) array.slice(i * size, i * size + size)
@ -461,11 +476,38 @@ export class TouchPadMenuComponent implements OnInit {
} }
canUseField(): boolean { canUseField(): boolean {
return this.selectedLabel !== null && this.allowedFieldLabels.includes(this.selectedLabel) && this.selectedNumbers.length === 0; if (this.selectedLabel === 'FOR' || this.selectedLabel === 'QUI') {
if (!this.isFirstGroupComplete && this.firstGroup.length === 0) {
return true;
}
if (this.isFirstGroupComplete && this.secondGroup.length === 0) {
return true;
}
return false;
}
if (this.selectedLabel === 'TAN') {
if (this.tanGroups[this.tanGroupStage].length === 0) {
return true;
}
return false;
}
return (
this.selectedLabel !== null &&
this.allowedFieldLabels.includes(this.selectedLabel) &&
this.selectedNumbers.length === 0
);
}
openFieldModal() {
this.fieldModalOpen = true;
this.fieldInput = '';
this.fieldFEntered = false;
}
closeFieldModal() {
this.fieldModalOpen = false;
} }
openFieldModal() { this.fieldModalOpen = true; this.fieldInput = ''; this.fieldFEntered = false; }
closeFieldModal() { this.fieldModalOpen = false; }
handleFieldKey(key: string) { handleFieldKey(key: string) {
if (key === 'BACK') { if (key === 'BACK') {
this.fieldInput = this.fieldInput.slice(0, -1); this.fieldInput = this.fieldInput.slice(0, -1);
@ -483,15 +525,53 @@ export class TouchPadMenuComponent implements OnInit {
} }
confirmFieldEntry() { confirmFieldEntry() {
if (this.fieldFEntered) { if (!this.fieldFEntered || !this.selectedLabel) return;
if (this.selectedLabel === 'FOR' || this.selectedLabel === 'QUI') {
if (!this.isFirstGroupComplete) {
this.firstGroup = ['F'];
this.selectedNumbers = ['F'];
} else {
this.secondGroup = ['F'];
this.selectedNumbers = [...this.firstGroup, '-', 'F'];
}
this.selectionService.updatePartial({
label: this.selectedLabel,
numbers: [...this.selectedNumbers],
isBoxed: false,
value: 1
});
} else if (this.selectedLabel === 'TAN') {
if (this.isBoxed) {
this.selectedNumbers = ['F']; this.selectedNumbers = ['F'];
this.selectionService.updatePartial({ this.selectionService.updatePartial({
label: this.selectedLabel!, label: this.selectedLabel,
numbers: ['F'],
isBoxed: true,
value: 1
});
} else {
this.tanGroups[this.tanGroupStage] = ['F'];
const combined: (number | string)[] = [...this.tanGroups[0]];
if (this.tanGroupStage > 0) combined.push('-', ...this.tanGroups[1]);
if (this.tanGroupStage > 1) combined.push('-', ...this.tanGroups[2]);
this.selectedNumbers = combined;
this.selectionService.updatePartial({
label: this.selectedLabel,
numbers: [...this.selectedNumbers],
isBoxed: false,
value: 1
});
}
} else {
this.selectedNumbers = ['F'];
this.selectionService.updatePartial({
label: this.selectedLabel,
numbers: ['F'], numbers: ['F'],
isBoxed: false, isBoxed: false,
value: 1 value: 1
}); });
}
this.closeFieldModal(); this.closeFieldModal();
} }
}
} }