diff --git a/package-lock.json b/package-lock.json index 757a74c..531c6d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,6 +27,7 @@ "express": "^4.18.2", "rxjs": "~7.8.0", "sonarqube-scanner": "^4.3.0", + "swipl-wasm": "^7.0.5", "tslib": "^2.3.0", "zone.js": "~0.15.0" }, @@ -5315,6 +5316,12 @@ "@types/node": "*" } }, + "node_modules/@types/emscripten": { + "version": "1.41.5", + "resolved": "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.41.5.tgz", + "integrity": "sha512-cMQm7pxu6BxtHyqJ7mQZ2kXWV5SLmugybFdHCBbJ5eHzOo6VhBckEgAT3//rP5FwPHNPeEiq4SmQ5ucBwsOo4Q==", + "license": "MIT" + }, "node_modules/@types/eslint": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", @@ -13628,6 +13635,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/swipl-wasm": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/swipl-wasm/-/swipl-wasm-7.0.5.tgz", + "integrity": "sha512-3J6NYJq+G5xepS4zCTh15fdS9An0D/zqOLpF9l6y20nPEZcOagZ0v8Vt2IclPn4njFFL1LmgsBfHqjxZjkFYPA==", + "license": "BSD-2-Clause", + "dependencies": { + "@types/emscripten": "^1.41.5" + }, + "bin": { + "swipl-generate": "dist/bin/index.js" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index c7b133f..0192af4 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "express": "^4.18.2", "rxjs": "~7.8.0", "sonarqube-scanner": "^4.3.0", + "swipl-wasm": "^7.0.5", "tslib": "^2.3.0", "zone.js": "~0.15.0" }, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c667523..5aa94ea 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,7 +5,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { CommonModule } from '@angular/common'; import { filter, take } from 'rxjs'; -import { Player } from './model'; +import { Player } from './util/model'; import { DataService } from './data.service'; @Component({ diff --git a/src/app/data.service.ts b/src/app/data.service.ts index 113e1a2..b62918b 100644 --- a/src/app/data.service.ts +++ b/src/app/data.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Player } from './model'; +import { Player } from './util/model'; @Injectable({ providedIn: 'root' diff --git a/src/app/modal-rotations/modal-rotations.component.ts b/src/app/modal-rotations/modal-rotations.component.ts index 1530d7a..6c7ea60 100644 --- a/src/app/modal-rotations/modal-rotations.component.ts +++ b/src/app/modal-rotations/modal-rotations.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Player} from '../model'; +import { Player} from '../util/model'; import { FormsModule } from '@angular/forms'; @Component({ diff --git a/src/app/screen-basic/screen-basic.component.ts b/src/app/screen-basic/screen-basic.component.ts index 32891f6..75b9c3d 100644 --- a/src/app/screen-basic/screen-basic.component.ts +++ b/src/app/screen-basic/screen-basic.component.ts @@ -3,8 +3,8 @@ import { Component, inject} from '@angular/core'; import { FormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { CommonModule } from '@angular/common'; -import { Player } from '../model'; -import { iter } from '../util'; +import { Player } from '../util/model'; +import { assignPlayersRandomly, iter } from '../util/util'; import { DataService } from '../data.service'; @Component({ @@ -27,21 +27,8 @@ export class ScreenBasicComponent { this.numTeamsSelected = Number(this.numTeamsSelectorValue); } - let teams = Array.from({ length: this.numTeamsSelected }, () => []); - // clone array here - let localPlayers: Player[] = this.data.getPlayers(); - - let nameslen = localPlayers.length; - let iterator = iter(teams); - for(let i =0; i < nameslen; i++){ - let index = Math.floor(Math.random()* localPlayers.length); - let n = localPlayers[index]; - localPlayers.splice(index,1); - let team = iterator.next().value; - team.push(n); - - } - this.data.teams = teams; + let teams: Player[][]= Array.from({ length: this.numTeamsSelected }, () => []); + this.data.teams = assignPlayersRandomly(this.data.getPlayers(),teams); } } \ No newline at end of file diff --git a/src/app/screen-edit/screen-edit.component.ts b/src/app/screen-edit/screen-edit.component.ts index d9a6697..e8f681a 100644 --- a/src/app/screen-edit/screen-edit.component.ts +++ b/src/app/screen-edit/screen-edit.component.ts @@ -1,6 +1,6 @@ import { Component, inject, Input, ViewChild } from '@angular/core'; import { NgbAlert, NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { Player } from '../model'; +import { Player } from '../util/model'; import { ModalRotationsComponent } from '../modal-rotations/modal-rotations.component'; import { FormsModule } from '@angular/forms'; import { Subject } from 'rxjs/internal/Subject'; diff --git a/src/app/screen-rotations/screen-rotations.component.html b/src/app/screen-rotations/screen-rotations.component.html index 3f74f69..b38eb94 100644 --- a/src/app/screen-rotations/screen-rotations.component.html +++ b/src/app/screen-rotations/screen-rotations.component.html @@ -1,5 +1,9 @@

Rotations

+
+ +
+

@@ -71,5 +75,19 @@

+
+

+ +

+
+
+ + @for (player of NoRolePlayers; track $index) { + {{ player.name }} + } + +
+
+
\ No newline at end of file diff --git a/src/app/screen-rotations/screen-rotations.component.ts b/src/app/screen-rotations/screen-rotations.component.ts index 2aea362..43cda23 100644 --- a/src/app/screen-rotations/screen-rotations.component.ts +++ b/src/app/screen-rotations/screen-rotations.component.ts @@ -1,9 +1,10 @@ // Team Generation Screen respecting volleyball roles as defined by `../model/Player` -import { Component, inject, OnInit } from '@angular/core'; +import { Component, inject } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { Player } from '../model'; +import { Player } from '../util/model'; import { NgbAccordionBody, NgbAccordionCollapse, NgbAccordionHeader, NgbAccordionItem, NgbAccordionButton, NgbAccordionDirective, NgbAccordionToggle } from '@ng-bootstrap/ng-bootstrap'; import { DataService } from '../data.service'; +import { solveRotations } from '../util/solver'; @Component({ selector: 'app-screen-rotations', @@ -11,13 +12,14 @@ import { DataService } from '../data.service'; templateUrl: './screen-rotations.component.html', styleUrl: './screen-rotations.component.less' }) -export class ScreenRotationsComponent implements OnInit{ +export class ScreenRotationsComponent{ data = inject(DataService); - ngOnInit(): void { - + + async generateTeams(){ + const teamCount = Math.floor(this.data.getPlayers().length / 6); + solveRotations(); + } - // https://de.wikipedia.org/wiki/Volleyball#Spielpositionen - // we want 2 outside, 1 opp, 1 set and either 2*middle or middle + libero get OutsidePlayers(): Player[] { return this.data.getPlayers().filter(player => player.outside); @@ -34,4 +36,9 @@ export class ScreenRotationsComponent implements OnInit{ get LiberoPlayers(): Player[] { return this.data.getPlayers().filter(player => player.libero); } + get NoRolePlayers(): Player[] { + return this.data.getPlayers().filter( + player => !player.outside && !player.middle && !player.opposite && !player.setter && !player.libero + ); + } } \ No newline at end of file diff --git a/src/app/util.ts b/src/app/util.ts deleted file mode 100644 index 22bd05b..0000000 --- a/src/app/util.ts +++ /dev/null @@ -1,7 +0,0 @@ -export function* iter(list: any[]){ - let index = 0; - while(true){ - yield list[index % list.length]; - index++; - } -} \ No newline at end of file diff --git a/src/app/model.ts b/src/app/util/model.ts similarity index 100% rename from src/app/model.ts rename to src/app/util/model.ts diff --git a/src/app/util/rotations.pl b/src/app/util/rotations.pl new file mode 100644 index 0000000..3c165c2 --- /dev/null +++ b/src/app/util/rotations.pl @@ -0,0 +1,44 @@ + % https://de.wikipedia.org/wiki/Volleyball#Spielpositionen + % we want 2 outside, 1 opp, 1 set and either 2*middle or middle + libero +teams(0). +number_of_teams(X,Result):- Result is floor(X/6). +libero(tom). +libero(anh). + +:-style_check(-discontiguous). + +players(_/X):- X=:=1. +% introduce abbreviations used for s(etter), oh (outside hitter), opp(osite), l(ibero), m(iddle) +s(_) :- member(1, [0]). +oh(_) :- member(1, [0]). +opp(_) :- member(1, [0]). +l(_) :- member(1, [0]). +m(_) :- member(1, [0]). + +team(List):- + findall(X, (member(X, List),s(X)),Setters), + length(Setters,1), + findall(X, (member(X, List),oh(X)),Outsides), + length(Outsides,2), + findall(X, (member(X, List),opp(X)),Opposites), + length(Opposites,1), + % require either 2 middles or 1+1 libero. + (findall(X, (member(X, List),m(X)),Middles), + length(Middles, 2) + ; + (findall(X, (member(X, List),m(X)),Middles), + length(Middles,1), + findall(X, (member(X,List), l(X)),Liberos), + length(Liberos,1) + ) + ). + % TODO require all sets to be A∩B = ∅ + + + +s(s). +oh(oh). +oh(oh2). +opp(opp). +l(l). +m(m). diff --git a/src/app/util/solver.ts b/src/app/util/solver.ts new file mode 100644 index 0000000..6930ad4 --- /dev/null +++ b/src/app/util/solver.ts @@ -0,0 +1,11 @@ +import SWIPL from 'swipl-wasm'; + +export async function solveRotations(){ + const swipl = await SWIPL({ arguments: ["-q"] }); + const q = swipl.prolog.query("member(X, [a, b, c]).").once() as PrologResult; + console.log(q.X); +} + +interface PrologResult { + X: string; +} \ No newline at end of file diff --git a/src/app/util/util.ts b/src/app/util/util.ts new file mode 100644 index 0000000..67c8411 --- /dev/null +++ b/src/app/util/util.ts @@ -0,0 +1,21 @@ +import { Player } from "./model"; + +export function* iter(list: any[]){ + let index = 0; + while(true){ + yield list[index % list.length]; + index++; + } +} +export function assignPlayersRandomly(players: Player[], teams: Player[][]){ + let nameslen = players.length; + let iterator = iter(teams); + for(let i =0; i < nameslen; i++){ + let index = Math.floor(Math.random()* players.length); + let n = players[index]; + players.splice(index,1); + let team = iterator.next().value; + team.push(n); + } + return teams; +} \ No newline at end of file