From 5a2ab32491e23496ae84761d9d58f7897e1a2c08 Mon Sep 17 00:00:00 2001
From: theo <MeTeK-YT@outlook.fr>
Date: Tue, 8 Dec 2020 10:08:42 +0100
Subject: [PATCH] cherche

---
 .vs/slnx.sqlite         | Bin 90112 -> 90112 bytes
 SwichGIT/src/js/main.js |  43 +++++++++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 0c9697ca42a0574bb2a37f1f65482fb6a554f8e6..9b5eabeefddf38019878e64b4385d96f978b969f 100644
GIT binary patch
delta 330
zcmZoTz}j$tb%Hdb@<bVDM&*qOOZWxYc;y-RU-0keU(S1$cNMSvW<ddN-ugxkHdY4b
z#@K+O{H)aE66gH9w9NF<qQsKS{Jh}QqO#27)M{QX1qCIj0;kf<oD>vQ#Y$ER(Xl#U
zMZqPBMJ1&LP_=HEIjP99&ZR{~sd**Hiu999fZFp)b8>jOY86>o7@P%NQj<#4LlTS9
zQ%j0Ni&Kk&Q%g!R^U{mGQ!ArmH=mU?5)x(OVqjok<IiB=zs29de}sPpe+K{i&58;k
k{0{QW&Ww2c!UmGZV*~5v753lrS!Ze-KBl&L$@-WL0P^i`NdN!<

delta 81
zcmV-X0IvUlzy*N71&|v750M;00S~cYqz?=P4b1=#=nuaSrwz@sAt1dCv&|hc5)lLn
n0000452yeS+7HAJs1NV6A+VSav#3A!Zv~Y?pUL>Mq_14CD#snH

diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js
index 2977de1..4737063 100644
--- a/SwichGIT/src/js/main.js
+++ b/SwichGIT/src/js/main.js
@@ -478,42 +478,57 @@ function creaMatrice(row, column) {
 //=================================================================================
 //chercheCombi => Compte les combinainsons de 2 cartes à l'écran
 function chercheCombi2() {
-	
+
 	var Cptsolution = 0;
 	for (var i = 0; i < 15; i++) {
 
 		for (var j = 0; j < 15 - i; j++) {
 
 			var DeckTeste = [];
+			var tabCode = [];
 			var tab = [];
+			var copie = [];
+			copie.splice(0, DeckTeste.length);
+			DeckTeste.splice(0, DeckTeste.length);
+			tab.splice(0, DeckTeste.length);
+			tabCode.splice(0, DeckTeste.length);
+
 			DeckTeste.push(deckPartie[i]);
-			DeckTeste.push(deckPartie[j+i+1]);
+			DeckTeste.push(deckPartie[j + i + 1]);
+
 
-			var copie = [];
 			for (var h = 0; h < DeckTeste.length; h++) {
 				copie.push(DeckTeste[i]);
 			}
-			tab = AssemblageARBRE(DeckTeste, DeckTeste[0]);
-			window.alert("Combinaison : "+DeckTeste[i].getIdentifiant+DeckTeste[j+i+1].getIdentifiant); //+1 au niveau des identifiants
+
+			tab = AssemblageARBRE(copieListeDeCarte(DeckTeste), copieCarte(DeckTeste[0]));
+
+
+			//window.alert(DeckTeste[(j + i) + 1].getIdentifiant);
+			//window.alert("Combinaison : " + DeckTeste[i].getIdentifiant + DeckTeste[(j + i) + 1].getIdentifiant); //+1 au niveau des identifiants
+			//Pb DeckTeste[j + i + 1] marche pas
 			var solution = true;
-			var tabCode = [];
-			for (var i = 0; i < tab.length; i++) {
-				tabCode.push(tab[i].code);
+
+
+			for (var h = 0; h < tab.length; h++) {
+				tabCode.push(tab[h].code);
 			}
-			window.alert(tabCode);
-			for (var i = 0; i < tab.length; i++) {
-				if (tab[i].code == carteselect.length) {
+
+			//window.alert(tabCode);
+			for (var g = 0; g < tab.length; g++) {
+				if (tab[g].code == carteselect.length) {
 					solution = false;
 					//window.alert("yo mec");
 				}
 			}
-			if (solution) {
+			if (!solution) {
 				Cptsolution++;
-				window.alert("Combinaison : ", DeckTeste[i].getIdentifiant,DeckTeste[j].getIdentifiant);
+				//window.alert("Nb Solution: " + Cptsolution);
 			}
+			//window.alert("i= "+i+"j="+j);
 		}
 	}
-
+	window.alert("yo mec");
 	window.alert("Nombre de solution à 2 cartes : ", Cptsolution);
 }