From f718468dded73001b149cee56309d7c31fed8498 Mon Sep 17 00:00:00 2001 From: "aurian.jault" Date: Fri, 3 Feb 2023 13:36:29 +0100 Subject: [PATCH 1/5] Supr de mon index grave style alors que bastien fais un dossier console pour test????? --- src/index.html | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 src/index.html diff --git a/src/index.html b/src/index.html deleted file mode 100644 index b32303c..0000000 --- a/src/index.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - My awesome blog - - - -

My awesome blog

- - - - - - - - \ No newline at end of file From 8a178e7720b97927fbb2bc6c02f8a1f740f62777 Mon Sep 17 00:00:00 2001 From: "aurian.jault" Date: Sun, 5 Feb 2023 19:21:40 +0100 Subject: [PATCH 2/5] Algo de calcul des Set dans un deck --- src/Console/Console.html | 24 --------- src/algo.js | 113 ++++++++++++++++++++------------------- src/index.html | 24 +++++++++ 3 files changed, 82 insertions(+), 79 deletions(-) delete mode 100644 src/Console/Console.html create mode 100644 src/index.html diff --git a/src/Console/Console.html b/src/Console/Console.html deleted file mode 100644 index 1f6b5c3..0000000 --- a/src/Console/Console.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - Console - - - -

Console - test

- -
- -
- - - - - - - - - \ No newline at end of file diff --git a/src/algo.js b/src/algo.js index c4e8740..3c256d9 100644 --- a/src/algo.js +++ b/src/algo.js @@ -1,58 +1,3 @@ -// Pseudo code -// -/* - * function checkReslt(array ) - * { - * new array> matrice = vide - * - * forEach(array: value) - * { - * matrice.add(value.getAttrib) - * } - * Check all length of matrice - * for(i = 0; i tab - * for (j=0; j + + + + + + Console + + + +

Console - test

+ +
+ +
+ + + + + + + + + From 929f54fa36a72ad8842a4e65a230e827a03f71d6 Mon Sep 17 00:00:00 2001 From: "aurian.jault" Date: Tue, 14 Feb 2023 14:00:25 +0100 Subject: [PATCH 3/5] ALGO QUI MARCHE TOUJOURS PAS --- src/algo.js | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/src/algo.js b/src/algo.js index 3c256d9..500b282 100644 --- a/src/algo.js +++ b/src/algo.js @@ -1,7 +1,10 @@ +import('./Model/Card.js') + + function isSet(cards) { let attributesMatrix = []; - + cards.forEach(element => { attributesMatrix.push(element.getAttributes()); }); @@ -61,38 +64,51 @@ function nbrSets(deck, setSize){ matrix = [] // Remplie la matrice des valeurs du deck for (i=0;i Date: Sun, 19 Feb 2023 21:43:20 +0100 Subject: [PATCH 4/5] abandon de l algo commun pour tous les set possibles et creation des algo pour chaques configuration --- src/algo.js | 111 +++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/src/algo.js b/src/algo.js index 500b282..c3da01b 100644 --- a/src/algo.js +++ b/src/algo.js @@ -59,74 +59,71 @@ function checkAttributes(attributes){ return boolLoop === true; } - -function nbrSets(deck, setSize){ - matrix = [] - // Remplie la matrice des valeurs du deck - for (i=0;i Date: Sun, 19 Feb 2023 21:45:24 +0100 Subject: [PATCH 5/5] supression de l index.html --- src/index.html | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 src/index.html diff --git a/src/index.html b/src/index.html deleted file mode 100644 index e8691d0..0000000 --- a/src/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - Console - - - -

Console - test

- -
- -
- - - - - - - - -