win of a game detected, fix little bug on card creation and algos

src/Console/Console.html

@@ -13,9 +13,9 @@
     <section>
         
     </section>
-    <script src="../Model/emptyParameterException.js"></script>
+    <script src="../Model/Exceptions.js"></script>
-    <script src="../Model/unfoundCardException.js"></script>
     <script src="../Model/Card.js"></script>
+    <script src="../algo.js"></script>
     <script src="../Model/Card4WithoutColor.js"></script>
     <script src="../Model/Card4WithoutFilling.js"></script>
     <script src="../Model/Card4WithoutNumber.js"></script>

src/Console/main.js

@@ -33,33 +33,31 @@ console.groupEnd();
 // CREATE DECK
 
 console.group('Deck');
+console.log("~~BEGINNING~~");
 let deck  = new Deck([0,1,2,3],3);
 console.log(`All cards : ${deck.allCards.length}`);
 //Display all cards
 console.log(`All cards display`);
 // deck.allCards.forEach(e => {
 //    console.log(e.color,e.number,e.shape,e.filling);//no outline
-//    //console.log(e.color,e.number,e.filling,e.outline);//no shape
+//    console.log(e.color,e.number,e.filling,e.outline);//no shape
-//    //console.log(e.color,e.number,e.shape,e.outline);//no filling
+//    console.log(e.color,e.number,e.shape,e.outline);//no filling
 // });
 console.log(`remaining cards : ${deck.remainingCards.length}`)
-// deck.remainingCards.forEach(e => {
-//     console.log(e.getAttributes());
-//  });
 console.log(`size output ${deck.outputCards.length}`);
 console.group('Output cards');
 deck.outputCards.forEach(e => {
    console.log(e.getAttributes());
 });
 console.groupEnd();
-console.log(`set already made ${deck.setMade}`);
+console.log(`set already made :${deck.setMade}`);
 deck.setMade.forEach(e => {
     console.log(e.color,e.number,e.shape,e.filling);
  });
 
 
 // CHECK SET
-console.log("CHECKING SET")
+console.log("~~CHECKING SET~~")
 
 console.log("Card to remove: ")
 console.log(deck.outputCards[0].getAttributes(),deck.outputCards[1].getAttributes(),deck.outputCards[2].getAttributes())
@@ -67,9 +65,6 @@ let customCard=[deck.outputCards[0],deck.outputCards[1],deck.outputCards[2]];
 deck.checkSet(customCard);
 console.log(`remaining cards : ${deck.remainingCards.length}`)
 console.log(`All cards : ${deck.allCards.length}`)
-// deck.remainingCards.forEach(e => {
-//     console.log(e.getAttributes());
-//  });
 console.log(`size output ${deck.outputCards.length}`);
 console.group('Output cards');
 deck.outputCards.forEach(e => {
@@ -77,12 +72,15 @@ deck.outputCards.forEach(e => {
 });
 console.groupEnd();
 
-console.group('set made');
+console.log("~~SET MADE~~");
 console.log(`set already made : ${deck.setMade.length}`);
-deck.setMade.forEach(e => {
+deck.setMade.forEach(e => {//tab of tab of cards of set made
-    console.log(e.color,e.number,e.shape,e.filling);
+    e.forEach(a=>{
+        console.log(a.color,a.number,a.shape,a.filling);
+    })
  });
- console.groupEnd();
+// console.log(deck.setMade)
+console.groupEnd();
 
 //let deck5  = new Deck([0,1,2,3,4]);
 //console.log(`All cards with 5 attributes size ${deck5.allCards.length}`);
@@ -93,3 +91,23 @@ deck.setMade.forEach(e => {
 //console.log(`random : ${deck.getRandCard()}`);
 
 console.groupEnd();
+
+
+// CHECK SET
+console.log("~~CHECKING ALL SET~~")
+
+for (let i=0; i<26;i++){
+    console.log(`-----${i}emme itérations-----`)
+    console.log("Card to remove: ")
+    console.log(deck.outputCards[0].getAttributes(),deck.outputCards[1].getAttributes(),deck.outputCards[2].getAttributes())
+    customCard=[deck.outputCards[0],deck.outputCards[1],deck.outputCards[2]];
+    deck.checkSet(customCard);
+    console.log(`remaining cards : ${deck.remainingCards.length}`)
+    console.log(`All cards : ${deck.allCards.length}`)
+    console.log(`size output ${deck.outputCards.length}`);
+    console.group('Output cards');
+    deck.outputCards.forEach(e => {
+       console.log(e.getAttributes());
+    });
+}
+deck.checkSet(customCard);

src/Model/Deck.js

@@ -11,7 +11,7 @@ class Deck{
         this.nbCards=nbCards;
         this.remainingCards=this.remainingCards.concat(this.allCards);// cards in the stack
         this.outputCards=[];// 12 cards lay on the table 
-        this.setMade=[];// array with all the set already mades (array of set)
+        this.setMade=[];// array of array with all the set already mades (array of set)
         this.createDeck(12);
     }
     /**
@@ -20,10 +20,17 @@ class Deck{
      */
     createDeck(nbCards){
         for (let i=0; i<nbCards; i++){
+            if(this.remainingCards.length==0){
+                console.log("PLUS DE CARTES");
+                break;
+            }
             const rand = this.getRandCard();
             this.outputCards.push(this.remainingCards[rand]);
             this.remainingCards.splice(rand,1);
         }
+        if(){
+            this.createDeck(this.nbCards)
+        }
     }
     /**
      * 
@@ -51,7 +58,17 @@ class Deck{
      */
     checkSet(selectedCards){
         if(true){//isSet(selectedCards)){
-            this.removeFromoutputCards(selectedCards);
+            if(this.outputCards.length==0){
+                console.log("C'est win")
+                return;    
+            }
+            else{
+                this.removeFromoutputCards(selectedCards);
+            }
+        }
+        else if(this.remainingCards.length==0){
+            console.log("C'est win")
+            return;
         }
     }
     /**

src/Model/Exceptions.js

@@ -3,3 +3,8 @@ class UnFoundCardException extends Error{
         super(`Card ${card.color +" "+ card.shape+ " " + card.number +" "+ card.filling} is missing`);
     }
 }
+class EmptyParamaterException extends Error{
+    constructor(field){
+        super(`Field ${field} missing`);
+    }
+}

src/Model/Factory.js

@@ -95,7 +95,7 @@ class Factory{
             }
         }
         else{
-            //ERROR
+            throw new EmptyParamaterException("ilegal number of attributes");
         }
         return tabOfAllCards
     }

src/Model/emptyParameterException.js

@@ -1,5 +0,0 @@
-class EmptyParamaterException extends Error{
-    constructor(field){
-        super(`Field ${field} missing`);
-    }
-}